From 7da6cec27ed56519768a3f1f844884ee75bcb7a5 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 4 Dec 2021 11:58:59 -0800
Subject: [PATCH] fix: Bumps source generator to netstandard2.1 (#874)

---
 .github/workflows/build-test.yml                 |  2 +-
 .../SerializationGenerator.csproj                |  8 ++++----
 .../SerializationSchemaGenerator.csproj          |  1 +
 Projects/Server/Server.csproj                    |  2 +-
 Projects/UOContent/UOContent.csproj              |  2 +-
 azure-pipelines.yml                              | 16 +++-------------
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 8e8872f94..3a2b28871 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -30,4 +30,4 @@ jobs:
     - name: Build
       run: ./publish.cmd
     - name: Test
-      run: dotnet test --no-restore --framework net6.0
+      run: dotnet test --no-restore
diff --git a/Projects/SerializationGenerator/SerializationGenerator.csproj b/Projects/SerializationGenerator/SerializationGenerator.csproj
index f74e5e965..1daae2ff1 100755
--- a/Projects/SerializationGenerator/SerializationGenerator.csproj
+++ b/Projects/SerializationGenerator/SerializationGenerator.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <LangVersion>preview</LangVersion>
         <BuildOutputTargetFolder>analyzers</BuildOutputTargetFolder>
     </PropertyGroup>
@@ -21,9 +21,9 @@
     <Target Name="GetDependencyTargetPaths">
         <ItemGroup>
             <TargetPathWithTargetPlatformMoniker Include="$(PKGHumanizer_Core)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
-            <TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Json)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
-            <TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
-            <TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Bcl_AsyncInterfaces)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
+            <TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Json)\lib\netstandard2.1\*.dll" IncludeRuntimeDependency="false" />
+            <TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.1\*.dll" IncludeRuntimeDependency="false" />
+            <TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Bcl_AsyncInterfaces)\lib\netstandard2.1\*.dll" IncludeRuntimeDependency="false" />
         </ItemGroup>
     </Target>
 </Project>
diff --git a/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj b/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
index d3d1a168e..1df2df68a 100755
--- a/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
+++ b/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
@@ -12,6 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Humanizer.Core" Version="2.13.14" />
         <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
         <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.1" />
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 6a0cc1ab5..5694a4e65 100755
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -40,7 +40,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
-            <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
             <OutputItemType>Analyzer</OutputItemType>
             <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
             <PrivateAssets>all</PrivateAssets>
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index fc7ae24ab..a6094ec12 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -47,7 +47,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
-            <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
             <OutputItemType>Analyzer</OutputItemType>
             <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
             <PrivateAssets>all</PrivateAssets>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6923ed2ae..01b7d413d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,11 +14,6 @@ jobs:
     vmImage: 'windows-latest'
 
   steps:
-  - task: UseDotNet@2
-    displayName: 'Install .NET 5'
-    inputs:
-      packageType: sdk
-      version: 5.0.403
   - task: UseDotNet@2
     displayName: 'Install .NET 6'
     inputs:
@@ -27,7 +22,7 @@ jobs:
   - task: NuGetAuthenticate@0
   - script: ./publish.cmd Release win
     displayName: 'Build'
-  - script: dotnet test --no-restore --framework net6.0
+  - script: dotnet test --no-restore
     displayName: 'Test'
 
 - job: BuildLinux
@@ -46,7 +41,7 @@ jobs:
       #   containerImage: amd64/buildpack-deps:bullseye
       #   os: debian.11-x64
       'Ubuntu 20':
-        containerImage: mcr.microsoft.com/dotnet/sdk:5.0-focal
+        containerImage: mcr.microsoft.com/dotnet/sdk:6.0-focal
         os: ubuntu.20.04
       'Fedora 32':
         containerImage: fedora:32
@@ -63,11 +58,6 @@ jobs:
   container: $[ variables['containerImage'] ]
 
   steps:
-  - task: UseDotNet@2
-    displayName: 'Install .NET 5'
-    inputs:
-      packageType: sdk
-      version: 5.0.403
   - task: UseDotNet@2
     displayName: 'Install .NET 6'
     inputs:
@@ -76,5 +66,5 @@ jobs:
   - task: NuGetAuthenticate@0
   - script: ./publish.cmd Release $(os)
     displayName: 'Build'
-  - script: dotnet test --no-restore --framework net6.0
+  - script: dotnet test --no-restore
     displayName: 'Test'