Build refactor

.github/workflows/MonoAotValidation.yml

@@ -30,34 +30,24 @@ jobs:
     - name: Install Mono
       run: sudo apt install mono-complete
 
-    - name: AOT Compile mscorlib
-      run: sudo mono -O=all --aot=full /usr/lib/mono/4.5/mscorlib.dll
-
-    - name: AOT Compile Other Libs
-      run: for i in /usr/lib/mono/gac/*/*/*.dll; do sudo mono -O=all --aot=full $i; done
-
     - name: Restore dependencies
       working-directory: src
       run: dotnet restore
 
-    - name: Build FlatSharp.Compiler
-      working-directory: src/FlatSharp.Compiler
-      run: dotnet build -c Release
-
-    - name: Run FlatSharp.Compiler
-      # You may pin to the exact commit or the version.
-      # uses: Amadevus/pwsh-script@97a8b211a5922816aa8a69ced41fa32f23477186
-      uses: Amadevus/pwsh-script@v2.0.3
-      with:
-        # PowerShell script to execute in Actions-hydrated context
-        script: |
-          $fbs = (gci -r src/Tests/CompileTests/NativeAot/*.fbs) -join ";"
-          dotnet src/FlatSharp.Compiler/bin/Release/net8.0/FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input "$fbs" -o src/Tests/CompileTests/NativeAot
-
     - name: Build
       working-directory: src/Tests/CompileTests/NativeAot
       run: dotnet build -c Release
 
+    - name: Run (No AOT)
+      working-directory: src/Tests/CompileTests/NativeAot/bin/Release/net472
+      run: mono NativeAot.exe
+
+    - name: AOT Compile mscorlib
+      run: sudo mono -O=all --aot=full /usr/lib/mono/4.5/mscorlib.dll
+
+    - name: AOT Compile Other Libs
+      run: for i in /usr/lib/mono/gac/*/*/*.dll; do sudo mono -O=all --aot=full $i; done
+
     - name: AOT Exes
       working-directory: src/Tests/CompileTests/NativeAot/bin/Release/net472
       run: mono -O=all --aot=full *.exe
@@ -66,10 +56,6 @@ jobs:
       working-directory: src/Tests/CompileTests/NativeAot/bin/Release/net472
       run: mono -O=all --aot=full *.dll
 
-    - name: Run (No AOT)
-      working-directory: src/Tests/CompileTests/NativeAot/bin/Release/net472
-      run: mono NativeAot.exe
-
     - name: Run (AOT)
       working-directory: src/Tests/CompileTests/NativeAot/bin/Release/net472
       run: mono --full-aot NativeAot.exe

.github/workflows/codecov.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     env:
       AppVeyorBuild: true
       CoverageBuild: true
@@ -64,7 +64,7 @@ jobs:
             --format opencover `
             --target "dotnet" `
             --output e2etests.coverage.xml `
-            --targetargs "src\FlatSharp.Compiler\bin\Debug\net8.0\FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input `"$fbs`" -o src/tests/FlatSharpEndToEndTests"
+            --targetargs "src\FlatSharp.Compiler\bin\Debug\net8.0\FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input `"$fbs`" -o ."
 
     - name: Run FlatSharp.Compiler (Pooling Tests)
       # You may pin to the exact commit or the version.
@@ -81,7 +81,7 @@ jobs:
             --format opencover `
             --target "dotnet" `
             --output pooling.coverage.xml `
-            --targetargs "src\FlatSharp.Compiler\bin\Debug\net8.0\FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --gen-poolable true --input `"$fbs`" -o src/tests/FlatSharpPoolableEndToEndTests"
+            --targetargs "src\FlatSharp.Compiler\bin\Debug\net8.0\FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --gen-poolable true --input `"$fbs`" -o ."
 
     - name: Run FlatSharp.Compiler (Stryker Tests)
       # You may pin to the exact commit or the version.
@@ -98,7 +98,7 @@ jobs:
             --format opencover `
             --target "dotnet" `
             --output stryker.coverage.xml `
-            --targetargs "src/FlatSharp.Compiler/bin/Debug/net8.0/FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input `"$fbs`" -o src/tests/Stryker/CodeGen --mutation-testing-mode"
+            --targetargs "src/FlatSharp.Compiler/bin/Debug/net8.0/FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input `"$fbs`" -o . --mutation-testing-mode"
 
     - name: E2E Tests
       working-directory: src

.github/workflows/dotnet.yml

@@ -43,30 +43,6 @@ jobs:
       working-directory: src
       run: dotnet restore
 
-    - name: Build FlatSharp.Compiler
-      working-directory: src/FlatSharp.Compiler
-      run: dotnet build -c Release /p:SignAssembly=true
-
-    - name: Run FlatSharp.Compiler (E2E Tests)
-      # You may pin to the exact commit or the version.
-      # uses: Amadevus/pwsh-script@97a8b211a5922816aa8a69ced41fa32f23477186
-      uses: Amadevus/pwsh-script@v2.0.3
-      with:
-        # PowerShell script to execute in Actions-hydrated context
-        script: |
-          $fbs = (gci -r src/Tests/FlatSharpEndToEndTests/*.fbs) -join ";"
-          dotnet src/FlatSharp.Compiler/bin/Release/net8.0/FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input "$fbs" -o src/Tests/FlatSharpEndToEndTests
-
-    - name: Run FlatSharp.Compiler (Pooling Tests)
-      # You may pin to the exact commit or the version.
-      # uses: Amadevus/pwsh-script@97a8b211a5922816aa8a69ced41fa32f23477186
-      uses: Amadevus/pwsh-script@v2.0.3
-      with:
-        # PowerShell script to execute in Actions-hydrated context
-        script: |
-          $fbs = (gci -r src/Tests/FlatSharpPoolableEndToEndTests/*.fbs) -join ";"
-          dotnet src/FlatSharp.Compiler/bin/Release/net8.0/FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --gen-poolable true --input "$fbs" -o src/Tests/FlatSharpPoolableEndToEndTests
-
     - name: Build
       working-directory: src
       run: dotnet build -c Release /p:SignAssembly=true

.github/workflows/stryker.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     env:
       AppVeyorBuild: true
     steps:
@@ -22,28 +22,14 @@ jobs:
 
     - name: Install Stryker
       run: dotnet tool install -g dotnet-stryker
-
-    - name: Build FlatSharp.Compiler
-      working-directory: src/FlatSharp.Compiler
-      run: dotnet build -c Release
 
-    - name: Run FlatSharp.Compiler (Mutation Tests)
-      # You may pin to the exact commit or the version.
-      # uses: Amadevus/pwsh-script@97a8b211a5922816aa8a69ced41fa32f23477186
-      uses: Amadevus/pwsh-script@v2.0.3
-      with:
-        # PowerShell script to execute in Actions-hydrated context
-        script: |
-          $fbs = (gci -r src/tests/Stryker/*.fbs) -join ";"
-          dotnet src/FlatSharp.Compiler/bin/Release/net8.0/FlatSharp.Compiler.dll --nullable-warnings false --normalize-field-names true --input "$fbs" -o src/tests/Stryker/CodeGen --mutation-testing-mode
-
     - name: Build
       working-directory: src/Tests/Stryker/Tests
-      run: dotnet build -c Release
+      run: dotnet build -c Debug
 
     - name: Test
       working-directory: src/Tests/Stryker/Tests
-      run: dotnet test -c Release
+      run: dotnet test -c Debug
 
     - name: Mutate
       working-directory: src/Tests/Stryker/Tests

src/Benchmarks/Benchmark/Benchmark.csproj

@@ -5,9 +5,8 @@
     <DelaySign>false</DelaySign>
     <SignAssembly>false</SignAssembly>
     <DefineConstants>$(DefineContants);CURRENT_VERSION_ONLY;RUN_COMPARISON_BENCHMARKS;FLATSHARP_7_0_0_OR_GREATER</DefineConstants>
-    <FlatSharpCompilerPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\FlatSharp.Compiler\bin\Release\net8.0\FlatSharp.Compiler.dll'))</FlatSharpCompilerPath>
-    <FlatSharpNameNormalization>true</FlatSharpNameNormalization>
     <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
+    <NeedsFlatSharpCompiler>true</NeedsFlatSharpCompiler>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(BuildAot)' == 'true' ">
@@ -56,11 +55,4 @@
     <FlatSharpSchema Include="FBBench/FlatSharp.fbs" />
     <Protobuf Include="FBBench/Benchmark.proto" />
   </ItemGroup>
-
-  <Import Project="..\..\FlatSharp.Compiler\FlatSharp.Compiler.targets" />
-
-  <Target Name="BuildCompiler" BeforeTargets="FlatSharpFbsCompile">
-    <MSBuild Projects="..\..\FlatSharp.Compiler\FlatSharp.Compiler.csproj" Properties="Configuration=Release;TargetFramework=net8.0" />
-  </Target>
-
 </Project>

src/Benchmarks/BenchmarkOld/BenchmarkOld.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="protobuf-net" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />

src/Benchmarks/ExperimentalBenchmark/ExperimentalBenchmark.csproj

@@ -1,30 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFrameworks>net8.0</TargetFrameworks>
-        <DelaySign>false</DelaySign>
-        <SignAssembly>false</SignAssembly>
-        <!--<PublishAot>true</PublishAot>-->
-        <IsPackable>false</IsPackable>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <FlatSharpCompilerPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\FlatSharp.Compiler\bin\$(Configuration)\net8.0\FlatSharp.Compiler.dll'))</FlatSharpCompilerPath>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <DelaySign>false</DelaySign>
+    <SignAssembly>false</SignAssembly>
+    <!--<PublishAot>true</PublishAot>-->
+    <IsPackable>false</IsPackable>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <NeedsFlatSharpCompiler>true</NeedsFlatSharpCompiler>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" />
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\FlatSharp.Compiler\FlatSharp.Compiler.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
-        <ProjectReference Include="..\..\FlatSharp.Runtime\FlatSharp.Runtime.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\FlatSharp.Runtime\FlatSharp.Runtime.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <FlatSharpSchema Include="Benchmark.fbs" />
-    </ItemGroup>
-
-    <Import Project="..\..\FlatSharp.Compiler\FlatSharp.Compiler.targets" />
+  <ItemGroup>
+    <FlatSharpSchema Include="Benchmark.fbs" />
+  </ItemGroup>
 </Project>

src/Benchmarks/ExperimentalBenchmarkOld/ExperimentalBenchmarkOld.csproj

@@ -1,26 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFrameworks>net8.0</TargetFrameworks>
-        <DelaySign>false</DelaySign>
-        <SignAssembly>false</SignAssembly>
-        <!--<PublishAot>true</PublishAot>-->
-        <IsPackable>false</IsPackable>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <DelaySign>false</DelaySign>
+    <SignAssembly>false</SignAssembly>
+    <!--<PublishAot>true</PublishAot>-->
+    <IsPackable>false</IsPackable>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" />
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
-        <PackageReference Include="FlatSharp.Compiler" VersionOverride="7.4.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="FlatSharp.Runtime" VersionOverride="7.4.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
+    <PackageReference Include="FlatSharp.Compiler" VersionOverride="7.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FlatSharp.Runtime" VersionOverride="7.4.0" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="../ExperimentalBenchmark/Program.cs" />
-        <FlatSharpSchema Include="../ExperimentalBenchmark/Benchmark.fbs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="../ExperimentalBenchmark/Program.cs" />
+    <FlatSharpSchema Include="../ExperimentalBenchmark/Benchmark.fbs" />
+  </ItemGroup>
 </Project>