From 552bd6c89b07627bc57be1c07b59e0e2c8934207 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Sun, 1 Oct 2023 02:24:36 +0000
Subject: [PATCH] Merged PR 34164: [internal/release/frameshift/7.0.3xx] Update
 dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230930.36
- **Date Produced**: October 1, 2023 2:06:09 AM UTC
- **Commit**: f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a48ee0826&targetVersion=GCf44358c3c9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:d52de2a0-7c5a-452e-752b-08dbbf92e774)
---
 NuGet.config            | 16 ++++++++++++++--
 eng/Version.Details.xml | 14 +++++++-------
 eng/Versions.props      |  4 ++--
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ed994c9ec26c..618382a29976 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,19 +11,25 @@
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-57512b4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-57512b4-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-57512b4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-4a824ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-4a824ef-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-4a824ef-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-4a824ef-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-4a824ef-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-5a48ee0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5a48ee08/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-f44358c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f44358c3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-018db42" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-018db42-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-018db42-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-018db42-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-018db42-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
@@ -47,18 +53,24 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-57512b4-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-57512b4-2" value="true" />
     <add key="darc-int-dotnet-aspnetcore-57512b4" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-4a824ef-1" value="true" />
     <add key="darc-int-dotnet-runtime-4a824ef-2" value="true" />
+    <add key="darc-int-dotnet-runtime-4a824ef-3" value="true" />
+    <add key="darc-int-dotnet-runtime-4a824ef-4" value="true" />
     <add key="darc-int-dotnet-runtime-4a824ef" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-5a48ee0" value="true" />
+    <add key="darc-int-dotnet-sdk-f44358c" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-018db42-1" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-018db42-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-018db42-3" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-018db42-4" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-018db42" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 63e35eae321d..871ca708668a 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.309">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
+      <Sha>f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.309-servicing.23479.68">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.309-servicing.23480.36">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
+      <Sha>f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.309-servicing.23479.68">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.309-servicing.23480.36">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
+      <Sha>f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.309-servicing.23479.68">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.309-servicing.23480.36">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
+      <Sha>f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a</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.12-servicing.23478.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 70971a8cd96c..65750b4b43c4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -70,8 +70,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.309</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.309-servicing.23479.68</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.309-servicing.23479.68</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.309-servicing.23480.36</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.309-servicing.23480.36</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>