Skip to content

Commit

Permalink
Switch to .NET version 9 and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Viir committed Jan 18, 2025
1 parent 0bd1daf commit df35124
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 33 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.404'
dotnet-version: '9.0.102'

- 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.404'
dotnet-version: '9.0.102'

- 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.404'
dotnet-version: '9.0.102'

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

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

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:8.0.11 AS binaries
FROM mcr.microsoft.com/dotnet/aspnet:9.0.1 AS binaries

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

Expand Down
12 changes: 6 additions & 6 deletions implement/Pine.Core/Pine.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<AssemblyVersion>0.3.32</AssemblyVersion>
<FileVersion>0.3.32</FileVersion>
<AssemblyVersion>0.3.33</AssemblyVersion>
<FileVersion>0.3.33</FileVersion>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.1" />
</ItemGroup>

</Project>
7 changes: 4 additions & 3 deletions implement/PineTest/Pine.UnitTests/Pine.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand All @@ -10,9 +10,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion implement/native-tools/native-tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>native_tools</RootNamespace>
<Nullable>enable</Nullable>
<PublishSingleFile>true</PublishSingleFile>
Expand Down
2 changes: 1 addition & 1 deletion implement/pine/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace ElmTime;

public class Program
{
public static string AppVersionId => "0.3.32";
public static string AppVersionId => "0.3.33";

private static int AdminInterfaceDefaultPort => 4000;

Expand Down
16 changes: 8 additions & 8 deletions implement/pine/pine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<AssemblyName>pine</AssemblyName>
<RootNamespace>Pine</RootNamespace>
<AssemblyVersion>0.3.32</AssemblyVersion>
<FileVersion>0.3.32</FileVersion>
<AssemblyVersion>0.3.33</AssemblyVersion>
<FileVersion>0.3.33</FileVersion>
<Nullable>enable</Nullable>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

<PropertyGroup>
<Description>Runtime environment for the Elm programming language</Description>
<PackageTags>Elm;Runtime;DBMS</PackageTags>
<Description>Elm DevTools and runtime</Description>
<PackageTags>Elm;DevTools;Runtime;DBMS</PackageTags>
<RepositoryUrl>https://github.com/pine-vm/pine.git</RepositoryUrl>
<PackageProjectUrl>https://pine-vm.org</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down Expand Up @@ -45,10 +45,10 @@
<PackageReference Include="LibGit2Sharp" Version="0.28.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
<PackageReference Include="ReadLine" Version="2.0.1" />
<PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="StreamJsonRpc" Version="2.20.20" />
<PackageReference Include="TupleAsJsonArray" Version="1.0.2" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions implement/prebuild/prebuild.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Pine.Core\Pine.Core.csproj" />
<ProjectReference Include="..\pine\pine.csproj" />
<ItemGroup>
<ProjectReference Include="..\Pine.Core\Pine.Core.csproj" />
<ProjectReference Include="..\pine\pine.csproj" />
</ItemGroup>

</Project>
10 changes: 6 additions & 4 deletions implement/test-elm-time/test-elm-time.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>TestElmTime</RootNamespace>

<IsPackable>false</IsPackable>
Expand All @@ -14,15 +14,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="FluentAssertions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="morelinq" Version="4.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
<PackageReference Include="coverlet.collector" Version="6.0.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="StreamJsonRpc" Version="2.20.20" />
</ItemGroup>

Expand Down

0 comments on commit df35124

Please sign in to comment.