Merge pull request #57 from discord-csharp/net9

Bump to .NET 9
discord-csharp · Nov 12, 2024 · 6fe7aec · 6fe7aec
2 parents ed96f5f + 0308e00
commit 6fe7aec
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/CSharpRepl.Tests/CSharpRepl.Tests.csproj b/CSharpRepl.Tests/CSharpRepl.Tests.csproj
@@ -3,19 +3,19 @@
 	<PropertyGroup>
 		<EnablePreviewFeatures>true</EnablePreviewFeatures>
 		<LangVersion>preview</LangVersion>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<RootNamespace>CSDiscordService.Tests</RootNamespace>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.reporters" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+		<PackageReference Include="xunit" Version="2.9.2" />
+		<PackageReference Include="xunit.runner.reporters" Version="2.9.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

diff --git a/CSharpRepl.Tests/EvalTests.cs b/CSharpRepl.Tests/EvalTests.cs
@@ -69,7 +69,7 @@ public EvalTests(ITestOutputHelper outputHelper)
         [InlineData(@"var a = ""thing""; return a;", "thing", "string")]
         [InlineData("Math.Pow(1,2)", 1D, "double")]
         [InlineData(@"Enumerable.Range(0,1).Select(a=>""@"");", null, null)]
-        [InlineData("typeof(int)", "System.Int32, System.Private.CoreLib, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "RuntimeType")]
+        [InlineData("typeof(int)", "System.Int32, System.Private.CoreLib, Version=9.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "RuntimeType")]
         [InlineData("Assembly.GetExecutingAssembly()", true, "RuntimeAssembly")]
         [InlineData("TimeSpan.FromSeconds(2310293892)", "26739.12:18:12", "TimeSpan")]
         [InlineData("float.PositiveInfinity", "Infinity", "float")]

diff --git a/CSharpRepl/CSharpRepl.csproj b/CSharpRepl/CSharpRepl.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
 		<EnablePreviewFeatures>true</EnablePreviewFeatures>
         <LangVersion>preview</LangVersion>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <UserSecretsId>03629088-8bb9-4faf-8162-debf93066bc4</UserSecretsId>
     </PropertyGroup>
@@ -15,9 +15,9 @@
     <ItemGroup>
         <PackageReference Include="AngouriMath" Version="1.3.0" />
         <PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="NuGet.Resolver" Version="6.8.0" />
+        <PackageReference Include="NuGet.Resolver" Version="6.11.1" />
         <PackageReference Include="Seq.Extensions.Logging" Version="6.1.0" />
     </ItemGroup>
     <ItemGroup>

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 as dotnet-build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 as dotnet-build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 WORKDIR /src
@@ -10,7 +10,7 @@ RUN dotnet build --configuration Release --no-restore
 #RUN dotnet test --configuration Release CSharpRepl.Tests/CSharpRepl.Tests.csproj --no-build --no-restore
 RUN dotnet publish --configuration Release CSharpRepl/CSharpRepl.csproj --no-build --no-restore -o /app
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:9.0
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 WORKDIR /app