From 56d83fc46af37a6a4b19f81a835c14fd40a6d9ea Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 8 Nov 2018 12:03:38 -0800
Subject: [PATCH 1/9] Updating submodule(s)

EntityFrameworkCore => ee3828a168f874efc5e5c8cc8c9bce9aa7db9d25
Razor => 8ba0a894256e4b5c5385db9b5aac32fdbd046f3a
SignalR => d0dac557ac9c2ce00fea0cc418df68974282f263

[auto-updated: submodules]
---
 modules/EntityFrameworkCore | 2 +-
 modules/Razor               | 2 +-
 modules/SignalR             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index 79bf0063be..ee3828a168 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit 79bf0063bec879ba7f859e5fafbdf9a82b542a91
+Subproject commit ee3828a168f874efc5e5c8cc8c9bce9aa7db9d25
diff --git a/modules/Razor b/modules/Razor
index 913217f61a..8ba0a89425 160000
--- a/modules/Razor
+++ b/modules/Razor
@@ -1 +1 @@
-Subproject commit 913217f61ae65890cd8527d38f051b3aa6bd6297
+Subproject commit 8ba0a894256e4b5c5385db9b5aac32fdbd046f3a
diff --git a/modules/SignalR b/modules/SignalR
index f4d3ebe09a..d0dac557ac 160000
--- a/modules/SignalR
+++ b/modules/SignalR
@@ -1 +1 @@
-Subproject commit f4d3ebe09af5e0fc93af42acd87186479dac397f
+Subproject commit d0dac557ac9c2ce00fea0cc418df68974282f263

From b19735667a7e61db07df34f4f7d011d71cf327ef Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 8 Nov 2018 12:03:46 -0800
Subject: [PATCH 2/9] Updating BuildTools from 2.2.0-preview2-20181105.3 to
 2.2.0-preview2-20181108.4

[auto-updated: buildtools]
---
 global.json        | 2 +-
 korebuild-lock.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/global.json b/global.json
index 953d5fb935..ad81c3dc28 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
         "version": "2.2.100-rtm-009578"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181105.3"
+        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181108.4"
     }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index d7cae2ea39..998068751e 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview2-20181105.3
-commithash:2f561e9983bce0f39e64fdb262635da897b32d8c
+version:2.2.0-preview2-20181108.4
+commithash:068a05e79eb82b1abd3ccab5acad5173cedd5ee3

