From f22dc4af8e368d83fd4e5e6354a5dcdd92b0cc5d Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 27 Jul 2018 13:40:46 -0700
Subject: [PATCH 1/5] Add VSTS ci pipelines

---
 .vsts-pipelines/builds/ci-internal.yml | 25 ++++++++++++++++++++++++
 .vsts-pipelines/builds/ci-public.yml   | 27 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 .vsts-pipelines/builds/ci-internal.yml
 create mode 100644 .vsts-pipelines/builds/ci-public.yml

diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
new file mode 100644
index 000000000..26ffa2ac8
--- /dev/null
+++ b/.vsts-pipelines/builds/ci-internal.yml
@@ -0,0 +1,25 @@
+trigger:
+- master
+- release/*
+
+resources:
+  repositories:
+  - repository: buildtools
+    type: git
+    name: aspnet-BuildTools
+    ref: refs/heads/release/2.2
+
+phases:
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    beforeBuild:
+    - powershell: '& ./tools/update_schema.ps1'
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: macOS
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Linux
diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
new file mode 100644
index 000000000..c5221efc2
--- /dev/null
+++ b/.vsts-pipelines/builds/ci-public.yml
@@ -0,0 +1,27 @@
+trigger:
+- master
+- release/*
+
+# See https://github.com/aspnet/BuildTools
+resources:
+  repositories:
+  - repository: buildtools
+    type: github
+    endpoint: DotNet-Bot GitHub Connection
+    name: aspnet/BuildTools
+    ref: refs/heads/release/2.2
+
+phases:
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    beforeBuild:
+    - powershell: '& ./tools/update_schema.ps1'
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: macOS
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Linux

From e503396c2e779868f5ab10cbd2aea819a114ba13 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 27 Jul 2018 13:53:29 -0700
Subject: [PATCH 2/5] Remove unused test runners from common.tests

---
 test/Common.Tests/Common.Tests.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/Common.Tests/Common.Tests.csproj b/test/Common.Tests/Common.Tests.csproj
index 50b978f51..0898b03f4 100644
--- a/test/Common.Tests/Common.Tests.csproj
+++ b/test/Common.Tests/Common.Tests.csproj
@@ -13,11 +13,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
     <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
     <PackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
     <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
   </ItemGroup>
 
 </Project>

From 71bd3c6d43069fb0ca9c04b93d6bde1476a7a527 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 27 Jul 2018 14:28:20 -0700
Subject: [PATCH 3/5] Add restart-service w3svc

---
 .vsts-pipelines/builds/ci-internal.yml    | 14 +-------------
 .vsts-pipelines/builds/ci-public.yml      | 14 +-------------
 .vsts-pipelines/templates/build-steps.yml | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 26 deletions(-)
 create mode 100644 .vsts-pipelines/templates/build-steps.yml

diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
index 26ffa2ac8..260baf453 100644
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ b/.vsts-pipelines/builds/ci-internal.yml
@@ -10,16 +10,4 @@ resources:
     ref: refs/heads/release/2.2
 
 phases:
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Windows
-    beforeBuild:
-    - powershell: '& ./tools/update_schema.ps1'
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: macOS
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Linux
+- template: ../templates/build-steps.yml
diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
index c5221efc2..0ed1a241a 100644
--- a/.vsts-pipelines/builds/ci-public.yml
+++ b/.vsts-pipelines/builds/ci-public.yml
@@ -12,16 +12,4 @@ resources:
     ref: refs/heads/release/2.2
 
 phases:
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Windows
-    beforeBuild:
-    - powershell: '& ./tools/update_schema.ps1'
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: macOS
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Linux
+- template: ../templates/build-steps.yml
diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml
new file mode 100644
index 000000000..6b0d89d64
--- /dev/null
+++ b/.vsts-pipelines/templates/build-steps.yml
@@ -0,0 +1,15 @@
+phases:
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Windows
+    beforeBuild:
+      - powershell: "& ./test/update_schema.ps1"
+      - powershell: Restart-Service w3svc
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: macOS
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+  parameters:
+    agentOs: Linux

From 5562d09a66fd370383155cc4280800ac1a276e9c Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 27 Jul 2018 14:29:47 -0700
Subject: [PATCH 4/5] Fix copy-pasta

---
 .vsts-pipelines/templates/build-steps.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml
index 6b0d89d64..40843183e 100644
--- a/.vsts-pipelines/templates/build-steps.yml
+++ b/.vsts-pipelines/templates/build-steps.yml
@@ -3,8 +3,10 @@ phases:
   parameters:
     agentOs: Windows
     beforeBuild:
-      - powershell: "& ./test/update_schema.ps1"
+      - powershell: "& ./tools/update_schema.ps1"
+        displayName: Update ANCM schema
       - powershell: Restart-Service w3svc
+        displayName: Restart IIS
 
 - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
   parameters:

From c74dd256de2f423cb3f7aed87bc76453ef2f3326 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 27 Jul 2018 14:39:40 -0700
Subject: [PATCH 5/5] Set IsTestProject=false

---
 test/Common.Tests/Common.Tests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Common.Tests/Common.Tests.csproj b/test/Common.Tests/Common.Tests.csproj
index 0898b03f4..ede80732e 100644
--- a/test/Common.Tests/Common.Tests.csproj
+++ b/test/Common.Tests/Common.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>