From 00beaf8e6e3fe8ac4af72d6359a5ee3109eff9ae Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Tue, 17 Nov 2020 13:02:51 -0800
Subject: [PATCH] Fixes NBGV & Adds Big Sur to CI/CD (#317)

---
 .github/workflows/build-test.yml    |  6 +++++-
 Directory.Build.props               | 12 +++++++-----
 Projects/Server/Server.csproj       |  8 --------
 Projects/UOContent/UOContent.csproj |  8 --------
 version.json                        |  6 +-----
 5 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index d6fd5ad40..490d5a022 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -9,11 +9,15 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+    name: Build (${{ matrix.name }})
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: macos-latest
+          - os: macos-10.15
+            name: MacOS 10.15
+          - os: macos-11.0
+            name: MacOS 11.0
 
     steps:
     - uses: actions/checkout@v2
diff --git a/Directory.Build.props b/Directory.Build.props
index 2dcb0a281..69268aa70 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,14 +9,12 @@
         <PlatformTarget>x64</PlatformTarget>
         <LangVersion>9</LangVersion>
         <PublicRelease>true</PublicRelease>
-<!--        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>-->
         <NoWarn>NU1603</NoWarn>
         <RuntimeIdentifiers>win-x64;debian.10-x64;debian.9-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;centos.7-x64;centos.8-x64;osx-x64</RuntimeIdentifiers>
         <Configurations>Debug;Release;Analyze</Configurations>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-<!--        <UseNETCoreGenerator>true</UseNETCoreGenerator>-->
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-<!--        <WarningsAsErrors />-->
+        <WarningsAsErrors />
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
         <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
@@ -50,14 +48,18 @@
         <CodeAnalysisRuleSet>..\..\Rules.ruleset</CodeAnalysisRuleSet>
         <AnalysisLevel>latest</AnalysisLevel>
     </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='Analyze'">
-<!--        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" />-->
         <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
             <Version>3.3.1</Version>
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-<!--        <AdditionalFiles Include=".\stylecop.json" />-->
         <AdditionalFiles Include=".\Rules.ruleset" />
     </ItemGroup>
 </Project>
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 32edb0dd1..2943bbad3 100644
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -26,14 +26,6 @@
         <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true" />
     </Target>
     <ItemGroup>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="Zlib.Bindings" Version="1.4.0" />
     </ItemGroup>
-<!--    <ItemGroup Condition="'$(Configuration)'=='Analyze'">-->
-<!--        <AdditionalFiles Include="..\..\stylecop.json" />-->
-<!--        <AdditionalFiles Include="..\..\Rules.ruleset" />-->
-<!--    </ItemGroup>-->
 </Project>
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 34abf1813..149003883 100644
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -29,15 +29,7 @@
             <IncludeInPackage>false</IncludeInPackage>
         </ProjectReference>
         <PackageReference Include="MailKit" Version="2.8.0" />
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="Zlib.Bindings" Version="1.4.0" />
         <PackageReference Include="Argon2.Bindings" Version="1.8.0" />
     </ItemGroup>
-    <ItemGroup Condition="'$(Configuration)'=='Analyze'">
-        <AdditionalFiles Include="..\..\stylecop.json" />
-        <AdditionalFiles Include="..\..\Rules.ruleset" />
-    </ItemGroup>
 </Project>
diff --git a/version.json b/version.json
index 2efc4f425..403de5449 100644
--- a/version.json
+++ b/version.json
@@ -1,8 +1,4 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.8.1",
-  "cloudBuild": {
-    "setVersionVariables": false,
-    "setAllVariables": false
-  }
+  "version": "0.8.1"
 }