From ff1ccdb7eef3d0c01471f92857f07e3c359b119c Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Fri, 16 Dec 2022 15:18:45 +0100
Subject: [PATCH] Improvements for Flax.Build setup

---
 Source/Tools/Flax.Build/Flax.Build.csproj | 28 ++++++++++-------------
 Source/Tools/Flax.Build/global.json       |  6 +++++
 global.json                               |  6 +++++
 3 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 Source/Tools/Flax.Build/global.json
 create mode 100644 global.json

diff --git a/Source/Tools/Flax.Build/Flax.Build.csproj b/Source/Tools/Flax.Build/Flax.Build.csproj
index a03d701c2..e6c5d96c1 100644
--- a/Source/Tools/Flax.Build/Flax.Build.csproj
+++ b/Source/Tools/Flax.Build/Flax.Build.csproj
@@ -3,35 +3,31 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>disable</Nullable>
+    <Nullable>annotations</Nullable>
     <Configurations>Debug;Release</Configurations>
     <BaseOutputPath>..\..\..\Binaries\Tools</BaseOutputPath>
     <OutDir>..\..\..\Binaries\Tools</OutDir>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <DefineConstants>USE_NETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
+    <ErrorReport>none</ErrorReport>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NoWarn>1701;1702;8981</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Properties"/>
+    <Folder Include="Properties" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNetZip" Version="1.16"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3"/>
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2"/>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0"/>
-    <PackageReference Include="Mono.Cecil" Version="0.11.4"/>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0"/>
-    <PackageReference Include="System.CodeDom" Version="6.0"/>
+    <PackageReference Include="DotNetZip" Version="1.16" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0" />
+    <PackageReference Include="System.CodeDom" Version="6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Tools/Flax.Build/global.json b/Source/Tools/Flax.Build/global.json
new file mode 100644
index 000000000..a6e7dc6c3
--- /dev/null
+++ b/Source/Tools/Flax.Build/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "rollForward": "latestMinor"
+  }
+}
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..a6e7dc6c3
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "rollForward": "latestMinor"
+  }
+}
\ No newline at end of file