From ae1e7e1d4bba8d624d8a2561846af0c05d3683f2 Mon Sep 17 00:00:00 2001
From: Derek Brown <24372631+AzureView@users.noreply.github.com>
Date: Sat, 22 Jan 2022 19:45:08 +0000
Subject: [PATCH 1/3] add support for Net5 and Net6

---
 .../CondenserDotNet.Client.csproj                   |  6 +++---
 .../CondenserDotNet.Configuration.csproj            |  3 ++-
 .../CondenserDotNet.Core.csproj                     |  4 ++--
 .../CleanShutdown/CleanShutdownExtensions.cs        |  6 +++---
 .../CondenserDotNet.Middleware.csproj               |  2 +-
 .../ConsulCleanShutdown/ConsulShutdownExtensions.cs |  7 ++-----
 .../WindowsAuthentication/WindowsAuthFeature.cs     |  2 ++
 .../WindowsAuthentication/WindowsHandshake.cs       |  6 ++++--
 .../CondenserDotNet.Stats.csproj                    |  2 +-
 .../AuthenticationMiddlewareFacts.cs                |  3 +++
 .../Condenser.Tests.Integration.csproj              | 13 ++++++++-----
 test/CondenserTests/CondenserTests.csproj           | 11 +++++++----
 version.props                                       |  2 +-
 13 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/CondenserDotNet.Client/CondenserDotNet.Client.csproj b/src/CondenserDotNet.Client/CondenserDotNet.Client.csproj
index 8dd8b00..f17fddc 100644
--- a/src/CondenserDotNet.Client/CondenserDotNet.Client.csproj
+++ b/src/CondenserDotNet.Client/CondenserDotNet.Client.csproj
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.2.0" />
   </ItemGroup>
 
   <!--<ItemGroup>