From 7f4d10775cf21b282275b47b914612d5493a4cee Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 8 Nov 2018 16:57:07 -0800
Subject: [PATCH 3/9] Add signcheck exclusions (#3985)

---
 build/repo.props                    | 3 +++
 eng/signcheck.exclusions.txt        | 5 +++++
 src/Framework/Directory.Build.props | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 eng/signcheck.exclusions.txt

diff --git a/build/repo.props b/build/repo.props
index 9b866315e8..2c14e6176a 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -13,6 +13,9 @@
 
     <DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
     <SignedDependencyPackageDir>$(RepositoryRoot).deps\Signed\Packages\</SignedDependencyPackageDir>
+    <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
+    <!-- This creates false-positives on many of the native .dll's we produce or re-distribute from other teams. -->
+    <DisableSignCheckStrongName>true</DisableSignCheckStrongName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/signcheck.exclusions.txt b/eng/signcheck.exclusions.txt
new file mode 100644
index 0000000000..72a47fb4ba
--- /dev/null
+++ b/eng/signcheck.exclusions.txt
@@ -0,0 +1,5 @@
+content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
+content/*.js;Microsoft.DotNet.Web.Spa.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+content/*.js;Microsoft.DotNet.Web.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+Templates/*.js;Microsoft.VisualStudio.Web.CodeGenerators.Mvc.*.nupkg; Exclude JavaScript files from codesigning in code generators
+*.js;signalr-*-javadoc.jar; Exclude JavaScript files in the generated javadocs
diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props
index d96d5b2e8d..df110bdbcd 100644
--- a/src/Framework/Directory.Build.props
+++ b/src/Framework/Directory.Build.props
@@ -15,7 +15,7 @@
   <Import Condition="Exists('..\..\obj\dependencies.g.props') AND '$(DotNetPackageVersionPropsPath)' == ''" Project="..\..\obj\dependencies.g.props" />
 
   <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.shfxproj' ">
-    <OutputPath>$(ArtifactsConfigurationDir)$(SharedFxRid)\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath>$(RepositoryRoot)bin\fx\$(SharedFxRid)\$(MSBuildProjectName)\</OutputPath>
     <BaseIntermediateOutputPath>$(RepositoryRoot)obj\fx\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
 
     <CrossgenSymbolsOutput Condition=" '$(CrossgenOutput)' == 'false' OR '$(SharedFxRid)' == 'osx-x64'">false</CrossgenSymbolsOutput>

From ba70991d7c6f44c834aea6911f4d260bcf8f9c8d Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 8 Nov 2018 17:01:31 -0800
Subject: [PATCH 4/9] Stop publishing runtime-extension-internal.zip and don't
 produce StressTestWebsite.zip by default in CI builds (#3984)

---
 .gitignore                                 |  1 +
 build/Publish.targets                      |  6 ------
 src/IISIntegration/Directory.Build.props   | 13 ++-----------
 src/IISIntegration/IISIntegration.NoV1.sln |  1 -
 src/IISIntegration/IISIntegration.sln      |  1 -
 src/IISIntegration/build/repo.props        |  1 -
 src/IISIntegration/build/repo.targets      |  2 +-
 src/IISIntegration/build/sources.props     | 17 -----------------
 8 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 src/IISIntegration/build/sources.props

diff --git a/.gitignore b/.gitignore
index ba949609e0..4053f67f62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ msbuild.ProjectImports.zip
 scripts/tmp/
 .dotnet/
 .tools/
+src/**/global.json
diff --git a/build/Publish.targets b/build/Publish.targets
index a3493b3933..e21a3f33b7 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -64,7 +64,6 @@
       <NpmBlobBasePath>aspnetcore/npm/</NpmBlobBasePath>
       <JarBlobBasePath>aspnetcore/jar/</JarBlobBasePath>
       <AliasBlobBasePath>aspnetcore/Runtime/$(SharedFxCliBlobChannel)/</AliasBlobBasePath>
-      <SiteExtensionArchiveFileName>runtime-site-extension-internal-$(PackageVersion).zip</SiteExtensionArchiveFileName>
       <InstallerBaseFileName>aspnetcore-runtime-$(PackageVersion)</InstallerBaseFileName>
       <InstallerAliasBaseFileName>aspnetcore-runtime-latest</InstallerAliasBaseFileName>
       <IntermediateInstallerBaseFileName>aspnetcore-runtime-internal-$(PackageVersion)</IntermediateInstallerBaseFileName>
@@ -95,11 +94,6 @@
       </FilesToPublish>
 
       <!-- Intermediate files passed on to the dotnet-CLI. -->
-      <FilesToPublish Include="$(DependencyAssetsDir)$(SiteExtensionArchiveFileName)" Condition="@(Repository->AnyHaveMetadataValue('Identity', 'AzureIntegration'))">
-        <RelativeBlobPath>$(BlobBasePath)$(SiteExtensionArchiveFileName)</RelativeBlobPath>
-        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
-      </FilesToPublish>
-
       <FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-$(PackageVersion).lzma" >
         <RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-$(PackageVersion).lzma</RelativeBlobPath>
         <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props
index 45a38d3e61..7c0a39562a 100644
--- a/src/IISIntegration/Directory.Build.props
+++ b/src/IISIntegration/Directory.Build.props
@@ -1,20 +1,11 @@
 <Project>
-  <Import
-    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
-    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <Import Project="version.props" />
   <Import Project="build\dependencies.props" />
-  <Import Project="build\sources.props" />
 
   <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/IISIntegration</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <!-- Workaround microsoft/msbuild#3626 -->
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
   </PropertyGroup>
diff --git a/src/IISIntegration/IISIntegration.NoV1.sln b/src/IISIntegration/IISIntegration.NoV1.sln
index f7eb135f73..e0e3d4967e 100644
--- a/src/IISIntegration/IISIntegration.NoV1.sln
+++ b/src/IISIntegration/IISIntegration.NoV1.sln
@@ -45,7 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 		build\native.targets = build\native.targets
 		build\repo.props = build\repo.props
 		build\repo.targets = build\repo.targets
-		build\sources.props = build\sources.props
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
diff --git a/src/IISIntegration/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln
index 440001a8ac..74e2591646 100644
--- a/src/IISIntegration/IISIntegration.sln
+++ b/src/IISIntegration/IISIntegration.sln
@@ -46,7 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 		build\native.targets = build\native.targets
 		build\repo.props = build\repo.props
 		build\repo.targets = build\repo.targets
-		build\sources.props = build\sources.props
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props
index 6a94ca900f..b75afd2b3c 100644
--- a/src/IISIntegration/build/repo.props
+++ b/src/IISIntegration/build/repo.props
@@ -2,7 +2,6 @@
   <Import Project="dependencies.props" />
 
   <PropertyGroup>
-    <AncmZipOutputPath>$(BuildDir)AspNetCoreModule.zip</AncmZipOutputPath>
     <StressTestWebSiteZipOutputPath>$(BuildDir)StressTestWebSite.zip</StressTestWebSiteZipOutputPath>
   </PropertyGroup>
 
diff --git a/src/IISIntegration/build/repo.targets b/src/IISIntegration/build/repo.targets
index 51fae5d588..66bd375737 100644
--- a/src/IISIntegration/build/repo.targets
+++ b/src/IISIntegration/build/repo.targets
@@ -4,7 +4,7 @@
     <PrepareDependsOn>$(PrepareDependsOn)</PrepareDependsOn>
     <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetNativeArtifactsInfo</GetArtifactInfoDependsOn>
     <CompileDependsOn Condition="'$(OS)'=='Windows_NT'">BuildNativeAssets;$(CompileDependsOn)</CompileDependsOn>
-    <PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);PackageNativeProjects;PackageStressTestApp</PackageDependsOn>
+    <PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);PackageNativeProjects</PackageDependsOn>
     <TestDependsOn>$(TestDependsOn);RunNativeTest</TestDependsOn>
     <NuGetVerifierRuleFile Condition="'$(OS)' != 'Windows_NT'">$(RepositoryRoot)NuGetPackageVerifier.xplat.json</NuGetVerifierRuleFile>
     <SourceBase>$(RepositoryRoot)src\</SourceBase>
