From f1051305b9e1b52bb708ab68624983e156ff7711 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 10:12:02 -0800
Subject: [PATCH 01/21] Update refs to latest stable and add sourcelink support

---
 .../TestHost.WindowsAuth.Test.csproj                | 13 ++++++++-----
 .../TestHost.WindowsAuth.WebExample.csproj          |  4 ++--
 .../TestHost.WindowsAuth.csproj                     |  5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/TestHost.WindowsAuth.Test.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/TestHost.WindowsAuth.Test.csproj
index d1db902..a98e550 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/TestHost.WindowsAuth.Test.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/TestHost.WindowsAuth.Test.csproj
@@ -9,11 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/TestHost.WindowsAuth.WebExample.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/TestHost.WindowsAuth.WebExample.csproj
index 7e2549f..7ef47c8 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/TestHost.WindowsAuth.WebExample.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/TestHost.WindowsAuth.WebExample.csproj
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
index 7d167c4..c3be92c 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
@@ -17,7 +17,8 @@
 
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 05a9203b0517e2550ec284019d191ec351e67f02 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 10:12:51 -0800
Subject: [PATCH 02/21] Add nuget package details.  Fixes #6 and #3.

---
 .../TestHost.WindowsAuth.csproj                    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
index c3be92c..cfe3a82 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
@@ -9,6 +9,20 @@
     <TargetFrameworks>netstandard20</TargetFrameworks>
     <RootNamespace>IntelliTect.AspNetCore.TestHost.WindowsAuth</RootNamespace>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/IntelliTect/AspNetCore.TestHost.WindowsAuth/master/LICENSE.md</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/IntelliTect/AspNetCore.TestHost.WindowsAuth</PackageProjectUrl>
+    <Copyright>© IntelliTect 2018</Copyright>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <RepositoryUrl>https://github.com/IntelliTect/AspNetCore.TestHost.WindowsAuth</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageId>IntelliTect.TestHost.WindowsAuth</PackageId>
+    <Authors>IntelliTect-Nuget</Authors>
+    <Company>IntelliTect</Company>
+    <Description>This project aims to emulate the functionality provided by IIS Integration in an ASP.NET Core project that uses Windows Authentication for the purposes of testing with ASP.NET Core's TestServer from Microsoft.AspNetCore.TestHost.  It provides real, authenticated Windows Auth capabilities - not just a mock of such. The WindowsIdentity of the WindowsPrincipal that will be signed into your application can use all normal behaviors, including .Impersonate().</Description>
+    <PackageTags>IntelliTect aspnet web core authentication testing</PackageTags>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
     <None Remove=".gitignore" />

From ee68cc75d1d5e1e9f33eed22b95daaa734e44cff Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 10:51:39 -0800
Subject: [PATCH 03/21] Remove licenseurl per guidance from MS.  Add FXCop and
 license file.

---
 .../TestHost.WindowsAuth.csproj                       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
index cfe3a82..397a439 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- 
       This library targets netstandard because there are some bizarre issues 
@@ -11,7 +11,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/IntelliTect/AspNetCore.TestHost.WindowsAuth/master/LICENSE.md</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/IntelliTect/AspNetCore.TestHost.WindowsAuth</PackageProjectUrl>
     <Copyright>© IntelliTect 2018</Copyright>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -27,12 +27,17 @@
   <ItemGroup>
     <None Remove=".gitignore" />
     <None Remove="README.md" />
+    <None Include="..\LICENSE.md" Pack="true" PackagePath="$(PackageLicenseFile)" />
   </ItemGroup>
 
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 994efa9e9503f13217e6b4418aceaaff79388ae2 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 10:56:28 -0800
Subject: [PATCH 04/21] Spackle license everywhere. R# cleanups.

