Skip to content

Commit

Permalink
Merge pull request MessagePack-CSharp#1832 from MessagePack-CSharp/fi…
Browse files Browse the repository at this point in the history
…x1831

Add .NET 8 target to mpc
  • Loading branch information
AArnott authored Jun 7, 2024
2 parents ec9c95e + 8732272 commit 3aec9fd
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
FROM mcr.microsoft.com/dotnet/sdk:7.0.101-jammy
FROM mcr.microsoft.com/dotnet/sdk:8.0.300-jammy

# Installing mono makes `dotnet test` work without errors even for net472.
# But installing it takes a long time, so it's excluded by default.
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<PackageVersion Include="ReactiveProperty" Version="9.1.2" />
<PackageVersion Include="Sigil" version="5.0.0" />
<PackageVersion Include="SpanJson" Version="4.0.0" />
<PackageVersion Include="System.CodeDom" Version="6.0.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="Utf8Json" Version="1.3.7" />
<PackageVersion Include="xunit.runner.console" Version="2.8.1" />
Expand All @@ -55,7 +56,6 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageVersion Include="System.CodeDom" Version="6.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.101",
"version": "8.0.300",
"rollForward": "patch",
"allowPrerelease": false
}
Expand Down
2 changes: 1 addition & 1 deletion sandbox/Sandbox/codegen.ps1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dotnet run -f "net7.0" --project "$PSScriptRoot/../../src/MessagePack.Generator/MessagePack.Generator.csproj" -- -i "$PSScriptRoot/../SharedData/SharedData.csproj" -o "$PSScriptRoot/Generated.cs"
dotnet run -f net8.0 --project "$PSScriptRoot/../../src/MessagePack.Generator/MessagePack.Generator.csproj" -- -i "$PSScriptRoot/../SharedData/SharedData.csproj" -o "$PSScriptRoot/Generated.cs"
2 changes: 1 addition & 1 deletion sandbox/TestData2/codegen.ps1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dotnet run -f "net7.0" --project "$PSScriptRoot/../../src/MessagePack.Generator/MessagePack.Generator.csproj" -- -i "$PSScriptRoot/TestData2.csproj" -o "$PSScriptRoot/Generated.cs"
dotnet run -f net8.0 --project "$PSScriptRoot/../../src/MessagePack.Generator/MessagePack.Generator.csproj" -- -i "$PSScriptRoot/TestData2.csproj" -o "$PSScriptRoot/Generated.cs"
3 changes: 2 additions & 1 deletion src/MessagePack.Generator/MessagePack.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>mpc</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<ToolCommandName>mpc</ToolCommandName>
<RollForward>Major</RollForward>
Expand All @@ -21,6 +21,7 @@
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
<PackageReference Include="System.CodeDom" ExcludeAssets="runtime" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 3aec9fd

Please sign in to comment.