diff --git a/src/IISIntegration/build/sources.props b/src/IISIntegration/build/sources.props
deleted file mode 100644
index 9215df9751..0000000000
--- a/src/IISIntegration/build/sources.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
-  <PropertyGroup Label="RestoreSources">
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
-</Project>

From bc44d9d4e05cad1d6d788f8b61062fe263992dca Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 8 Nov 2018 17:50:34 -0800
Subject: [PATCH 5/9] Remove artifact info for StressTestWebSite.zip

---
 src/IISIntegration/build/repo.targets | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/IISIntegration/build/repo.targets b/src/IISIntegration/build/repo.targets
index 66bd375737..341ae8b7f5 100644
--- a/src/IISIntegration/build/repo.targets
+++ b/src/IISIntegration/build/repo.targets
@@ -58,13 +58,6 @@
       </ArtifactInfo>
       <FilesToSign Include="$(AncmV2PackageOutputPath)" Certificate="$(PackageSigningCertName)" />
 
-      <ArtifactInfo Include="$(StressTestWebSiteZipOutputPath)">
-        <ArtifactType>ZipArchive</ArtifactType>
-        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-        <Category>noship</Category>
-      </ArtifactInfo>
-
-      <FilesToExcludeFromSigning Include="$(StressTestWebSiteZipOutputPath)" />
       <FilesToExcludeFromSigning Include="AspNetCore\ancm.mof" Container="$(AncmV2PackageOutputPath)" />
     </ItemGroup>
   </Target>

