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 Oct 13, 2024
1 parent a77153a commit 9f205aa
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 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.204'
dotnet-version: '8.0.403'

- 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.204'
dotnet-version: '8.0.403'

- 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.204'
dotnet-version: '8.0.403'

- 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.204'
version: '8.0.403'
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.204 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0.403 AS build-env
WORKDIR /app

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

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

COPY --from=build-env /app/pine/out /pine/dotnet/

Expand Down
8 changes: 4 additions & 4 deletions implement/Pine.Core/Pine.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<AssemblyVersion>0.3.20</AssemblyVersion>
<FileVersion>0.3.20</FileVersion>
<AssemblyVersion>0.3.21</AssemblyVersion>
<FileVersion>0.3.21</FileVersion>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

<PropertyGroup>
<PackageId>Pine.Core</PackageId>
<Version>0.3.20</Version>
<Version>0.3.21</Version>
<Description>The cross-platform Elm runtime environment</Description>
<PackageTags>Functional;Elm;Runtime;Compiler;VM;DBMS</PackageTags>
<RepositoryUrl>https://github.com/pine-vm/pine.git</RepositoryUrl>
Expand Down Expand Up @@ -41,7 +41,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
</ItemGroup>

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

public class Program
{
public static string AppVersionId => "0.3.20";
public static string AppVersionId => "0.3.21";

private static int AdminInterfaceDefaultPort => 4000;

Expand Down
9 changes: 4 additions & 5 deletions implement/pine/pine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>pine</AssemblyName>
<RootNamespace>Pine</RootNamespace>
<AssemblyVersion>0.3.20</AssemblyVersion>
<FileVersion>0.3.20</FileVersion>
<AssemblyVersion>0.3.21</AssemblyVersion>
<FileVersion>0.3.21</FileVersion>
<Nullable>enable</Nullable>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
Expand Down Expand Up @@ -45,16 +45,15 @@
<PackageReference Include="LibGit2Sharp" Version="0.28.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
<PackageReference Include="ReadLine" Version="2.0.1" />
<PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="TupleAsJsonArray" Version="1.0.2" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource
Include="Elm\elm-compiler\**\*.elm;Elm\elm-compiler\**\*.json;" />
<EmbeddedResource Include="Elm\elm-compiler\**\*.elm;Elm\elm-compiler\**\*.json;" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 9f205aa

Please sign in to comment.