From f28f54c669e922149c49dd6de0c039d0ee2c8fd2 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Thu, 23 Mar 2023 17:45:01 +0000
Subject: [PATCH] Merged PR 30195: [internal/release/7.0.1xx] Update
 dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.Build**: from 17.4.2 to 17.4.3 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230323.6
- **Date Produced**: March 23, 2023 4:01:54 PM UTC
- **Commit**: a509712dd84270ef4d7ce8bd7a8c55f2521f02ca
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23172.23 to 7.0.105-servicing.23173.6][1]
  - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23172.23 to 7.0.105-servicing.23173.6][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23172.23 to 7.0.105-servicing.23173.6][1]
  - **Microsoft.Build**: [from 17.4.2 to 17.4.3][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC390774e42a&targetVersion=GCa509712dd8&_a=files
[2]: https://github.com/dotnet/msbuild/compare/f08e8816c9...7e646be438

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
---
 NuGet.config            |  6 +++---
 eng/Version.Details.xml | 18 +++++++++---------
 eng/Versions.props      |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f86b532fd..03cd636b0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,13 +12,13 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-f08e881" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f08e8816/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-7e646be" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7e646be4/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-fb541ff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fb541ff9/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-390774e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-390774e4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-a509712" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a509712d/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-01160c5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-01160c5c/nuget/v3/index.json" />
@@ -48,7 +48,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-fb541ff" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-390774e" value="true" />
+    <add key="darc-int-dotnet-sdk-a509712" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-01160c5" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 767e135b9..c3cc05db5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -100,20 +100,20 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.105">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>390774e42ad931a53e09f8498c8f563ded6bf1f5</Sha>
+      <Sha>a509712dd84270ef4d7ce8bd7a8c55f2521f02ca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.105-servicing.23172.23">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.105-servicing.23173.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>390774e42ad931a53e09f8498c8f563ded6bf1f5</Sha>
+      <Sha>a509712dd84270ef4d7ce8bd7a8c55f2521f02ca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.105-servicing.23172.23">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.105-servicing.23173.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>390774e42ad931a53e09f8498c8f563ded6bf1f5</Sha>
+      <Sha>a509712dd84270ef4d7ce8bd7a8c55f2521f02ca</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.105-servicing.23172.23">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.105-servicing.23173.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>390774e42ad931a53e09f8498c8f563ded6bf1f5</Sha>
+      <Sha>a509712dd84270ef4d7ce8bd7a8c55f2521f02ca</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="7.0.5-servicing.23172.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -149,9 +149,9 @@
       <Sha>528676cdbf0bfcfdb9372dc57a047dd0edc6d4db</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.4.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.4.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>f08e8816c9ccf6c811abb5116098c92c4c947d8e</Sha>
+      <Sha>7e646be438ea3fdd8fdab0553cd0e5b505174b65</Sha>
       <SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="6.4.0-rc.123" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 690fb7040..224038c3b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -70,8 +70,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.105</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.105-servicing.23172.23</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.105-servicing.23172.23</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.105-servicing.23173.6</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.105-servicing.23173.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>