From db0d3c333ddff9dbf998b787d74f8bdd23183360 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 8 Nov 2018 23:40:14 -0800
Subject: [PATCH 6/9] Fix NU1605 build error by ensuring package versions are
 set correctly in subfolder projects (#3987)

---
 .azure/pipelines/fast-pr-validation.yml       | 15 +++-
 .azure/pipelines/project-ci.yml               | 60 ----------------
 build/RepositoryBuild.targets                 |  1 +
 build/buildorder.props                        |  6 +-
 build/dependencies.folderbuilds.props         | 29 ++++++++
 build/dependencies.props                      |  1 +
 src/DataProtection/Directory.Build.props      |  5 --
 src/DataProtection/dependencies.props         | 33 ---------
 src/DataProtection/version.props              |  2 -
 src/IISIntegration/Directory.Build.props      |  2 +-
 src/IISIntegration/Directory.Build.targets    |  9 ---
 src/IISIntegration/build.sh                   |  0
 src/IISIntegration/build/dependencies.props   | 68 -------------------
 src/IISIntegration/build/repo.props           | 21 ++----
 .../dependencies.overrides.props              | 19 ++++++
 .../test/TestTasks/TestTasks.csproj           |  2 +-
 .../InProcessWebSite.csproj                   |  1 -
 .../test/TestTasks/TestTasks.csproj           |  2 +-
 .../InProcessWebSite.csproj                   |  1 -
 src/IISIntegration/version.props              |  2 -
 src/WebSockets/Directory.Build.props          | 16 +----
 src/WebSockets/Directory.Build.targets        | 10 ---
 src/WebSockets/build/dependencies.props       | 34 ----------
 src/WebSockets/build/repo.props               | 19 ++----
 src/WebSockets/build/sources.props            | 17 -----
 25 files changed, 82 insertions(+), 293 deletions(-)
 delete mode 100644 .azure/pipelines/project-ci.yml
 create mode 100644 build/dependencies.folderbuilds.props
 delete mode 100644 src/DataProtection/dependencies.props
 delete mode 100644 src/IISIntegration/Directory.Build.targets
 mode change 100644 => 100755 src/IISIntegration/build.sh
 delete mode 100644 src/IISIntegration/build/dependencies.props
 create mode 100644 src/IISIntegration/dependencies.overrides.props
 delete mode 100644 src/WebSockets/Directory.Build.targets
 delete mode 100644 src/WebSockets/build/dependencies.props
 delete mode 100644 src/WebSockets/build/sources.props

diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/fast-pr-validation.yml
index 143abd2e46..8da4603d26 100644
--- a/.azure/pipelines/fast-pr-validation.yml
+++ b/.azure/pipelines/fast-pr-validation.yml
@@ -4,9 +4,22 @@ trigger:
 - release/*
 
 jobs:
-- template: project-ci.yml
+- template: jobs/default-build.yml
   parameters:
+    agentOs: Windows
+    jobName: Windows_FastCheck
+    jobDisplayName: Windows - Fast Check
     buildArgs: "/t:FastCheck"
+    artifacts:
+      publish: false
+- template: jobs/default-build.yml
+  parameters:
+    agentOs: Windows
+    jobName: Compile_Windows
+    jobDisplayName: "Build: Windows"
+    buildArgs: "/p:SkipTests=true"
+    artifacts:
+      publish: false
 - job: RepoBuilds
   pool:
     vmImage: vs2017-win2016
diff --git a/.azure/pipelines/project-ci.yml b/.azure/pipelines/project-ci.yml
deleted file mode 100644
index c08991dfc4..0000000000
--- a/.azure/pipelines/project-ci.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Description: Runs build.cmd/sh on macOS, Linux, and Windows
-# Parameters:
-#   buildArgs: string
-#       Additional arguments to pass to the build.sh/cmd script.
-#       Note: -ci is always passed
-#   beforeBuild: [steps]
-#       Additional steps to run before build.sh/cmd
-#   afterBuild: [steps]
-#       Additional steps to run after build.sh/cmd
-#   variables: {}
-#       VSTS build and environment variables
-#   matrix: {}
-#       The matrix of configurations to run. By default, it runs a Debug and Release build on all platforms
-#   codeSign: boolean
-#       This build definition is enabled for code signing. (Only applies to Windows)
-#   buildDirectory: string
-#       Specifies what directory to run build.sh/cmd
-
-parameters:
-  buildArgs: ''
-  beforeBuild: []
-  afterBuild: []
-  codeSign: false
-  variables: {}
-  matrix:
-    Release:
-      BuildConfiguration: Release
-    Debug:
-      BuildConfiguration: Debug
-  buildDirectory: ''
-
-jobs:
-- template: jobs/default-build.yml
-  parameters:
-    agentOs: Windows
-    matrix: ${{ parameters.matrix }}
-    buildArgs: ${{ parameters.buildArgs }}
-    beforeBuild: ${{ parameters.beforeBuild }}
-    afterBuild: ${{ parameters.afterBuild }}
-    codeSign: ${{ parameters.codeSign }}
-    variables: ${{ parameters.variables }}
-    buildDirectory: ${{ parameters.buildDirectory }}
-- template: jobs/default-build.yml
-  parameters:
-    agentOs: macOS
-    matrix: ${{ parameters.matrix }}
-    buildArgs: ${{ parameters.buildArgs }}
-    beforeBuild: ${{ parameters.beforeBuild }}
-    afterBuild: ${{ parameters.afterBuild }}
-    variables: ${{ parameters.variables }}
-    buildDirectory: ${{ parameters.buildDirectory }}
-- template: jobs/default-build.yml
-  parameters:
-    agentOs: Linux
-    matrix: ${{ parameters.matrix }}
-    buildArgs: ${{ parameters.buildArgs }}
-    beforeBuild: ${{ parameters.beforeBuild }}
-    afterBuild: ${{ parameters.afterBuild }}
-    variables: ${{ parameters.variables }}
-    buildDirectory: ${{ parameters.buildDirectory }}
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index f3c6920044..a9af6ff519 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -78,6 +78,7 @@
       <RepositoryBuildArguments Condition="'$(CI)'== 'true'">$(RepositoryBuildArguments) -DotNetHome '$(DOTNET_HOME)'</RepositoryBuildArguments>
       <!-- Should reduce allowable package feeds to only nuget.org. -->
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:AspNetUniverseBuildOffline=true</RepositoryBuildArguments>
+      <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:IsUniverseBuild=true</RepositoryBuildArguments>
       <!-- If there are duplicate properties, the properties which are defined later in the order would override the earlier ones -->
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath)</RepositoryBuildArguments>
diff --git a/build/buildorder.props b/build/buildorder.props
index a22e5179b8..c17c8d0952 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -7,9 +7,9 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="JsonPatch" Order="2" />
-    <RepositoryBuildOrder Include="DotNetTools" Order="4" />
-    <RepositoryBuildOrder Include="HtmlAbstractions" Order="5" />
+    <RepositoryBuildOrder Include="JsonPatch" Order="1" />
+    <RepositoryBuildOrder Include="DotNetTools" Order="1" />
+    <RepositoryBuildOrder Include="HtmlAbstractions" Order="1" />
     <RepositoryBuildOrder Include="Razor" Order="6" />
     <RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
     <RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
diff --git a/build/dependencies.folderbuilds.props b/build/dependencies.folderbuilds.props
new file mode 100644
index 0000000000..e027154252
--- /dev/null
+++ b/build/dependencies.folderbuilds.props
@@ -0,0 +1,29 @@
+<!-- This file is temporary while we rework dependencies management. It is used when building individual folders as if they were repos. -->
+<Project>
+  <PropertyGroup>
+    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181108.4</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
+    <MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreDiagnosticsPackageVersion>
+    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreHostingPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreHostingPackageVersion>
+    <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
+    <MicrosoftAspNetCoreHttpOverridesPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreHttpOverridesPackageVersion>
+    <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreHttpPackageVersion>
+    <MicrosoftAspNetCoreHttpSysSourcesPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
+    <MicrosoftAspNetCoreResponseCompressionPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreResponseCompressionPackageVersion>
+    <MicrosoftAspNetCoreServerHttpSysPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreServerHttpSysPackageVersion>
+    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
+    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-rtm-35665</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
+    <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
+    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreServerKestrelPackageVersion>
+    <MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreStaticFilesPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0-rtm-35665</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>2.2.0-rtm-35665</MicrosoftEntityFrameworkCorePackageVersion>
+    <MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>2.2.0-rtm-35665</MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>
+    <MicrosoftNetHttpHeadersPackageVersion>2.2.0-rtm-35665</MicrosoftNetHttpHeadersPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index 95a52d4b9e..0d6109cbeb 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -70,6 +70,7 @@
   </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
+  <Import Project="dependencies.folderbuilds.props" Condition=" '$(IsUniverseBuild)' != 'true' AND '$(DotNetPackageVersionPropsPath)' == ''" />
 
   <PropertyGroup>
     <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
diff --git a/src/DataProtection/Directory.Build.props b/src/DataProtection/Directory.Build.props
index b18bd3713f..dc0f2fb7d4 100644
--- a/src/DataProtection/Directory.Build.props
+++ b/src/DataProtection/Directory.Build.props
@@ -3,11 +3,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <Import Project="version.props" />
-  <Import Project="dependencies.props" />
-
-  <PropertyGroup>
-    <VerifyVersion>false</VerifyVersion>
-  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
diff --git a/src/DataProtection/dependencies.props b/src/DataProtection/dependencies.props
deleted file mode 100644
index 687186b112..0000000000
--- a/src/DataProtection/dependencies.props
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Fallback when not building from command line. -->
-    <InternalAspNetCoreSdkPackageVersion Condition="'$(InternalAspNetCoreSdkPackageVersion)' == ''">2.2.0-preview2-20181004.6</InternalAspNetCoreSdkPackageVersion>
-    <LastGoodAspBuildVersion>2.2.0-preview3-35497</LastGoodAspBuildVersion>
-    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion Condition=" '$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion Condition=" '$(MicrosoftAspNetCoreHostingPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion Condition=" '$(MicrosoftAspNetCoreTestingPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion Condition=" '$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion Condition=" '$(MicrosoftEntityFrameworkCorePackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftEntityFrameworkCorePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion Condition=" '$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion Condition=" '$(MicrosoftExtensionsConfigurationJsonPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion Condition=" '$(MicrosoftExtensionsConfigurationPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion Condition=" '$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion Condition=" '$(MicrosoftExtensionsDependencyInjectionPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion Condition=" '$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion Condition=" '$(MicrosoftExtensionsLoggingConsolePackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion Condition=" '$(MicrosoftExtensionsLoggingPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion Condition=" '$(MicrosoftExtensionsOptionsPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsWebEncodersSourcesPackageVersion Condition=" '$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)' == '' ">$(LastGoodAspBuildVersion)</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
-  </PropertyGroup>
-
-  <!--
-    The versions are present to maintain compatibility with the 2.2.0 release of DataProtection,
-    even though source code and infrastructure has changed.
-   -->
-  <PropertyGroup Label="Package Versions: Overrides">
-  </PropertyGroup>
-</Project>
diff --git a/src/DataProtection/version.props b/src/DataProtection/version.props
index 4889a26987..6d48efec5b 100644
--- a/src/DataProtection/version.props
+++ b/src/DataProtection/version.props
@@ -5,8 +5,6 @@
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
-    <FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props
index 7c0a39562a..82bbde4ef9 100644
--- a/src/IISIntegration/Directory.Build.props
+++ b/src/IISIntegration/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <Import Project="version.props" />
-  <Import Project="build\dependencies.props" />
+  <Import Project="dependencies.overrides.props" />
 
   <PropertyGroup>
     <!-- Workaround microsoft/msbuild#3626 -->
diff --git a/src/IISIntegration/Directory.Build.targets b/src/IISIntegration/Directory.Build.targets
deleted file mode 100644
index 73b97f2807..0000000000
--- a/src/IISIntegration/Directory.Build.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
-    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/IISIntegration/build.sh b/src/IISIntegration/build.sh
old mode 100644
new mode 100755
diff --git a/src/IISIntegration/build/dependencies.props b/src/IISIntegration/build/dependencies.props
deleted file mode 100644
index 2f9ebbca5b..0000000000
--- a/src/IISIntegration/build/dependencies.props
+++ /dev/null
@@ -1,68 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <PropertyGroup Label="Package Versions">
-    <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181019.5</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreAllPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
-    <MicrosoftAspNetCoreHttpOverridesPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreHttpOverridesPackageVersion>
-    <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreHttpPackageVersion>
-    <MicrosoftAspNetCoreHttpSysSourcesPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
-    <MicrosoftAspNetCoreResponseCompressionPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreResponseCompressionPackageVersion>
-    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-rtm-35541</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreTestHostPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.2.0-rtm-35541</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
-    <MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>2.2.0-rtm-35541</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreApp22PackageVersion>2.2.0-rtm-27023-02</MicrosoftNETCoreApp22PackageVersion>
-    <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
-    <MicrosoftNetHttpHeadersPackageVersion>2.2.0-rtm-35541</MicrosoftNetHttpHeadersPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
-    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
-    <SystemIOPipelinesPackageVersion>4.5.2</SystemIOPipelinesPackageVersion>
-    <SystemMemoryPackageVersion>4.5.1</SystemMemoryPackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.1</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>4.5.0</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemServiceProcessServiceControllerPackageVersion>4.5.0</SystemServiceProcessServiceControllerPackageVersion>
-    <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
-    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
-  </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-  <PropertyGroup Label="Package Versions: Pinned">
-    <MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
-    <MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>
-    <MicrosoftAspNetCoreServerIISStablePackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreServerIISStablePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationCore21PackageVersion>2.1.0</MicrosoftAspNetCoreAuthenticationCore21PackageVersion>
-    <MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion>2.1.0</MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion>
-    <MicrosoftAspNetCoreHostingAbstractions21PackageVersion>2.1.0</MicrosoftAspNetCoreHostingAbstractions21PackageVersion>
-    <MicrosoftAspNetCoreHttpSysSources21PackageVersion>2.1.0</MicrosoftAspNetCoreHttpSysSources21PackageVersion>
-    <SystemIOPipelines21PackageVersion>4.5.2</SystemIOPipelines21PackageVersion>
-    <SystemSecurityPrincipalWindows21PackageVersion>4.5.0</SystemSecurityPrincipalWindows21PackageVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props
index b75afd2b3c..a4ed9c2f43 100644
--- a/src/IISIntegration/build/repo.props
+++ b/src/IISIntegration/build/repo.props
@@ -1,7 +1,10 @@
 <Project>
-  <Import Project="dependencies.props" />
-
+  <Import Project="..\..\..\build\dependencies.props" />
+  <Import Project="..\..\..\build\runtimes.props" />
   <PropertyGroup>
+    <!-- TODO: temporary while we reorganize source code and refactor dependency management -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+
     <StressTestWebSiteZipOutputPath>$(BuildDir)StressTestWebSite.zip</StressTestWebSiteZipOutputPath>
   </PropertyGroup>
 
@@ -26,18 +29,4 @@
   <ItemGroup Condition="'$(SkipIISForwardsCompatibilityTests)' == 'true'" >
       <ExcludeFromTest Include="$(RepositoryRoot)test\IIS.ForwardsCompatibility.FunctionalTests\*.csproj" />
   </ItemGroup>
-
-  <PropertyGroup>
-    <!-- These properties are use by the automation that updates dependencies.props -->
-    <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
-    <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
-    <!-- These are for functional test projects that are only runable on windows -->
-    <DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'" Include="$(MicrosoftNETCoreApp21PackageVersion)" Arch="x86" />
-  </ItemGroup>
 </Project>
diff --git a/src/IISIntegration/dependencies.overrides.props b/src/IISIntegration/dependencies.overrides.props
new file mode 100644
index 0000000000..8fa5d9fc58
--- /dev/null
+++ b/src/IISIntegration/dependencies.overrides.props
@@ -0,0 +1,19 @@
+<Project>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <!-- These versions are pinned for backwards compatibility tests. -->
+  <PropertyGroup Label="Package Versions: Pinned">
+    <MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
+    <MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>
+    <MicrosoftAspNetCoreServerIISStablePackageVersion>2.2.0-rtm-35665</MicrosoftAspNetCoreServerIISStablePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationCore21PackageVersion>2.1.0</MicrosoftAspNetCoreAuthenticationCore21PackageVersion>
+    <MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion>2.1.0</MicrosoftAspNetCoreConnectionsAbstractions21PackageVersion>
+    <MicrosoftAspNetCoreHostingAbstractions21PackageVersion>2.1.0</MicrosoftAspNetCoreHostingAbstractions21PackageVersion>
+    <MicrosoftAspNetCoreHttpSysSources21PackageVersion>2.1.0</MicrosoftAspNetCoreHttpSysSources21PackageVersion>
+    <SystemIOPipelines21PackageVersion>4.5.2</SystemIOPipelines21PackageVersion>
+    <SystemSecurityPrincipalWindows21PackageVersion>4.5.0</SystemSecurityPrincipalWindows21PackageVersion>
+  </PropertyGroup>
+</Project>
+
+
diff --git a/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj
index aa4c144936..3cf4f265bb 100644
--- a/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj
+++ b/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
index 4d0952108a..e08c2be69f 100644
--- a/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
+++ b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="$(MicrosoftAspNetCoreServerIISStablePackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="$(MicrosoftAspNetCoreResponseCompressionPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
diff --git a/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/IISIntegration/test/TestTasks/TestTasks.csproj
index aa4c144936..3cf4f265bb 100644
--- a/src/IISIntegration/test/TestTasks/TestTasks.csproj
+++ b/src/IISIntegration/test/TestTasks/TestTasks.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
index 4d0952108a..e08c2be69f 100644
--- a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
+++ b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="$(MicrosoftAspNetCoreServerIISStablePackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="$(MicrosoftAspNetCoreResponseCompressionPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
diff --git a/src/IISIntegration/version.props b/src/IISIntegration/version.props
index 6fb4839c0d..9b96613b4a 100644
--- a/src/IISIntegration/version.props
+++ b/src/IISIntegration/version.props
@@ -13,8 +13,6 @@
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
-    <FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <AspNetCoreModuleOutOfProcessVersion>2.0.0</AspNetCoreModuleOutOfProcessVersion>
   </PropertyGroup>
diff --git a/src/WebSockets/Directory.Build.props b/src/WebSockets/Directory.Build.props
index 08744cc42e..97bc856e11 100644
--- a/src/WebSockets/Directory.Build.props
+++ b/src/WebSockets/Directory.Build.props
@@ -1,19 +1,5 @@
 <Project>
-  <Import
-    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
-    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <Import Project="version.props" />
-  <Import Project="build\dependencies.props" />
-  <Import Project="build\sources.props" />
-
-  <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/WebSockets</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
 </Project>
diff --git a/src/WebSockets/Directory.Build.targets b/src/WebSockets/Directory.Build.targets
deleted file mode 100644
index 78626b773e..0000000000
--- a/src/WebSockets/Directory.Build.targets
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
-    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/WebSockets/build/dependencies.props b/src/WebSockets/build/dependencies.props
deleted file mode 100644
index 6a1e9ab585..0000000000
--- a/src/WebSockets/build/dependencies.props
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181004.6</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
-    <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreDiagnosticsPackageVersion>
-    <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
-    <MicrosoftAspNetCoreServerHttpSysPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreServerHttpSysPackageVersion>
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
-    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview3-35425</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview3-27001-02</MicrosoftNETCoreApp22PackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.1</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
-  </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-  <PropertyGroup Label="Package Versions: Pinned" />
-</Project>
diff --git a/src/WebSockets/build/repo.props b/src/WebSockets/build/repo.props
index feea5ac9e6..ad95e1570f 100644
--- a/src/WebSockets/build/repo.props
+++ b/src/WebSockets/build/repo.props
@@ -1,19 +1,12 @@
 <Project>
-  <Import Project="dependencies.props" />
+  <Import Project="..\..\..\build\dependencies.props" />
+  <Import Project="..\..\..\build\runtimes.props" />
+  <PropertyGroup>
+    <!-- TODO: temporary while we reorganize source code and refactor dependency management -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
 
   <ItemGroup>
     <ExcludeFromTest Include="$(RepositoryRoot)test\AutobahnTestApp\*.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <!-- These properties are use by the automation that updates dependencies.props -->
-    <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
-    <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
-  </ItemGroup>
 </Project>
diff --git a/src/WebSockets/build/sources.props b/src/WebSockets/build/sources.props
deleted file mode 100644
index 9215df9751..0000000000
--- a/src/WebSockets/build/sources.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
-  <PropertyGroup Label="RestoreSources">
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
-</Project>

From 880f4f67745e1fe84d3a084401e8cdf9fbd30a61 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 8 Nov 2018 23:44:27 -0800
Subject: [PATCH 7/9] Updating submodule(s)

AzureIntegration => 031a2ed214529194d95d8deed50287760163ffae
CORS => f05b0e792d2361be214947798857ef3eac77825d
KestrelHttpServer => 2b87e7be8525ed7ae0aa57cbd94c3d1b522edaa3

[auto-updated: submodules]
---
 modules/AzureIntegration  | 2 +-
 modules/CORS              | 2 +-
 modules/KestrelHttpServer | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/AzureIntegration b/modules/AzureIntegration
index f58d3d4e94..031a2ed214 160000
--- a/modules/AzureIntegration
+++ b/modules/AzureIntegration
@@ -1 +1 @@
-Subproject commit f58d3d4e9424f9d33d8f8de2bc9a09f9a11d7079
+Subproject commit 031a2ed214529194d95d8deed50287760163ffae
diff --git a/modules/CORS b/modules/CORS
index a74235c7ec..f05b0e792d 160000
--- a/modules/CORS
+++ b/modules/CORS
@@ -1 +1 @@
-Subproject commit a74235c7ec22c8801619550f7d6a223a08890a9a
+Subproject commit f05b0e792d2361be214947798857ef3eac77825d
diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index a1c1083798..2b87e7be85 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit a1c1083798d9230a17f0ff6528da3f9dcc3f012c
+Subproject commit 2b87e7be8525ed7ae0aa57cbd94c3d1b522edaa3

From 6b66c2a67f221b8c6c217b726fadc03f914086d7 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 8 Nov 2018 23:44:37 -0800
Subject: [PATCH 8/9] Updating BuildTools from 2.2.0-preview2-20181108.4 to
 2.2.0-preview2-20181108.7

[auto-updated: buildtools]
---
 global.json        | 2 +-
 korebuild-lock.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/global.json b/global.json
index ad81c3dc28..10f2dc6bc5 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
         "version": "2.2.100-rtm-009578"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181108.4"
+        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181108.7"
     }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 998068751e..a48863b8c5 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview2-20181108.4
-commithash:068a05e79eb82b1abd3ccab5acad5173cedd5ee3
+version:2.2.0-preview2-20181108.7
+commithash:4b09b2475059642a0e304427fbc6515cb8052fca

From 1f19f1a51af0a15f8d8e2c8aa3ecc4807620e4eb Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 9 Nov 2018 07:23:47 -0800
Subject: [PATCH 9/9] Temporarily disable sign check because the tool crashes
 and prevents us from getting a build

---
 build/repo.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/repo.props b/build/repo.props
index 2c14e6176a..799ff45854 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -13,6 +13,8 @@
 
     <DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
     <SignedDependencyPackageDir>$(RepositoryRoot).deps\Signed\Packages\</SignedDependencyPackageDir>
+    <!-- SignCheck currently fails when verifying vsix files. See https://github.com/dotnet/arcade/issues/1306. -->
+    <DisableSignCheck>true</DisableSignCheck>
     <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
     <!-- This creates false-positives on many of the native .dll's we produce or re-distribute from other teams. -->
     <DisableSignCheckStrongName>true</DisableSignCheckStrongName>