Merged PR 27866: [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.WindowsDesktop.App.Ref**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.1-servicing.22566.4 to 7.0.1-servicing.22568.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.1 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.1-servicing.22567.2 to 7.0.1-servicing.22569.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [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**: 20221129.2 - **Date Produced**: November 29, 2022 12:43:23 PM UTC - **Commit**: d297319 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22578.10 to 7.0.101-servicing.22579.2][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.1 to 7.0.1][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.1-servicing.22566.4 to 7.0.1-servicing.22568.11][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.1-servicing.22567.2 to 7.0.1-servicing....
dotnet · Nov 29, 2022 · bb24aaf · bb24aaf
1 parent 2029e50
commit bb24aaf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -20,10 +20,10 @@
     <add key="darc-int-dotnet-runtime-97203d3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97203d38/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-9190935" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-91909352/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-d297319" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d2973199/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-0d6ee94" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0d6ee94e/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-379885d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-379885d3/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" />
@@ -51,10 +51,10 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-97203d3" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-9190935" value="true" />
+    <add key="darc-int-dotnet-sdk-d297319" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-0d6ee94" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-379885d" 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.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
+      <Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.1-servicing.22578.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.1-servicing.22579.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
+      <Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.1-servicing.22578.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.1-servicing.22579.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
+      <Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
+      <Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.1-servicing.22568.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.101">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
+      <Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.101-servicing.22578.10">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.101-servicing.22579.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
+      <Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.101-servicing.22578.10">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.101-servicing.22579.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
+      <Sha>d29731999ae10550d0ee7100865cabe404af8195</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.101-servicing.22578.10">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.101-servicing.22579.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>91909352e17083f43ab3e6bf458bc172f111e273</Sha>
+      <Sha>d29731999ae10550d0ee7100865cabe404af8195</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.1-servicing.22566.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.1-servicing.22568.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>b32a0afc982d443052bd9c6bd4ebe6177575681c</Sha>
+      <Sha>c09becd38536311776313f64bdc8f051c59de7a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.1-servicing.22567.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.1-servicing.22569.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>a6985a3e91f88860fd72ccc712c143b0a1dbd852</Sha>
+      <Sha>b824ea7e65424cd8b0121cc7d2dea88a4a2cb4aa</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22567.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -31,11 +31,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.1-servicing.22566.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.1-servicing.22568.11</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.1-servicing.22567.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.1-servicing.22569.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -64,8 +64,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.101</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.101-servicing.22578.10</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.101-servicing.22578.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.101-servicing.22579.2</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.101-servicing.22579.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -86,8 +86,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.1-servicing.22578.5</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
-    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.1-servicing.22578.5</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
+    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.1-servicing.22579.1</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
+    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.1-servicing.22579.1</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
     <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.1</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>