From 1c32c5f8454fc265a9548b7d70b7d9158e1b33fa Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 28 Sep 2021 19:26:00 -0500
Subject: [PATCH] [ArPow] Update source-build commit shas (#12161)

---
 eng/SourceBuild.Version.Details.xml           | 64 +++++++++----------
 eng/Versions.props                            |  4 +-
 .../tarball/content/eng/Versions.props        |  4 +-
 ...Fix-incorrect-casing-in-project-file.patch | 26 --------
 4 files changed, 36 insertions(+), 62 deletions(-)
 delete mode 100644 src/SourceBuild/tarball/patches/test-templates/0001-Fix-incorrect-casing-in-project-file.patch

diff --git a/eng/SourceBuild.Version.Details.xml b/eng/SourceBuild.Version.Details.xml
index 3d65c673b..63a9498c4 100644
--- a/eng/SourceBuild.Version.Details.xml
+++ b/eng/SourceBuild.Version.Details.xml
@@ -77,17 +77,17 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>4ab0cf33ecb1c25a38422f5b11810e4c8a91d8eb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21416.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21473.2">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>baf4b38e4f1dbc637efdb41624acbe05b2ff9f35</Sha>
+      <Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.21416.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.21473.2">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>baf4b38e4f1dbc637efdb41624acbe05b2ff9f35</Sha>
+      <Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.21416.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.21473.2">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>baf4b38e4f1dbc637efdb41624acbe05b2ff9f35</Sha>
+      <Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.100-rc.2.21469.1" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -99,14 +99,14 @@
       <Sha>73e74bdd2ab3a3f5b2197f3e60aaafb4eae5e302</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rc.2.21471.7">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rc.2.21474.40">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>0fae780070ea511a5113aa069107272ded921349</Sha>
+      <Sha>279a14389ff6c1394e782346be347f467f4332c6</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rc.2.21471.7">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rc.2.21474.40">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>0fae780070ea511a5113aa069107272ded921349</Sha>
+      <Sha>279a14389ff6c1394e782346be347f467f4332c6</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rc.2.21470.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -117,13 +117,13 @@
       <Uri>https://github.com/dotnet/wpf</Uri>
       <Sha>7a877ae32a152e575deb857dff833047652f97ce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21457.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21472.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>b0a54707064024f8959e54027e9e5d8fe49e82c7</Sha>
+      <Sha>f0b5108c92b92ba5ee440228aadba3bae79b43a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.0-beta.21457.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.0-beta.21472.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>b0a54707064024f8959e54027e9e5d8fe49e82c7</Sha>
+      <Sha>f0b5108c92b92ba5ee440228aadba3bae79b43a3</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-release-20210908-02" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -131,25 +131,25 @@
       <Sha>d6f64b37c2cfee76c8b1269d688384ced30ecd21</Sha>
       <SourceBuild RepoName="vstest" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21467.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21473.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>60e655fc7089f6123e61fede21bf99bd1d819713</Sha>
+      <Sha>d51cc207fac85547787bbba83f54f69d8e72e9f5</Sha>
       <SourceBuild RepoName="linker" ManagedOnly="true" />
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21470.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21471.19" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>cb07623e4860fbdeb3f82f829d903eab9ca65749</Sha>
+      <Sha>2cb3d482e3c09760d1b204c597be93f49dba3349</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.0.0-preview-21470-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.0.0-preview-21474-03" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>cb055d28fb0fd51ba872f46105408e7592e6cea8</Sha>
+      <Sha>9f83c725ff188ea0d68b306997328581935a7813</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.0.0-rc.244" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.0.0-rc.258" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>f4ae349ec18d1ac5d5e7d1b0ed753e1300e9e157</Sha>
+      <Sha>e685bdb6d7b4d1f3664f6542f50b84376a19341c</Sha>
       <SourceBuild RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@@ -166,9 +166,9 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>9838ec0843442f761488cfec9cf34612c9f675e6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21460.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21475.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/source-build</Uri>
-      <Sha>3fb25b8db3bec654e37e71a5b2b7fde14444bc2f</Sha>
+      <Sha>a0b571f88fe49c8ab83787442f96244bb3dcb5f6</Sha>
       <SourceBuild RepoName="source-build" ManagedOnly="true" />
     </Dependency>
 
@@ -195,19 +195,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21431.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21473.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5</Sha>
+      <Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21431.1">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21473.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5</Sha>
+      <Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21431.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21473.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5</Sha>
+      <Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
     </Dependency>
     <Dependency Name="Private.SourceBuild.ReferencePackages" Version="6.0.0-alpha.1.21474.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@@ -219,9 +219,9 @@
       <Sha>6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21428.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>178ed3c7ed19e5bda54a8c3f15a5c441ee63ab93</Sha>
+      <Sha>bc3233146e1fcd393ed471d5005333c83363e0fe</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9c4604c13..236dfb29e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -160,8 +160,8 @@
          removed.  See https://github.com/dotnet/source-build/issues/2295 -->
     <MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.17</PrivateSourceBuiltArtifactsPackageVersion>
-    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-21</PrivateSourceBuiltPrebuiltsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.19</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-23</PrivateSourceBuiltPrebuiltsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props
index 51a4d2ef6..b27697389 100644
--- a/src/SourceBuild/tarball/content/eng/Versions.props
+++ b/src/SourceBuild/tarball/content/eng/Versions.props
@@ -21,8 +21,8 @@
   </PropertyGroup>
   <!-- Production Dependencies -->
   <PropertyGroup>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.17</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.19</PrivateSourceBuiltArtifactsPackageVersion>
     <PrivateSourceBuiltPrebuiltsPackageVersionPrefix>0.1.0-6.0.100-</PrivateSourceBuiltPrebuiltsPackageVersionPrefix>
-    <PrivateSourceBuiltPrebuiltsPackageVersionSuffix>21</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
+    <PrivateSourceBuiltPrebuiltsPackageVersionSuffix>23</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/SourceBuild/tarball/patches/test-templates/0001-Fix-incorrect-casing-in-project-file.patch b/src/SourceBuild/tarball/patches/test-templates/0001-Fix-incorrect-casing-in-project-file.patch
deleted file mode 100644
index 7cf045297..000000000
--- a/src/SourceBuild/tarball/patches/test-templates/0001-Fix-incorrect-casing-in-project-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6ad75d442b6f7edc07095f417dd592be5ef04eb2 Mon Sep 17 00:00:00 2001
-From: Michael Simons <msimons@microsoft.com>
-Date: Wed, 22 Sep 2021 21:44:13 +0000
-Subject: [PATCH] Fix incorrect casing in project file
-
-See https://github.com/dotnet/test-templates/issues/186 for details.
----
- .../Microsoft.DotNet.Test.ProjectTemplates.6.0.csproj           | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/Microsoft.DotNet.Test.ProjectTemplates.6.0.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/Microsoft.DotNet.Test.ProjectTemplates.6.0.csproj
-index 38bc616..bc4ca48 100644
---- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/Microsoft.DotNet.Test.ProjectTemplates.6.0.csproj
-+++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/Microsoft.DotNet.Test.ProjectTemplates.6.0.csproj
-@@ -24,7 +24,7 @@
-         <PackageReference Remove="Microsoft.NETCore.App" />
-         <Compile Remove="$(GitInfoFile)" />
-         <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
--        <Content Include="Content\**">
-+        <Content Include="content\**">
-             <PackagePath>content</PackagePath>
-         </Content>
-     </ItemGroup>
--- 
-2.29.2
-