diff --git a/.github/workflows/MonoAotValidation.yml b/.github/workflows/MonoAotValidation.yml index d4dcea91..06f225f0 100644 --- a/.github/workflows/MonoAotValidation.yml +++ b/.github/workflows/MonoAotValidation.yml @@ -22,12 +22,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET 9 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-quality: preview - dotnet-version: 9.0.x - + dotnet-version: 10.0.x + - name: Install Mono run: sudo apt install mono-complete diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 3d187498..c6b17f5d 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -17,6 +17,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Setup .NET 10 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 10.0.x + - name: Setup .NET 9 uses: actions/setup-dotnet@v4 with: @@ -90,15 +95,15 @@ jobs: - name: E2E Tests working-directory: src - run: dotnet test Tests/FlatSharpEndToEndTests -c Debug -p:SignAssembly=false --collect:"XPlat Code Coverage" --settings Tests/coverlet.runsettings -f net9.0 + run: dotnet test Tests/FlatSharpEndToEndTests -c Debug -p:SignAssembly=false --collect:"XPlat Code Coverage" --settings Tests/coverlet.runsettings -f net10.0 - name: Compiler Tests working-directory: src - run: dotnet test Tests/FlatSharpCompilerTests -c Debug -p:SignAssembly=false --collect:"XPlat Code Coverage" --settings Tests/coverlet.runsettings -f net9.0 + run: dotnet test Tests/FlatSharpCompilerTests -c Debug -p:SignAssembly=false --collect:"XPlat Code Coverage" --settings Tests/coverlet.runsettings -f net10.0 - name: Stryker Tests working-directory: src - run: dotnet test Tests/Stryker/Tests -c Debug -p:SignAssembly=false --collect:"XPlat Code Coverage" --settings Tests/coverlet.runsettings -f net9.0 + run: dotnet test Tests/Stryker/Tests -c Debug -p:SignAssembly=false --collect:"XPlat Code Coverage" --settings Tests/coverlet.runsettings -f net10.0 - name: Upload run: codecov -f **/*coverage*.xml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 41a3a6a2..5e33bb35 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -23,7 +23,12 @@ jobs: AppVeyorBuild: true steps: - uses: actions/checkout@v2 - + + - name: Setup .NET 10 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 10.0.x + - name: Setup .NET 9 uses: actions/setup-dotnet@v4 with: @@ -61,8 +66,8 @@ jobs: env: BuildAot: 'true' run: | - dotnet publish -c Release -f net9.0 -r ${{ matrix.rid }} - ./bin/Release/net9.0/${{ matrix.rid }}/publish/FlatSharpEndToEndTests + dotnet publish -c Release -f net10.0 -r ${{ matrix.rid }} + ./bin/Release/net10.0/${{ matrix.rid }}/publish/FlatSharpEndToEndTests - name: Compiler Test working-directory: src/Tests/FlatSharpCompilerTests diff --git a/.github/workflows/fuzztests.yml b/.github/workflows/fuzztests.yml index 43acecc6..13d2fa9d 100644 --- a/.github/workflows/fuzztests.yml +++ b/.github/workflows/fuzztests.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET 9 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Install SharpFuzz run: dotnet tool install --global SharpFuzz.CommandLine diff --git a/.github/workflows/stryker.yml b/.github/workflows/stryker.yml index 1c485711..e94d2e1d 100644 --- a/.github/workflows/stryker.yml +++ b/.github/workflows/stryker.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET 9 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Install Stryker run: dotnet tool install -g dotnet-stryker diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 51803969..5148b16c 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,6 +1,6 @@ - $(MSBuildThisFileDirectory)FlatSharp.Compiler/bin/$(Configuration)/net8.0/FlatSharp.Compiler.dll + $(MSBuildThisFileDirectory)FlatSharp.Compiler/bin/$(Configuration)/net10.0/FlatSharp.Compiler.dll true @@ -9,7 +9,7 @@ false false RuntimeIdentifier - TargetFramework=net8.0 + TargetFramework=net10.0 diff --git a/src/FlatSharp.Compiler/FlatSharp.Compiler.csproj b/src/FlatSharp.Compiler/FlatSharp.Compiler.csproj index e95d93be..ae0329c7 100644 --- a/src/FlatSharp.Compiler/FlatSharp.Compiler.csproj +++ b/src/FlatSharp.Compiler/FlatSharp.Compiler.csproj @@ -1,7 +1,7 @@  true - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 FlatSharp.Compiler FlatSharp.Compiler Exe @@ -15,7 +15,7 @@ $(NoWarn);CS3021;3021;NU5127 - + enable diff --git a/src/FlatSharp.Compiler/FlatSharp.Compiler.nuspec b/src/FlatSharp.Compiler/FlatSharp.Compiler.nuspec index 236da248..4b419ca9 100644 --- a/src/FlatSharp.Compiler/FlatSharp.Compiler.nuspec +++ b/src/FlatSharp.Compiler/FlatSharp.Compiler.nuspec @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/src/FlatSharp.Compiler/FlatSharp.Compiler.targets b/src/FlatSharp.Compiler/FlatSharp.Compiler.targets index bdf3b84b..7a2ad5bb 100644 --- a/src/FlatSharp.Compiler/FlatSharp.Compiler.targets +++ b/src/FlatSharp.Compiler/FlatSharp.Compiler.targets @@ -104,14 +104,16 @@ $([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '7\.0\.\d+')) $([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '8\.0\.\d+')) $([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '9\.0\.\d+')) - net9.0 + $([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '10\.0\.\d+')) + net10.0 net6.0 net7.0 net8.0 net9.0 + net10.0 - + $(IntermediateOutputPath) diff --git a/src/FlatSharp.Runtime/FlatSharp.Runtime.csproj b/src/FlatSharp.Runtime/FlatSharp.Runtime.csproj index 55ff7475..f31afefe 100644 --- a/src/FlatSharp.Runtime/FlatSharp.Runtime.csproj +++ b/src/FlatSharp.Runtime/FlatSharp.Runtime.csproj @@ -1,7 +1,7 @@  true - netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0 + netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0 FlatSharp.Runtime FlatSharp.Runtime FlatSharp.Runtime is the runtime component of FlatSharp that supports code emitted by the FlatSharp.Compiler package. @@ -11,7 +11,7 @@ $(NoWarn);CS1591 - + enable true diff --git a/src/FlatSharp/FlatSharp.csproj b/src/FlatSharp/FlatSharp.csproj index 4167cb60..89e1844f 100644 --- a/src/FlatSharp/FlatSharp.csproj +++ b/src/FlatSharp/FlatSharp.csproj @@ -1,7 +1,7 @@  true - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 FlatSharp FlatSharp FlatSharp is an idiomatic C# implementation of the FlatBuffer serialization format. Use attributes to declare your data contracts! @@ -32,7 +32,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Tests/FlatSharpCompilerTests/FlatSharpCompilerTests.csproj b/src/Tests/FlatSharpCompilerTests/FlatSharpCompilerTests.csproj index f25b791d..bef63e56 100644 --- a/src/Tests/FlatSharpCompilerTests/FlatSharpCompilerTests.csproj +++ b/src/Tests/FlatSharpCompilerTests/FlatSharpCompilerTests.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 false x64 FlatSharpCompilerTests @@ -17,7 +17,6 @@ - diff --git a/src/Tests/FlatSharpEndToEndTests/FlatSharpEndToEndTests.csproj b/src/Tests/FlatSharpEndToEndTests/FlatSharpEndToEndTests.csproj index a7e1e2d8..189ba5fc 100644 --- a/src/Tests/FlatSharpEndToEndTests/FlatSharpEndToEndTests.csproj +++ b/src/Tests/FlatSharpEndToEndTests/FlatSharpEndToEndTests.csproj @@ -1,9 +1,9 @@  true - net9.0 - net472;net6.0;net7.0;net8.0;net9.0 - net6.0;net7.0;net8.0;net9.0 + net10.0 + net472;net6.0;net7.0;net8.0;net9.0;net10.0 + net6.0;net7.0;net8.0;net9.0;net10.0 false FlatSharpEndToEndTests FlatSharpTests @@ -19,7 +19,7 @@ true - net9.0 + net10.0 FlatSharpEndToEndTests.Program exe $(DefineConstants);AOT @@ -34,10 +34,8 @@ - - all @@ -62,7 +60,7 @@ - net8.0 + net10.0 diff --git a/src/Tests/Stryker/CodeGen/CodeGen.csproj b/src/Tests/Stryker/CodeGen/CodeGen.csproj index ce8957d3..e02fc8c8 100644 --- a/src/Tests/Stryker/CodeGen/CodeGen.csproj +++ b/src/Tests/Stryker/CodeGen/CodeGen.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true true StrykerTestsCodeGen diff --git a/src/Tests/Stryker/FuzzTests/FuzzTests.csproj b/src/Tests/Stryker/FuzzTests/FuzzTests.csproj index 148d1955..76e08573 100644 --- a/src/Tests/Stryker/FuzzTests/FuzzTests.csproj +++ b/src/Tests/Stryker/FuzzTests/FuzzTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable exe diff --git a/src/Tests/Stryker/Tests/StrykerTests.csproj b/src/Tests/Stryker/Tests/StrykerTests.csproj index 63658b8c..de74ae40 100644 --- a/src/Tests/Stryker/Tests/StrykerTests.csproj +++ b/src/Tests/Stryker/Tests/StrykerTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false FlatSharpStrykerTests FlatSharpStrykerTests