Skip to content

Commit

Permalink
Apply recommended patches from upstream projects
Browse files Browse the repository at this point in the history
  • Loading branch information
Viir committed Apr 10, 2024
1 parent e0cbdcc commit 55ca2d0
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-native-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.203'
dotnet-version: '8.0.204'

- name: Try use dotnet
run: dotnet --info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.203'
dotnet-version: '8.0.204'

- name: Try use dotnet
run: dotnet --info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.203'
dotnet-version: '8.0.204'

- name: Try use dotnet
run: dotnet --info
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
- task: UseDotNet@2
inputs:
packageType: 'sdk' # Options: runtime, sdk
version: '8.0.203'
version: '8.0.204'
includePreviewVersions: true

- script: dotnet --version
Expand Down
4 changes: 2 additions & 2 deletions implement/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build dotnet build image
FROM mcr.microsoft.com/dotnet/sdk:8.0.203 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0.204 AS build-env
WORKDIR /app

# Copy everything and build
Expand All @@ -8,7 +8,7 @@ WORKDIR /app/elm-time
RUN dotnet publish -c Debug -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:8.0.3 AS binaries
FROM mcr.microsoft.com/dotnet/aspnet:8.0.4 AS binaries

COPY --from=build-env /app/elm-time/out /elm-time/dotnet/

Expand Down
6 changes: 3 additions & 3 deletions implement/Pine/Pine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<AssemblyVersion>0.1.5</AssemblyVersion>
<FileVersion>0.1.5</FileVersion>
<AssemblyVersion>0.1.6</AssemblyVersion>
<FileVersion>0.1.6</FileVersion>
</PropertyGroup>

<PropertyGroup>
<PackageId>Pine</PackageId>
<Version>0.1.5</Version>
<Version>0.1.6</Version>
<Description>The cross-platform Elm runtime environment</Description>
<PackageTags>Functional;Elm;Runtime;Compiler;VM;DBMS</PackageTags>
<RepositoryUrl>https://github.com/elm-time/elm-time.git</RepositoryUrl>
Expand Down
4 changes: 2 additions & 2 deletions implement/PineTest/Pine.UnitTests/Pine.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion implement/elm-time/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace ElmTime;

public class Program
{
public static string AppVersionId => "0.1.5";
public static string AppVersionId => "0.1.6";

private static int AdminInterfaceDefaultPort => 4000;

Expand Down
16 changes: 8 additions & 8 deletions implement/elm-time/elm-time.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>ElmTime</RootNamespace>
<AssemblyName>elm-time</AssemblyName>
<AssemblyVersion>0.1.5</AssemblyVersion>
<FileVersion>0.1.5</FileVersion>
<AssemblyVersion>0.1.6</AssemblyVersion>
<FileVersion>0.1.6</FileVersion>
<Nullable>enable</Nullable>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand All @@ -22,8 +22,8 @@
</PropertyGroup>

<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\"/>
<None Include="./../../License.txt" Pack="true" PackagePath="\"/>
<None Include="README.md" Pack="true" PackagePath="\" />
<None Include="./../../License.txt" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
Expand All @@ -41,12 +41,12 @@
<ItemGroup>
<PackageReference Include="certes" Version="3.0.4" />
<PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.24.2" />
<PackageReference Include="Jint" Version="3.0.1" />
<PackageReference Include="Jint" Version="3.0.2" />
<PackageReference Include="LibGit2Sharp" Version="0.28.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.9.2" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
<PackageReference Include="ReadLine" Version="2.0.1" />
<PackageReference Include="SharpCompress" Version="0.36.0" />
<PackageReference Include="TupleAsJsonArray" Version="1.0.2" />
Expand Down
8 changes: 4 additions & 4 deletions implement/test-elm-time/test-elm-time.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="morelinq" Version="3.4.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="morelinq" Version="4.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down

0 comments on commit 55ca2d0

Please sign in to comment.