From 072df26e6f5f69e9b801619783a3433970d0a568 Mon Sep 17 00:00:00 2001
From: Doug Murphy <doug.murphy@abrigo.com>
Date: Wed, 17 Nov 2021 10:41:42 -0500
Subject: [PATCH 1/4] Add net6.0 to NuKeeper.csproj TFMs

---
 NuKeeper/NuKeeper.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NuKeeper/NuKeeper.csproj b/NuKeeper/NuKeeper.csproj
index f2c65dca..d9afdced 100644
--- a/NuKeeper/NuKeeper.csproj
+++ b/NuKeeper/NuKeeper.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
     <PackageId>nukeeper</PackageId>

From de2589cac73584bfafd56d840836187bf422f064 Mon Sep 17 00:00:00 2001
From: Doug Murphy <doug.murphy@abrigo.com>
Date: Wed, 17 Nov 2021 10:46:21 -0500
Subject: [PATCH 2/4] Ignore CA1305 in CodeAnalysisRules.ruleset

* Open to the maintainers determining what culture to provide if ignoring CA1305 is unacceptable.
* Full information on CA1305 available at https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1305
---
 CodeAnalysisRules.ruleset | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CodeAnalysisRules.ruleset b/CodeAnalysisRules.ruleset
index a660f79f..872241bb 100644
--- a/CodeAnalysisRules.ruleset
+++ b/CodeAnalysisRules.ruleset
@@ -2,7 +2,8 @@
 <RuleSet Name="CodeProjects" Description="Code analysis rules for NuKeeper Code." ToolsVersion="15.0">
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1303" Action="None" />
+	<Rule Id="CA1305" Action="None" />
     <Rule Id="CA2000" Action="None" />
     <Rule Id="CA2007" Action="None" />
   </Rules>
-</RuleSet>
\ No newline at end of file
+</RuleSet>

From 3e2a9e1a2a6b5c8feeab51032d6c02c3cc834cb3 Mon Sep 17 00:00:00 2001
From: Doug Murphy <doug.murphy@abrigo.com>
Date: Wed, 17 Nov 2021 10:46:49 -0500
Subject: [PATCH 3/4] Add Dockerfile for .NET 6

---
 Docker/SDK6.0/Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Docker/SDK6.0/Dockerfile

diff --git a/Docker/SDK6.0/Dockerfile b/Docker/SDK6.0/Dockerfile
new file mode 100644
index 00000000..91869c5a
--- /dev/null
+++ b/Docker/SDK6.0/Dockerfile
@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0-focal
+ARG NUKEEPER_VERSION=0.35.0
+RUN dotnet tool install --global NuKeeper --version $NUKEEPER_VERSION
+ENV PATH="${PATH}:/root/.dotnet/tools"
+ENTRYPOINT ["nukeeper"]

From 2f7070630df3003a1f78b5fb57ba4a35330a4840 Mon Sep 17 00:00:00 2001
From: Doug Murphy <doug.murphy@abrigo.com>
Date: Wed, 17 Nov 2021 12:05:37 -0500
Subject: [PATCH 4/4] Update .azure-build.yml to .NET 6

(cherry picked from commit cdabba8d847b89ad1fd939fe1b9fc9ca8d1cad8f)
---
 .azure-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-build.yml b/.azure-build.yml
index ed24437e..abd061f4 100644
--- a/.azure-build.yml
+++ b/.azure-build.yml
@@ -15,9 +15,9 @@ variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 steps:
 - task: DotNetCoreInstaller@1
-  displayName: 'Use .NET Core sdk 5.0.x'
+  displayName: 'Use .NET Core sdk 6.0.x'
   inputs:
-    version: 5.0.x
+    version: 6.0.x
 
 - bash: echo NugetVersion is $NugetVersion; export NugetVersion
   displayName: 'export NugetVersion into env vars'