Address FXCop issues:
- Move PInvokes to separate NativeMethods class
- Remove virtual method call from ctor
---
 .../BasicTests.cs                             | 14 +++++
 .../WebExampleServerFixture.cs                | 16 +++++-
 .../Controllers/ValuesController.cs           | 16 +++++-
 .../Program.cs                                | 16 +++++-
 .../Startup.cs                                | 21 ++++++-
 .../AddAuthenticationStartupFilter.cs         | 18 +++++-
 .../NativeMethods.cs                          | 35 ++++++++++++
 .../WindowsAuthHandler.cs                     | 39 +++++++++----
 .../WindowsAuthServerFixture.cs               | 41 ++++++++-----
 .../WindowsAuthServiceCollectionExtensions.cs | 16 +++++-
 .../WindowsAuthTestServerExtensions.cs        | 57 ++++++++++++-------
 .../WindowsIdentityFactory.cs                 | 40 ++++++-------
 README.md                                     |  2 +-
 13 files changed, 258 insertions(+), 73 deletions(-)
 create mode 100644 IntelliTect.AspNetCore.TestHost.WindowsAuth/NativeMethods.cs

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/BasicTests.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/BasicTests.cs
index 9cfd1c4..1531b47 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/BasicTests.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/BasicTests.cs
@@ -1,3 +1,17 @@
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 using System.Net;
 using System.Net.Http;
 using System.Security.Principal;
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/WebExampleServerFixture.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/WebExampleServerFixture.cs
index 5a17066..43bec7e 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/WebExampleServerFixture.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.Test/WebExampleServerFixture.cs
@@ -1,4 +1,18 @@
-using IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth.Test
 {
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Controllers/ValuesController.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Controllers/ValuesController.cs
index 2d1d096..c119d91 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Controllers/ValuesController.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Controllers/ValuesController.cs
@@ -1,4 +1,18 @@
-using Microsoft.AspNetCore.Authorization;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample.Controllers
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Program.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Program.cs
index 037cdcf..17cde6d 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Program.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Program.cs
@@ -1,4 +1,18 @@
-using Microsoft.AspNetCore;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Startup.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Startup.cs
index 4b45536..1789fd4 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Startup.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.WebExample/Startup.cs
@@ -1,4 +1,18 @@
-using Microsoft.AspNetCore.Builder;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -23,7 +37,10 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            if (env.IsDevelopment()) app.UseDeveloperExceptionPage();
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
 
             app.UseMvc();
         }
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/AddAuthenticationStartupFilter.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/AddAuthenticationStartupFilter.cs
index faa9838..2fba122 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/AddAuthenticationStartupFilter.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/AddAuthenticationStartupFilter.cs
@@ -1,6 +1,20 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
 {
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/NativeMethods.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/NativeMethods.cs
new file mode 100644
index 0000000..f966c34
--- /dev/null
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/NativeMethods.cs
@@ -0,0 +1,35 @@
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
+{
+    internal static class NativeMethods
+    {
+        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern bool LogonUser(
+            string lpszUsername,
+            string lpszDomain,
+            string lpszPassword,
+            int dwLogonType,
+            int dwLogonProvider,
+            out IntPtr phToken
+        );
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool CloseHandle(IntPtr hHandle);
+    }
+}
\ No newline at end of file
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs
index 90fdb69..2d609f0 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs
@@ -1,20 +1,34 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 using System;
 using System.Linq;
 using System.Security.Principal;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
 {
     /// <summary>
-    /// ASP.NET Core Authentication handler for authenticating as arbitrary users for integration tests.
-    /// Provides behavior similar to the ASP.NET Core IIS integration AuthenticationHandler.
+    ///     ASP.NET Core Authentication handler for authenticating as arbitrary users for integration tests.
+    ///     Provides behavior similar to the ASP.NET Core IIS integration AuthenticationHandler.
     /// </summary>
     /// <remarks>
-    /// This is inspired largely by 
-    /// https://github.com/aspnet/IISIntegration/blob/release/2.0/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs
-    /// It aims to be as close to the IIS handler as possible.
+    ///     This is inspired largely by
+    ///     https://github.com/aspnet/IISIntegration/blob/release/2.0/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs
+    ///     It aims to be as close to the IIS handler as possible.
     /// </remarks>
     internal class WindowsAuthenticationHandler : IAuthenticationHandler
     {
@@ -27,17 +41,18 @@ public Task<AuthenticateResult> AuthenticateAsync()
         {
             if (_context.Request.Headers.Keys.Contains(CredentialKeyHeader))
             {
-                var credentialGuidString = _context.Request.Headers[CredentialKeyHeader].First();
-                var credentialKey = Guid.Parse(credentialGuidString);
-                var identity = WindowsIdentityFactory.LogInAs(credentialKey);
+                string credentialGuidString = _context.Request.Headers[CredentialKeyHeader].First();
+                Guid credentialKey = Guid.Parse(credentialGuidString);
+                WindowsIdentity identity = WindowsIdentityFactory.LogInAs(credentialKey);
 
                 var user = new WindowsPrincipal(identity);
 
                 // Ensure that the identity is disposed of when the request is done
                 // to avoid leaking unmanaged handles.
                 _context.Response.RegisterForDispose(identity);
-                
-                return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(user, AuthenticationScheme)));
+
+                return Task.FromResult(
+                    AuthenticateResult.Success(new AuthenticationTicket(user, AuthenticationScheme)));
             }
 
             return Task.FromResult(AuthenticateResult.NoResult());
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServerFixture.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServerFixture.cs
index 4da467e..766facd 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServerFixture.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServerFixture.cs
@@ -1,8 +1,22 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 using System;
 using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
 {
@@ -14,20 +28,16 @@ namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
     public abstract class WindowsAuthServerFixture<TStartup> : IDisposable
         where TStartup : class
     {
-        protected WindowsAuthServerFixture()
-        {
-            // ReSharper disable once VirtualMemberCallInConstructor
-            Server = CreateServer();
-        }
+        private TestServer _server;
 
         /// <summary>
         ///     The <see cref="TestServer" /> instance that requests can be made against.
         /// </summary>
-        public TestServer Server { get; }
+        public TestServer Server => _server ?? (_server = CreateServer());
 
         /// <summary>
         ///     The name of the application - e.g. "IntelliTect.Coalesce.Web".
-        ///     Used the calulate <see cref="ContentRoot" /> assuming web and test projects are in the same location.
+        ///     Used to calculate <see cref="ContentRoot" /> assuming web and test projects are in the same location.
         ///     Should match the name of the directory that holds the web project.
         /// </summary>
         protected abstract string ApplicationName { get; }
@@ -49,7 +59,8 @@ protected WindowsAuthServerFixture()
         protected virtual Uri BaseAddress => new Uri("http://localhost/");
 
         /// <summary>
-        ///     Whether or not the standard <see cref="Microsoft.AspNetCore.Authentication.AuthenticationMiddleware" /> should be added to the request pipeline
+        ///     Whether or not the standard <see cref="Microsoft.AspNetCore.Authentication.AuthenticationMiddleware" /> should be
+        ///     added to the request pipeline
         ///     (by calling
         ///     <see
         ///         cref="Microsoft.AspNetCore.Builder.AuthAppBuilderExtensions.UseAuthentication(Microsoft.AspNetCore.Builder.IApplicationBuilder)" />
@@ -66,7 +77,10 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (disposing) Server?.Dispose();
+            if (disposing)
+            {
+                Server?.Dispose();
+            }
         }
 
         /// <summary>
@@ -85,7 +99,6 @@ protected virtual IWebHostBuilder GetWebHostBuilder()
         ///     Call extension methods in <see cref="WindowsAuthTestServerExtensions" /> to get
         ///     <see cref="System.Net.Http.HttpClient" /> instances that will behave as specific Windows users.
         /// </summary>
-        /// <returns></returns>
         protected virtual TestServer CreateServer()
         {
             IWebHostBuilder builder = GetWebHostBuilder()
@@ -94,7 +107,9 @@ protected virtual TestServer CreateServer()
                     services.AddWindowsAuthenticationForTesting();
 
                     if (AddAuthenticationMiddleware)
+                    {
                         services.AddTransient<IStartupFilter, AddAuthenticationStartupFilter>();
+                    }
                 });
 
             return new TestServer(builder)
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServiceCollectionExtensions.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServiceCollectionExtensions.cs
index 274dc03..8d38a0e 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServiceCollectionExtensions.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthServiceCollectionExtensions.cs
@@ -1,4 +1,18 @@
-using Microsoft.AspNetCore.Authentication;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthTestServerExtensions.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthTestServerExtensions.cs
index 9bdfd57..31b3c88 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthTestServerExtensions.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthTestServerExtensions.cs
@@ -1,58 +1,77 @@
-using Microsoft.AspNetCore.TestHost;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Security.Principal;
+using Microsoft.AspNetCore.TestHost;
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
 {
     public static class WindowsAuthTestServerExtensions
     {
         /// <summary>
-        /// Get an <see cref="HttpClient"/> for a <see cref="TestServer"/> that will make requests under the specified user.
+        ///     Get an <see cref="HttpClient" /> for a <see cref="TestServer" /> that will make requests under the specified user.
         /// </summary>
-        /// <param name="server">The <see cref="TestServer"/> to create a client for.</param>
+        /// <param name="server">The <see cref="TestServer" /> to create a client for.</param>
         /// <param name="credential">The credentials of the user that will be logged in.</param>
         /// <returns>An HttpClient for which any requests made through it will use the specified user.</returns>
         public static HttpClient ClientForUser(this TestServer server, NetworkCredential credential)
-            => server.CreateClient().SetWindowsAuthHeader(credential);
+        {
+            return server.CreateClient().SetWindowsAuthHeader(credential);
+        }
 
         /// <summary>
-        /// Get an <see cref="HttpClient"/> for a <see cref="TestServer"/> that will make requests under the current user.
+        ///     Get an <see cref="HttpClient" /> for a <see cref="TestServer" /> that will make requests under the current user.
         /// </summary>
-        /// <param name="server">The <see cref="TestServer"/> to create a client for.</param>
+        /// <param name="server">The <see cref="TestServer" /> to create a client for.</param>
         /// <returns>An HttpClient for which any requests made through it will use the specified user.</returns>
         public static HttpClient ClientForCurrentUser(this TestServer server)
         {
-            using (var currentIdentity = WindowsIdentity.GetCurrent())
+            using (WindowsIdentity currentIdentity = WindowsIdentity.GetCurrent())
             {
-                var nameParts = currentIdentity.Name.Split('\\');
+                string[] nameParts = currentIdentity.Name.Split('\\');
                 return server
                     .CreateClient()
                     .SetWindowsAuthHeader(new NetworkCredential(
-                        userName: nameParts[1],
-                        password: null as string,
-                        domain: nameParts[0]
+                        nameParts[1],
+                        null as string,
+                        nameParts[0]
                     ));
             }
         }
 
         /// <summary>
-        /// Get an <see cref="HttpClient"/> for a <see cref="TestServer"/> that will make unauthenticated requests.
+        ///     Get an <see cref="HttpClient" /> for a <see cref="TestServer" /> that will make unauthenticated requests.
         /// </summary>
-        /// <param name="server">The <see cref="TestServer"/> to create a client for.</param>
-        /// <returns>An <see cref="HttpClient"/> that will pass no authentication information.</returns>
+        /// <param name="server">The <see cref="TestServer" /> to create a client for.</param>
+        /// <returns>An <see cref="HttpClient" /> that will pass no authentication information.</returns>
         public static HttpClient ClientForAnonymous(this TestServer server)
-            => server.CreateClient();
+        {
+            return server.CreateClient();
+        }
 
         /// <summary>
-        /// Set the <see cref="HttpClient"/> to make requests using the specified user.
+        ///     Set the <see cref="HttpClient" /> to make requests using the specified user.
         /// </summary>
         /// <param name="client">The client that should start making user-faked requests.</param>
         /// <param name="credentials">The credentials of the user that will be logged in.</param>
-        /// <returns>The <see cref="HttpClient"/> that was passed in.</returns>
+        /// <returns>The <see cref="HttpClient" /> that was passed in.</returns>
         public static HttpClient SetWindowsAuthHeader(this HttpClient client, NetworkCredential credentials)
         {
-            var guid = WindowsIdentityFactory.GetTokenForCredentials(credentials);
+            Guid guid = WindowsIdentityFactory.GetTokenForCredentials(credentials);
 
             // Set a request header that our authentication handler will use to create a ClaimsPrincipal.
             client.DefaultRequestHeaders.Add(WindowsAuthenticationHandler.CredentialKeyHeader, guid.ToString());
@@ -60,4 +79,4 @@ public static HttpClient SetWindowsAuthHeader(this HttpClient client, NetworkCre
             return client;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsIdentityFactory.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsIdentityFactory.cs
index efbb014..f8bab4c 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsIdentityFactory.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsIdentityFactory.cs
@@ -1,4 +1,18 @@
-using System;
+// Copyright 2018 IntelliTect
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
 using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Net;
@@ -7,7 +21,7 @@
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
 {
-    internal static class WindowsIdentityFactory
+    internal static partial class WindowsIdentityFactory
     {
         // Store credentials keyed by a GUID so that we don't have to serialize actual credentials into HTTP headers.
         private static readonly ConcurrentDictionary<Guid, NetworkCredential> CredentialStore
@@ -45,12 +59,14 @@ public static WindowsIdentity LogInAs(Guid credentialKey)
 
             if (string.Equals(nameParts[0], creds.Domain, StringComparison.InvariantCultureIgnoreCase)
                 && string.Equals(nameParts[1], creds.UserName, StringComparison.InvariantCultureIgnoreCase))
+            {
                 return currentIdentity;
+            }
 
             // Current identity isn't the droid that we were looking for. Get rid of it.
             currentIdentity.Dispose();
 
-            if (Win32.LogonUser(
+            if (NativeMethods.LogonUser(
                 creds.UserName, creds.Domain, creds.Password,
                 2 /*LOGON32_LOGON_INTERACTIVE*/, // Required to get a "primary token".
                 0 /*LOGON32_PROVIDER_DEFAULT*/,
@@ -59,7 +75,7 @@ public static WindowsIdentity LogInAs(Guid credentialKey)
                 var identity = new WindowsIdentity(hToken);
 
                 // No longer needed - WindowsIdentity duplicates this handle in its ctor.
-                Win32.CloseHandle(hToken);
+                NativeMethods.CloseHandle(hToken);
 
                 // This identity needs to be disposed of when the request is done.
                 return identity;
@@ -67,21 +83,5 @@ public static WindowsIdentity LogInAs(Guid credentialKey)
 
             throw new Win32Exception(Marshal.GetLastWin32Error(), $"Unable to log in as user {creds.UserName}");
         }
-
-        private static class Win32
-        {
-            [DllImport("advapi32.dll", SetLastError = true)]
-            public static extern bool LogonUser(
-                string lpszUsername,
-                string lpszDomain,
-                string lpszPassword,
-                int dwLogonType,
-                int dwLogonProvider,
-                out IntPtr phToken
-            );
-
-            [DllImport("kernel32.dll", SetLastError = true)]
-            public static extern bool CloseHandle(IntPtr hHandle);
-        }
     }
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 818d0f0..ccd385c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ It provides real, authenticated Windows Auth capabilities - not just a mock of s
 
 ## Getting Started
 
-There is currently no NuGet package for this project. Open an issue if this project is of interest to you and we'll look at publishing a NuGet package. Otherwise, you can add this project as a git submodule to try it out.
+Visit [Nuget.org](https://www.nuget.org/packages/IntelliTect.AspNetCore.TestHost.WindowsAut) to pull this library into your project as a dependency.
 
 ## Usage
 

From 4f9004da0dd91403649fabbfddba2b8c6234701a Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 11:44:02 -0800
Subject: [PATCH 05/21] Initial commit of DevOps pipeline yml file.  Fixes #3
 and #6.

---
 ...liTect.AspNetCore.TestHost.WindowsAuth.sln |  1 +
 .../WindowsAuthHandler.cs                     |  1 +
 azure-pipelines.yml                           | 30 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth.sln b/IntelliTect.AspNetCore.TestHost.WindowsAuth.sln
index 8f2d4e7..d95e84a 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth.sln
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth.sln
@@ -12,6 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{53989A80-E732-4DE8-AD8A-1875389BE3A0}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		azure-pipelines.yml = azure-pipelines.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs
index 2d609f0..9750dad 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/WindowsAuthHandler.cs
@@ -21,6 +21,7 @@
 
 namespace IntelliTect.AspNetCore.TestHost.WindowsAuth
 {
+    /// <inheritdoc />
     /// <summary>
     ///     ASP.NET Core Authentication handler for authenticating as arbitrary users for integration tests.
     ///     Provides behavior similar to the ASP.NET Core IIS integration AuthenticationHandler.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000..215bd79
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,30 @@
+# Build ASP.NET Core project using Azure Pipelines
+# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core?view=vsts
+
+pool:
+  vmImage: 'vs2017-win2016'
+  
+variables:
+  buildConfiguration: 'Release'
+  version: 2.2.$(rev:.r)
+
+steps:
+- script: |
+    dotnet build --configuration $(buildConfiguration)
+    dotnet test IntelliTect .AspNetCore.TestHost.WindowsAuth.Test --configuration $(buildConfiguration) --logger trx
+    dotnet pack /p:PackageVersion=$(version) --configuration $(buildConfiguration) --output $BUILD_ARTIFACTSTAGINGDIRECTORY
+
+- task: PublishTestResults@2
+  condition: succeededOrFailed()
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
+
+- task: NuGetCommand@2
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+  inputs:
+    command: push
+    nuGetFeedType: external
+    publishFeedCredentials: '<Name of the NuGet service connection>'
+    versioningScheme: byEnvVar
+    versionEnvVar: version
\ No newline at end of file

From 2cc7f08e9ef82626e75a24ed2346a5410c855817 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 11:49:01 -0800
Subject: [PATCH 06/21] Add name of Nuget cervice connection

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 215bd79..9fc760a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,6 +25,6 @@ steps:
   inputs:
     command: push
     nuGetFeedType: external
-    publishFeedCredentials: '<Name of the NuGet service connection>'
+    publishFeedCredentials: 'IntelliTect-Nuget-Feed'
     versioningScheme: byEnvVar
     versionEnvVar: version
\ No newline at end of file

From ce93bc0225fb89452c9db5511cc667d01a747f66 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 12:07:18 -0800
Subject: [PATCH 07/21] Hardcode version until I can figure out how to concat.

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9fc760a..4c5d306 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ pool:
   
 variables:
   buildConfiguration: 'Release'
-  version: 2.2.$(rev:.r)
+  version: 2.2.0
 
 steps:
 - script: |

From 748b4dca732a4b397689ed5014ce85595bd70bd5 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 12:08:19 -0800
Subject: [PATCH 08/21] Errant space!

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4c5d306..e92c898 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,7 +11,7 @@ variables:
 steps:
 - script: |
     dotnet build --configuration $(buildConfiguration)
-    dotnet test IntelliTect .AspNetCore.TestHost.WindowsAuth.Test --configuration $(buildConfiguration) --logger trx
+    dotnet test IntelliTect.AspNetCore.TestHost.WindowsAuth.Test --configuration $(buildConfiguration) --logger trx
     dotnet pack /p:PackageVersion=$(version) --configuration $(buildConfiguration) --output $BUILD_ARTIFACTSTAGINGDIRECTORY
 
 - task: PublishTestResults@2

From 7b99c3f50fe06cff910ebe245801f3a2c2e1523d Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 12:13:08 -0800
Subject: [PATCH 09/21] Remove license acceptance.

---
 .../TestHost.WindowsAuth.csproj                                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
index 397a439..01c1201 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
@@ -10,7 +10,6 @@
     <RootNamespace>IntelliTect.AspNetCore.TestHost.WindowsAuth</RootNamespace>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/IntelliTect/AspNetCore.TestHost.WindowsAuth</PackageProjectUrl>
     <Copyright>© IntelliTect 2018</Copyright>

From 8490f4684201a2d5cce184c3565860cb1ce19735 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 14:21:16 -0800
Subject: [PATCH 10/21] Switch out ad-hoc scripts for Tasks.

---
 .../TestHost.WindowsAuth.csproj               |  1 -
 azure-pipelines.yml                           | 25 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
index 01c1201..b7ce563 100644
--- a/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
+++ b/IntelliTect.AspNetCore.TestHost.WindowsAuth/TestHost.WindowsAuth.csproj
@@ -9,7 +9,6 @@
     <TargetFrameworks>netstandard20</TargetFrameworks>
     <RootNamespace>IntelliTect.AspNetCore.TestHost.WindowsAuth</RootNamespace>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/IntelliTect/AspNetCore.TestHost.WindowsAuth</PackageProjectUrl>
     <Copyright>© IntelliTect 2018</Copyright>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e92c898..a0b3288 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,16 +9,25 @@ variables:
   version: 2.2.0
 
 steps:
-- script: |
-    dotnet build --configuration $(buildConfiguration)
-    dotnet test IntelliTect.AspNetCore.TestHost.WindowsAuth.Test --configuration $(buildConfiguration) --logger trx
-    dotnet pack /p:PackageVersion=$(version) --configuration $(buildConfiguration) --output $BUILD_ARTIFACTSTAGINGDIRECTORY
+- task: DotNetCoreCLI@2
+  inputs:
+    command: build
 
-- task: PublishTestResults@2
-  condition: succeededOrFailed()
+- task: DotNetCoreCLI@2
+  condition: succeeded()
   inputs:
-    testRunner: VSTest
-    testResultsFiles: '**/*.trx'
+    command: test
+    projects: '**/*Test.csproj'
+
+- task: NuGetCommand@2
+  condition: succeeded()
+  inputs: 
+    command: pack
+    versioningScheme: byEnvVar
+    versionEnvVar: version
+
+- task: PublishBuildArtifacts@1
+  condition: succeeded()
 
 - task: NuGetCommand@2
   condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))

From 1633bceece28b7acc8e098f4f6ae3643f4d34101 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 14:34:26 -0800
Subject: [PATCH 11/21] Add in configuration = "Release" and path to which
 project to pack.

---
 azure-pipelines.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a0b3288..d27391a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,17 +12,21 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: build
+    configuration: $(buildConfiguration)
 
 - task: DotNetCoreCLI@2
   condition: succeeded()
   inputs:
     command: test
+    configuration: $(buildConfiguration)
     projects: '**/*Test.csproj'
 
 - task: NuGetCommand@2
   condition: succeeded()
   inputs: 
     command: pack
+    configuration: $(buildConfiguration)
+    packagesToPack: '**/TestHost.WindowsAuth.csproj'
     versioningScheme: byEnvVar
     versionEnvVar: version
 

From 39b8baf06c1d110c369d6c394df68cd14ad7a63a Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 14:43:11 -0800
Subject: [PATCH 12/21] Fix how configuration is set in dotnet CLI tasks.

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d27391a..4c043d8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,13 +12,13 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: build
-    configuration: $(buildConfiguration)
+    arguments: -c $(buildConfiguration)
 
 - task: DotNetCoreCLI@2
   condition: succeeded()
   inputs:
     command: test
-    configuration: $(buildConfiguration)
+    arguments: -c $(buildConfiguration)
     projects: '**/*Test.csproj'
 
 - task: NuGetCommand@2

From 9b465227fb200d9988a2c1c46e477d0be2fdd24d Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 14:52:17 -0800
Subject: [PATCH 13/21] Fix path

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4c043d8..ee075ee 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,7 +26,7 @@ steps:
   inputs: 
     command: pack
     configuration: $(buildConfiguration)
-    packagesToPack: '**/TestHost.WindowsAuth.csproj'
+    packagesToPack: '**/*TestHost.WindowsAuth.csproj'
     versioningScheme: byEnvVar
     versionEnvVar: version
 

From 9477574bba721a4ae6630e75d0c4e87af7c2b32c Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 15:15:29 -0800
Subject: [PATCH 14/21] Whee!  DevOps is almost as much fun as AppVeyor!

---
 azure-pipelines.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ee075ee..816a271 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,31 +10,34 @@ variables:
 
 steps:
 - task: DotNetCoreCLI@2
+  displayName: 'dotnet build'
   inputs:
     command: build
     arguments: -c $(buildConfiguration)
 
 - task: DotNetCoreCLI@2
   condition: succeeded()
+  displayName: 'dotnet test'
   inputs:
     command: test
     arguments: -c $(buildConfiguration)
     projects: '**/*Test.csproj'
 
-- task: NuGetCommand@2
+- task: DotNetCoreCLI@2
   condition: succeeded()
+  displayName: 'dotnet pack'
   inputs: 
     command: pack
     configuration: $(buildConfiguration)
-    packagesToPack: '**/*TestHost.WindowsAuth.csproj'
-    versioningScheme: byEnvVar
-    versionEnvVar: version
+    arguments: --configuration $(buildConfiguration) --output $(Build.ArtifactStagingDirectory) /p:Version=$(version)
 
 - task: PublishBuildArtifacts@1
+  displayName: 'Publish build artifacts'
   condition: succeeded()
 
 - task: NuGetCommand@2
   condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+  displayName: 'nuget push'
   inputs:
     command: push
     nuGetFeedType: external

From 047a4ddbf8e06d74c0941ff77f74cbe2954639a8 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 15:24:44 -0800
Subject: [PATCH 15/21] Turn down the verbosity of the dotnet pack task.

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 816a271..44cc7aa 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,6 +29,7 @@ steps:
   inputs: 
     command: pack
     configuration: $(buildConfiguration)
+    verbosityPack: minimal
     arguments: --configuration $(buildConfiguration) --output $(Build.ArtifactStagingDirectory) /p:Version=$(version)
 
 - task: PublishBuildArtifacts@1

From 3ca3b44776ed658329fc494f9fc514bb28217929 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 16:05:35 -0800
Subject: [PATCH 16/21] Increment build number

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 44cc7aa..a726780 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ pool:
   
 variables:
   buildConfiguration: 'Release'
-  version: 2.2.0
+  version: 2.2.$(Build.BuildId)
 
 steps:
 - task: DotNetCoreCLI@2

From 0931db99f806fb6fd30c5b80ad99430fa0e04f98 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 16:15:30 -0800
Subject: [PATCH 17/21] Setup static version number, push to nuget only from
 release branch.

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a726780..b8263ca 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ pool:
   
 variables:
   buildConfiguration: 'Release'
-  version: 2.2.$(Build.BuildId)
+  version: 2.2.0
 
 steps:
 - task: DotNetCoreCLI@2
@@ -37,7 +37,7 @@ steps:
   condition: succeeded()
 
 - task: NuGetCommand@2
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
   displayName: 'nuget push'
   inputs:
     command: push

From 63bdb702e22cb8d958e6b09efc98de63d1817d0d Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 16:19:28 -0800
Subject: [PATCH 18/21] Filter PR trigger to just master and release tags.

---
 azure-pipelines.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b8263ca..b77bab3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,10 @@
 # Build ASP.NET Core project using Azure Pipelines
 # https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core?view=vsts
 
+pr:
+- master
+- release/*
+
 pool:
   vmImage: 'vs2017-win2016'
   

From efb757b3bf7069509e1f9b84711acc0771bd43ff Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 16:21:01 -0800
Subject: [PATCH 19/21] MOAR FILTER

---
 azure-pipelines.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b77bab3..28f6401 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,10 @@
 # Build ASP.NET Core project using Azure Pipelines
 # https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core?view=vsts
 
+trigger:
+- master
+- release/*
+
 pr:
 - master
 - release/*

From 6f1f5feb40e3a27010b465aed745cc015d08dcd6 Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Thu, 13 Dec 2018 16:28:03 -0800
Subject: [PATCH 20/21] Add build status badge to readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ccd385c..09b447a 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ It provides real, authenticated Windows Auth capabilities - not just a mock of s
 
 ## Getting Started
 
+[![Build Status](https://intellitect.visualstudio.com/IntelliTect/_apis/build/status/IntelliTect.AspNetCore.TestHost.WindowsAuth-Nuget-Publish?branchName=master)](https://intellitect.visualstudio.com/IntelliTect/_build/latest?definitionId=50?branchName=master)
+
 Visit [Nuget.org](https://www.nuget.org/packages/IntelliTect.AspNetCore.TestHost.WindowsAut) to pull this library into your project as a dependency.
 
 ## Usage

From 325799e9d6c652fbbc994dcb2a09175209ff062a Mon Sep 17 00:00:00 2001
From: Kelly Adams <kelly@intellitect.com>
Date: Fri, 14 Dec 2018 07:52:02 -0800
Subject: [PATCH 21/21] Address review comments.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 09b447a..1f07af7 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ It provides real, authenticated Windows Auth capabilities - not just a mock of s
 
 ## Getting Started
 
-[![Build Status](https://intellitect.visualstudio.com/IntelliTect/_apis/build/status/IntelliTect.AspNetCore.TestHost.WindowsAuth-Nuget-Publish?branchName=master)](https://intellitect.visualstudio.com/IntelliTect/_build/latest?definitionId=50?branchName=master)
+![Build Status](https://intellitect.visualstudio.com/IntelliTect/_apis/build/status/IntelliTect.AspNetCore.TestHost.WindowsAuth-Nuget-Publish?branchName=master)]
 
-Visit [Nuget.org](https://www.nuget.org/packages/IntelliTect.AspNetCore.TestHost.WindowsAut) to pull this library into your project as a dependency.
+Visit [Nuget.org](https://www.nuget.org/packages/IntelliTect.AspNetCore.TestHost.WindowsAuth) to pull this library into your project as a dependency.
 
 ## Usage