From c2685813ab5c1ff04ab53930797a1813d1adedf0 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 15 Nov 2018 12:20:37 -0800
Subject: [PATCH 1/3] 2.1: Update corefx dependencies (#4037)

---
 build/dependencies.props             | 12 ++++++------
 build/tasks/CheckVersionOverrides.cs |  2 +-
 scripts/GenerateTags.ps1             |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index dcf23d85d4..ee542668be 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,6 +4,12 @@
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
     <MicrosoftNETCoreAppPackageVersion>2.1.6</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.6</MicrosoftNETCoreDotNetAppHostPackageVersion>
+    <SystemDataSqlClientPackageVersion>4.5.2-servicing-27114-05</SystemDataSqlClientPackageVersion>
+    <SystemIOPipelinesPackageVersion>4.5.3-servicing-27114-05</SystemIOPipelinesPackageVersion>
+    <SystemMemoryPackageVersion>4.5.2-servicing-27114-05</SystemMemoryPackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>4.5.1-servicing-27114-05</SystemSecurityCryptographyCngPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>4.5.2-servicing-27114-05</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemThreadingTasksExtensionsPackageVersion>4.5.2-servicing-27114-05</SystemThreadingTasksExtensionsPackageVersion>
  </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
@@ -170,15 +176,11 @@
     <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
     <SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDataSqlClientPackageVersion>4.5.1</SystemDataSqlClientPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
     <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
     <SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
-    <SystemIOPipelinesPackageVersion>4.5.2</SystemIOPipelinesPackageVersion>
-    <SystemMemoryPackageVersion>4.5.1</SystemMemoryPackageVersion>
     <SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>4.5.1</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
     <SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
     <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
@@ -186,7 +188,6 @@
     <SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyXmlPackageVersion>4.5.0</SystemSecurityCryptographyXmlPackageVersion>
     <SystemSecurityPermissionsPackageVersion>4.5.0</SystemSecurityPermissionsPackageVersion>
     <SystemSecurityPrincipalWindowsPackageVersion>4.5.1</SystemSecurityPrincipalWindowsPackageVersion>
@@ -194,7 +195,6 @@
     <SystemTextEncodingsWebPackageVersion>4.5.0</SystemTextEncodingsWebPackageVersion>
     <SystemThreadingChannelsPackageVersion>4.5.0</SystemThreadingChannelsPackageVersion>
     <SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
-    <SystemThreadingTasksExtensionsPackageVersion>4.5.1</SystemThreadingTasksExtensionsPackageVersion>
     <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
     <Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>
     <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
diff --git a/build/tasks/CheckVersionOverrides.cs b/build/tasks/CheckVersionOverrides.cs
index ad75aa8b2b..a510a8b800 100644
--- a/build/tasks/CheckVersionOverrides.cs
+++ b/build/tasks/CheckVersionOverrides.cs
@@ -24,7 +24,7 @@ namespace RepoTasks
             var versionOverrides = ProjectRootElement.Open(DotNetPackageVersionPropsPath);
             var dependencies = ProjectRootElement.Open(DependenciesFile);
             var pinnedVersions = dependencies.PropertyGroups
-                .Where(p => !string.Equals("Package Versions: Auto", p.Label))
+                .Where(p => string.Equals("Package Versions: Pinned", p.Label))
                 .SelectMany(p => p.Properties)
                 .ToDictionary(p => p.Name, p => p.Value, StringComparer.OrdinalIgnoreCase);
 
diff --git a/scripts/GenerateTags.ps1 b/scripts/GenerateTags.ps1
index 0cd9c331ca..f0866ffcab 100755
--- a/scripts/GenerateTags.ps1
+++ b/scripts/GenerateTags.ps1
@@ -43,10 +43,10 @@ function New-GitTag {
                 Invoke-Block { & git tag -m "v$Tag" $Tag HEAD }
                 Write-Host -f Magenta "${Repo}: added tag '$Tag'"
             }
-        }
 
-        if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) {
-            Invoke-Block { & git push origin refs/tags/$Tag }
+            if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) {
+                Invoke-Block { & git push origin refs/tags/$Tag }
+            }
         }
     }
     finally {

From 681d743170042f9fca48d43febb4c6138cd1da6e Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Fri, 16 Nov 2018 09:36:17 -0800
Subject: [PATCH 2/3] Update MusicStore source

---
 .gitmodules            | 4 ----
 build/buildorder.props | 2 +-
 build/submodules.props | 2 +-
 modules/MusicStore     | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 160000 modules/MusicStore

diff --git a/.gitmodules b/.gitmodules
index bedc913388..3a7a14987d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -66,10 +66,6 @@
 	path = modules/MetaPackages
 	url = https://github.com/aspnet/MetaPackages.git
 	branch = release/2.1
-[submodule "modules/MusicStore"]
-	path = modules/MusicStore
-	url = https://github.com/aspnet/MusicStore.git
-	branch = release/2.1
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
diff --git a/build/buildorder.props b/build/buildorder.props
index caabf76890..b11fe0d221 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -34,7 +34,7 @@
     <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
-    <RepositoryBuildOrder Include="MusicStore" Order="16" />
+    <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" />
     <RepositoryBuildOrder Include="Templating" Order="17" />
diff --git a/build/submodules.props b/build/submodules.props
index 52d15e9be0..840ee9b359 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -43,7 +43,7 @@
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
 
diff --git a/modules/MusicStore b/modules/MusicStore
deleted file mode 160000
index c14416f26f..0000000000
--- a/modules/MusicStore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c14416f26f3f575665d5142a4b9f677487cfcef4

From 9adb829eb53b44ea5e2626bdd274680ea95b2315 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Fri, 16 Nov 2018 10:18:09 -0800
Subject: [PATCH 3/3] Fix MusicStore RootPath

---
 build/submodules.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/submodules.props b/build/submodules.props
index 840ee9b359..59942bc7dd 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -43,7 +43,7 @@
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>