Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/MonoAotValidation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
11 changes: 8 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzztests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stryker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup Condition=" '$(NeedsFlatSharpCompiler)' == 'true' ">
<FlatSharpCompilerPath>$(MSBuildThisFileDirectory)FlatSharp.Compiler/bin/$(Configuration)/net8.0/FlatSharp.Compiler.dll</FlatSharpCompilerPath>
<FlatSharpCompilerPath>$(MSBuildThisFileDirectory)FlatSharp.Compiler/bin/$(Configuration)/net10.0/FlatSharp.Compiler.dll</FlatSharpCompilerPath>
<FlatSharpNameNormalization>true</FlatSharpNameNormalization>
</PropertyGroup>

Expand All @@ -9,7 +9,7 @@
<Private>false</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<GlobalPropertiesToRemove>RuntimeIdentifier</GlobalPropertiesToRemove>
<SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
<SetTargetFramework>TargetFramework=net10.0</SetTargetFramework>
</ProjectReference>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/FlatSharp.Compiler/FlatSharp.Compiler.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<AssemblyName>FlatSharp.Compiler</AssemblyName>
<RootNamespace>FlatSharp.Compiler</RootNamespace>
<OutputType>Exe</OutputType>
Expand All @@ -15,7 +15,7 @@
<NoWarn>$(NoWarn);CS3021;3021;NU5127</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0' ">
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions src/FlatSharp.Compiler/FlatSharp.Compiler.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
<file src="$OutDir$\net7.0\**" target="tools/net7.0" />
<file src="$OutDir$\net8.0\**" target="tools/net8.0" />
<file src="$OutDir$\net9.0\**" target="tools/net9.0" />
<file src="$OutDir$\net10.0\**" target="tools/net10.0" />
</files>
</package>
6 changes: 4 additions & 2 deletions src/FlatSharp.Compiler/FlatSharp.Compiler.targets
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@
<IsMatching7>$([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '7\.0\.\d+'))</IsMatching7>
<IsMatching8>$([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '8\.0\.\d+'))</IsMatching8>
<IsMatching9>$([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '9\.0\.\d+'))</IsMatching9>
<CompilerVersion>net9.0</CompilerVersion>
<IsMatching10>$([System.Text.RegularExpressions.Regex]::IsMatch($(StdOut), '10\.0\.\d+'))</IsMatching10>
<CompilerVersion>net10.0</CompilerVersion>
<CompilerVersion Condition=" '$(IsMatching6)' == 'True' ">net6.0</CompilerVersion>
<CompilerVersion Condition=" '$(IsMatching7)' == 'True' ">net7.0</CompilerVersion>
<CompilerVersion Condition=" '$(IsMatching8)' == 'True' ">net8.0</CompilerVersion>
<CompilerVersion Condition=" '$(IsMatching9)' == 'True' ">net9.0</CompilerVersion>
<CompilerVersion Condition=" '$(IsMatching10)' == 'True' ">net10.0</CompilerVersion>
</PropertyGroup>

<Message Text=".NET runtime detection: 6: $(IsMatching6), 7: $(IsMatching7), 8: $(IsMatching8), 9: $(IsMatching9). Selected: $(CompilerVersion)" Importance="High"/>
<Message Text=".NET runtime detection: 6: $(IsMatching6), 7: $(IsMatching7), 8: $(IsMatching8), 9: $(IsMatching9), 10: $(IsMatching10). Selected: $(CompilerVersion)" Importance="High"/>

<PropertyGroup>
<FlatSharpOutput>$(IntermediateOutputPath)</FlatSharpOutput>
Expand Down
4 changes: 2 additions & 2 deletions src/FlatSharp.Runtime/FlatSharp.Runtime.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<AssemblyName>FlatSharp.Runtime</AssemblyName>
<RootNamespace>FlatSharp.Runtime</RootNamespace>
<Description>FlatSharp.Runtime is the runtime component of FlatSharp that supports code emitted by the FlatSharp.Compiler package.</Description>
Expand All @@ -11,7 +11,7 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0' ">
<Nullable>enable</Nullable>
<IsAotCompatible>true</IsAotCompatible>
</PropertyGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/FlatSharp/FlatSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<AssemblyName>FlatSharp</AssemblyName>
<RootNamespace>FlatSharp</RootNamespace>
<Description>FlatSharp is an idiomatic C# implementation of the FlatBuffer serialization format. Use attributes to declare your data contracts!</Description>
Expand Down Expand Up @@ -32,7 +32,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Memory" />
<PackageReference Include="NetStandard.Library" VersionOverride="2.0.3" GeneratePathProperty="true" PrivateAssets="All" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<PlatformTarget>x64</PlatformTarget>
<AssemblyName>FlatSharpCompilerTests</AssemblyName>
Expand All @@ -17,7 +17,6 @@
</PackageReference>
<PackageReference Include="Grpc.Core" />
<PackageReference Include="Grpc.Core.Api" />
<PackageReference Include="Microsoft.CSharp" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" />
<PackageReference Include="xunit" />
Expand Down
12 changes: 5 additions & 7 deletions src/Tests/FlatSharpEndToEndTests/FlatSharpEndToEndTests.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<NeedsFlatSharpCompiler>true</NeedsFlatSharpCompiler>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(PipelineBuild)' == 'true' and '$([MSBuild]::IsOSUnixLike())' != 'true' ">net472;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(PipelineBuild)' == 'true' and '$([MSBuild]::IsOSUnixLike())' == 'true' ">net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(PipelineBuild)' == 'true' and '$([MSBuild]::IsOSUnixLike())' != 'true' ">net472;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(PipelineBuild)' == 'true' and '$([MSBuild]::IsOSUnixLike())' == 'true' ">net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>FlatSharpEndToEndTests</AssemblyName>
<RootNamespace>FlatSharpTests</RootNamespace>
Expand All @@ -19,7 +19,7 @@

<PropertyGroup Condition=" '$(BuildAot)' == 'true' ">
<PublishAot>true</PublishAot>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<StartupObject>FlatSharpEndToEndTests.Program</StartupObject>
<OutputType>exe</OutputType>
<DefineConstants>$(DefineConstants);AOT</DefineConstants>
Expand All @@ -34,10 +34,8 @@
<ItemGroup>
<PackageReference Include="Grpc.Core" />
<PackageReference Include="Grpc.Core.Api" />
<PackageReference Include="Microsoft.CSharp" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="System.Threading.Channels" />

<PackageReference Include="coverlet.collector" Condition=" '$(CoverageBuild)' == 'true' ">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -62,7 +60,7 @@

<Target Name="FlatSharpFbsCompileToString" BeforeTargets="ResolveAssemblyReferences">
<PropertyGroup>
<CompilerVersion>net8.0</CompilerVersion>
<CompilerVersion>net10.0</CompilerVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Stryker/CodeGen/CodeGen.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<NeedsFlatSharpCompiler>true</NeedsFlatSharpCompiler>
<FlatSharpMutationTestingMode>true</FlatSharpMutationTestingMode>
<AssemblyName>StrykerTestsCodeGen</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Stryker/FuzzTests/FuzzTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputType>exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Stryker/Tests/StrykerTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>FlatSharpStrykerTests</AssemblyName>
<RootNamespace>FlatSharpStrykerTests</RootNamespace>
Expand Down