Skip to content

Commit 6fe7aec

Browse files
Merge pull request #57 from discord-csharp/net9
Bump to .NET 9
2 parents ed96f5f + 0308e00 commit 6fe7aec

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

CSharpRepl.Tests/CSharpRepl.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<PropertyGroup>
44
<EnablePreviewFeatures>true</EnablePreviewFeatures>
55
<LangVersion>preview</LangVersion>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<RootNamespace>CSDiscordService.Tests</RootNamespace>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
16-
<PackageReference Include="xunit" Version="2.6.2" />
17-
<PackageReference Include="xunit.runner.reporters" Version="2.6.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
14+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16+
<PackageReference Include="xunit" Version="2.9.2" />
17+
<PackageReference Include="xunit.runner.reporters" Version="2.9.2" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2121
</PackageReference>

CSharpRepl.Tests/EvalTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public EvalTests(ITestOutputHelper outputHelper)
6969
[InlineData(@"var a = ""thing""; return a;", "thing", "string")]
7070
[InlineData("Math.Pow(1,2)", 1D, "double")]
7171
[InlineData(@"Enumerable.Range(0,1).Select(a=>""@"");", null, null)]
72-
[InlineData("typeof(int)", "System.Int32, System.Private.CoreLib, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "RuntimeType")]
72+
[InlineData("typeof(int)", "System.Int32, System.Private.CoreLib, Version=9.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "RuntimeType")]
7373
[InlineData("Assembly.GetExecutingAssembly()", true, "RuntimeAssembly")]
7474
[InlineData("TimeSpan.FromSeconds(2310293892)", "26739.12:18:12", "TimeSpan")]
7575
[InlineData("float.PositiveInfinity", "Infinity", "float")]

CSharpRepl/CSharpRepl.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<EnablePreviewFeatures>true</EnablePreviewFeatures>
55
<LangVersion>preview</LangVersion>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<OutputType>Exe</OutputType>
88
<UserSecretsId>03629088-8bb9-4faf-8162-debf93066bc4</UserSecretsId>
99
</PropertyGroup>
@@ -15,9 +15,9 @@
1515
<ItemGroup>
1616
<PackageReference Include="AngouriMath" Version="1.3.0" />
1717
<PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
20-
<PackageReference Include="NuGet.Resolver" Version="6.8.0" />
20+
<PackageReference Include="NuGet.Resolver" Version="6.11.1" />
2121
<PackageReference Include="Seq.Extensions.Logging" Version="6.1.0" />
2222
</ItemGroup>
2323
<ItemGroup>

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 as dotnet-build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 as dotnet-build
22
ARG TARGETPLATFORM
33
ARG BUILDPLATFORM
44
WORKDIR /src
@@ -10,7 +10,7 @@ RUN dotnet build --configuration Release --no-restore
1010
#RUN dotnet test --configuration Release CSharpRepl.Tests/CSharpRepl.Tests.csproj --no-build --no-restore
1111
RUN dotnet publish --configuration Release CSharpRepl/CSharpRepl.csproj --no-build --no-restore -o /app
1212

13-
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0
13+
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:9.0
1414
ARG TARGETPLATFORM
1515
ARG BUILDPLATFORM
1616
WORKDIR /app

0 commit comments

Comments
 (0)