Merged PR 31554: [internal/release/7.0.3xx] 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.WindowsDesktop.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230525.9 - **Date Produced**: May 25, 2023 4:54:22 PM UTC - **Commit**: 9abb6bd - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][4]...
dotnet · May 25, 2023 · 7e794e2 · 7e794e2
1 parent 8ce8908
commit 7e794e2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 31 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -20,12 +20,10 @@
     <add key="darc-int-dotnet-runtime-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-6cdde44" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6cdde441/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-9abb6bd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-9abb6bda/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-2f39602" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-2f39602-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-2f39602-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-eacd999" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-eacd999c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -52,12 +50,10 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-5b20af4" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-6cdde44" value="true" />
+    <add key="darc-int-dotnet-sdk-9abb6bd" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-2f39602-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-2f39602-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-2f39602" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-eacd999" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,19 +3,19 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
+      <Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.7-servicing.23272.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.7-servicing.23275.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
+      <Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.7-servicing.23272.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.7-servicing.23275.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
+      <Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
+      <Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23274.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -100,29 +100,29 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.304">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
+      <Sha>9abb6bda1703918c0172e5170b66af31867fdeeb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.304-servicing.23275.3">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.304-servicing.23275.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
+      <Sha>9abb6bda1703918c0172e5170b66af31867fdeeb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.304-servicing.23275.3">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.304-servicing.23275.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
+      <Sha>9abb6bda1703918c0172e5170b66af31867fdeeb</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.304-servicing.23275.3">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.304-servicing.23275.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
+      <Sha>9abb6bda1703918c0172e5170b66af31867fdeeb</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.7-servicing.23272.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23274.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha>
+      <Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23272.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23274.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
+      <Sha>512eac4b458953da405f51ec0ae7766bcb7b32e5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23203.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -37,11 +37,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.7-servicing.23272.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.7-servicing.23274.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.7-servicing.23272.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.7-servicing.23274.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -70,8 +70,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.304</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.304-servicing.23275.3</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.304-servicing.23275.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.304-servicing.23275.9</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.304-servicing.23275.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -92,8 +92,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.7-servicing.23272.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
-    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.7-servicing.23272.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
+    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.7-servicing.23275.3</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
+    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.7-servicing.23275.3</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
     <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.7</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>