From 8a54a23c8cdcaf112eb5a07419028d27ba23194f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:09:06 +0000
Subject: [PATCH 1/2] Update dependencies from
 https://github.com/dotnet/test-templates build 20220825.1

Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22409.1 -> To Version 1.0.2-beta4.22425.1

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64
---
 eng/Version.Details.xml | 14 +++++++-------
 eng/Versions.props      |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index da74b22b8..f15872029 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,7 +19,7 @@
     </Dependency>
     <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22364.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>75e182c26dbf5d9f8ccca0ac68ee63b0bebb17b8</Sha>
+      <Sha>754d13817d834b716d339183e21aac7d2489c496</Sha>
       <SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -90,17 +90,17 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22409.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22425.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
+      <Sha>8a75efaa853cd17f1336f5e99e626ab3e0fa68d1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22409.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22425.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
+      <Sha>8a75efaa853cd17f1336f5e99e626ab3e0fa68d1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.0.2-beta4.22409.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.0.2-beta4.22425.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
+      <Sha>8a75efaa853cd17f1336f5e99e626ab3e0fa68d1</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22416.35">
diff --git a/eng/Versions.props b/eng/Versions.props
index 6e569e714..8f8f74e38 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -43,9 +43,9 @@
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
     <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.22409.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.22409.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates70PackageVersion>1.0.2-beta4.22409.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.22425.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.22425.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates70PackageVersion>1.0.2-beta4.22425.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->

From 6e49a17a7baa0c12e5129a8d13070f1167ea4c0e Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Thu, 25 Aug 2022 17:31:23 +0000
Subject: [PATCH 2/2] Resolve llvm source-build patch conflict

---
 ...Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
index 57846fba6..098694eff 100644
--- a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
+++ b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
@@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644
 +++ b/global.json
 @@ -5,6 +5,6 @@
    "msbuild-sdks": {
-     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1",
-     "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1",
+     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
+     "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3",
 -    "Microsoft.Build.Traversal": "2.0.2"
 +    "Microsoft.Build.Traversal": "2.0.34"
    }