diff --git a/src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj b/src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj
index 6ad2025..feecc42 100644
--- a/src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj
+++ b/src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj
@@ -7,7 +7,8 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CondenserDotNet.Core/CondenserDotNet.Core.csproj b/src/CondenserDotNet.Core/CondenserDotNet.Core.csproj
index 9302d3b..6439531 100644
--- a/src/CondenserDotNet.Core/CondenserDotNet.Core.csproj
+++ b/src/CondenserDotNet.Core/CondenserDotNet.Core.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/CondenserDotNet.Middleware/CleanShutdown/CleanShutdownExtensions.cs b/src/CondenserDotNet.Middleware/CleanShutdown/CleanShutdownExtensions.cs
index 8105d7d..8e9a462 100644
--- a/src/CondenserDotNet.Middleware/CleanShutdown/CleanShutdownExtensions.cs
+++ b/src/CondenserDotNet.Middleware/CleanShutdown/CleanShutdownExtensions.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace CondenserDotNet.Middleware.CleanShutdown
 {
@@ -14,7 +14,7 @@ public static IServiceCollection AddCleanShutdown(this IServiceCollection servic
 
         public static IApplicationBuilder UseCleanShutdown(this IApplicationBuilder appBuilder)
         {
-            var appLifetime = appBuilder.ApplicationServices.GetService<IApplicationLifetime>();
+            var appLifetime = appBuilder.ApplicationServices.GetService<IHostApplicationLifetime>();
             var shutdownService = appBuilder.ApplicationServices.GetService<CleanShutdownService>();
             appLifetime.ApplicationStopping.Register(() => shutdownService.Shutdown());
             appBuilder.UseMiddleware<CleanShutdownMiddleware>();
diff --git a/src/CondenserDotNet.Middleware/CondenserDotNet.Middleware.csproj b/src/CondenserDotNet.Middleware/CondenserDotNet.Middleware.csproj
index 5ccabd7..7baba6f 100644
--- a/src/CondenserDotNet.Middleware/CondenserDotNet.Middleware.csproj
+++ b/src/CondenserDotNet.Middleware/CondenserDotNet.Middleware.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\common.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>CondenserDotNet.Middleware</AssemblyName>
     <PackageId>CondenserDotNet.Middleware</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/CondenserDotNet.Middleware/ConsulCleanShutdown/ConsulShutdownExtensions.cs b/src/CondenserDotNet.Middleware/ConsulCleanShutdown/ConsulShutdownExtensions.cs
index 74e8832..0d3d4d1 100644
--- a/src/CondenserDotNet.Middleware/ConsulCleanShutdown/ConsulShutdownExtensions.cs
+++ b/src/CondenserDotNet.Middleware/ConsulCleanShutdown/ConsulShutdownExtensions.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using CondenserDotNet.Middleware.CleanShutdown;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace CondenserDotNet.Middleware.ConsulCleanShutdown
 {
@@ -18,7 +15,7 @@ public static IServiceCollection AddConsulShutdown(this IServiceCollection servi
 
         public static IApplicationBuilder UseConsulShutdown(this IApplicationBuilder appBuilder, string shutdownMessage)
         {
-            var appLifetime = appBuilder.ApplicationServices.GetService<IApplicationLifetime>();
+            var appLifetime = appBuilder.ApplicationServices.GetService<IHostApplicationLifetime>();
             var shutdownService = appBuilder.ApplicationServices.GetService<ConsulShutdownService>();
             shutdownService.ShutdownMessage = shutdownMessage;
             appLifetime.ApplicationStopping.Register(shutdownService.Stopping);
diff --git a/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsAuthFeature.cs b/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsAuthFeature.cs
index c5fc299..3a350eb 100644
--- a/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsAuthFeature.cs
+++ b/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsAuthFeature.cs
@@ -25,7 +25,9 @@ static WindowsAuthFeature()
 
         public void Dispose()
         {
+#if NET6_0_WINDOWS
             Identity?.Dispose();
+#endif
             _handshake?.Dispose();
             Identity = null;
         }
diff --git a/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsHandshake.cs b/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsHandshake.cs
index 9cca63d..cda8434 100644
--- a/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsHandshake.cs
+++ b/src/CondenserDotNet.Middleware/WindowsAuthentication/WindowsHandshake.cs
@@ -10,7 +10,7 @@ public sealed class WindowsHandshake : IDisposable
     {
         private SecurityHandle _context;
         private SecurityHandle _ntlmHandle;
-        private WindowsIdentity _identity;
+        private WindowsIdentity _identity = null;   //initialise to avoid not used warning.
         private readonly DateTime _dateStarted = DateTime.UtcNow;
         private static readonly ASC_REQ _requestType = ASC_REQ.ASC_REQ_CONFIDENTIALITY | ASC_REQ.ASC_REQ_REPLAY_DETECT
             | ASC_REQ.ASC_REQ_SEQUENCE_DETECT | ASC_REQ.ASC_REQ_CONNECTION;
@@ -79,7 +79,9 @@ public unsafe string AcceptSecurityToken(string returnTokenType, byte[] token)
                         returnToken = "Negotiate " + Convert.ToBase64String(byteSpan);
                     }
                     QuerySecurityContextToken(ref _context, out var handle);
-                    _identity = new WindowsIdentity(handle);
+#if NET6_0_WINDOWS
+                    _identity = new WindowsIdentity(handle)
+#endif
                     Interop.Kernel32.CloseHandle(handle);
                     return returnToken;
                 }
diff --git a/src/CondenserDotNet.Stats/CondenserDotNet.Stats.csproj b/src/CondenserDotNet.Stats/CondenserDotNet.Stats.csproj
index 7ad2443..e2bebfb 100644
--- a/src/CondenserDotNet.Stats/CondenserDotNet.Stats.csproj
+++ b/src/CondenserDotNet.Stats/CondenserDotNet.Stats.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/test/Condenser.Tests.Integration/AuthenticationMiddlewareFacts.cs b/test/Condenser.Tests.Integration/AuthenticationMiddlewareFacts.cs
index 9ef3039..4eda871 100644
--- a/test/Condenser.Tests.Integration/AuthenticationMiddlewareFacts.cs
+++ b/test/Condenser.Tests.Integration/AuthenticationMiddlewareFacts.cs
@@ -36,7 +36,9 @@ public async Task CanAuthenticateWithNtlm()
                 using (var result = await client.GetAsync($"http://localhost:55555"))
                 {
                     var name = await result.Content.ReadAsStringAsync();
+#if NET6_0_WINDOWS
                     Assert.Equal(System.Security.Principal.WindowsIdentity.GetCurrent().Name, name);
+#endif
                 }
             }
             finally
@@ -53,6 +55,7 @@ public void Configure(IApplicationBuilder app)
                 app.Use(async (context, next) =>
                 {
                     await context.Response.WriteAsync(context.User.Identity.Name);
+                    await next.Invoke();
                     return;
                 });
             }
diff --git a/test/Condenser.Tests.Integration/Condenser.Tests.Integration.csproj b/test/Condenser.Tests.Integration/Condenser.Tests.Integration.csproj
index e4f6f47..c4435c5 100644
--- a/test/Condenser.Tests.Integration/Condenser.Tests.Integration.csproj
+++ b/test/Condenser.Tests.Integration/Condenser.Tests.Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\common.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AssemblyName>Condenser.Tests.Integration</AssemblyName>
     <PackageId>Condenser.Tests.Integration</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -24,12 +24,15 @@
   </ItemGroup>
 
   <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coveralls.io" Version="1.4.2" />
-    <PackageReference Include="OpenCover" Version="4.6.519" />
-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="OpenCover" Version="4.7.1221" />
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/CondenserTests/CondenserTests.csproj b/test/CondenserTests/CondenserTests.csproj
index 9634ce5..b26c25e 100644
--- a/test/CondenserTests/CondenserTests.csproj
+++ b/test/CondenserTests/CondenserTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\common.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+     <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>CondenserTests</AssemblyName>
     <PackageId>CondenserTests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -18,11 +18,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coveralls.io" Version="1.4.2" />
-    <PackageReference Include="OpenCover" Version="4.6.519" />
+    <PackageReference Include="OpenCover" Version="4.7.1221" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="1.0.3" />
-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
diff --git a/version.props b/version.props
index cf347fb..9606700 100644
--- a/version.props
+++ b/version.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>5.2.1</VersionPrefix>
+        <VersionPrefix>6.0.0</VersionPrefix>
         <VersionSuffix>beta</VersionSuffix>
     </PropertyGroup>
 </Project>

From 3150f65ac854ea6129094d32c21cb91a07b797cb Mon Sep 17 00:00:00 2001
From: Derek Brown <24372631+AzureView@users.noreply.github.com>
Date: Sat, 22 Jan 2022 20:08:15 +0000
Subject: [PATCH 2/3] update appveyor.yml for VisualStudion 2022

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index c5706b4..105aa19 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2019 Preview
+os: Visual Studio 2022
 build: off
 
 environment:

From e0de91022c3ceb20c6684b17647d30e73d633207 Mon Sep 17 00:00:00 2001
From: Derek Brown <24372631+AzureView@users.noreply.github.com>
Date: Sat, 22 Jan 2022 21:29:44 +0000
Subject: [PATCH 3/3] Attempt to correct  Nuget Config

---
 NuGet.Config | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 7333983..744c8b8 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="benchmark" value="https://ci.appveyor.com/nuget/benchmarkdotnet" />
-    <add key="corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/" />
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v3/index.json" />
-    <add key="dotnet.myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" protocolVersion="3" />
   </packageSources>
   <disabledPackageSources>
     <add key="Microsoft and .NET" value="true" />
@@ -17,4 +14,4 @@
   <bindingRedirects>
     <add key="skip" value="False" />
   </bindingRedirects>
-</configuration>
\ No newline at end of file
+</configuration>