Merged PR 34704: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b - **Build**: 20231020.40 - **Date Produced**: October 20, 2023 9:30:55 PM UTC - **Commit**: 2cc2563e415051d6454568a35ad9d40308e22b50 - **Branch**: refs/heads/internal/release/7.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.404 to 7.0.404][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.404-servicing.23520.14 to 7.0.404-servicing.23520.40][2] - **Microsoft.NET.Sdk**: [from 7.0.404-servicing.23520.14 to 7.0.404-servicing.23520.40][2] - **Microsoft.TemplateEngine.Cli**: [from 7.0.404-servicing.23520.14 to 7.0.404-servicing.23520.40][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.14 to 7.0.14][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.14-servicing.23519.5 to 7.0.14-servicing.23519.17][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.14-servicing.23519.12 to 7.0.14-servicing.23519.17][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc5935a169a&targetVersion=GC2cc2563e41&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC4d41e1b09c&targetVersion=GCcb8b6323cf&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC89f5db690a&targetVersion=GC3cf1ad1e72&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCe025c534b8&targetVersion=GC00ce9eab67&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b) [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.14 to 7.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.14-servicing.23519.19 to 7.0.14-servicing.23520.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.14-serv...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
e54922a0ef
3 changed files with 27 additions and 27 deletions
|
|
@ -19,10 +19,10 @@
|
|||
<add key="darc-int-dotnet-runtime-808851b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-c5935a1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-c5935a16/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-2cc2563" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2cc2563e/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-4d41e1b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-4d41e1b0/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-cb8b632-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cb8b6323-1/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" />
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-808851b" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-c5935a1" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-2cc2563" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-4d41e1b" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-cb8b632-1" 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.-->
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>4d41e1b09cb8aa1d03d23d98438c5e8761c8060b</Sha>
|
||||
<Sha>cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.14-servicing.23519.19" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.14-servicing.23520.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>4d41e1b09cb8aa1d03d23d98438c5e8761c8060b</Sha>
|
||||
<Sha>cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.14-servicing.23519.19" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.14-servicing.23520.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>4d41e1b09cb8aa1d03d23d98438c5e8761c8060b</Sha>
|
||||
<Sha>cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>4d41e1b09cb8aa1d03d23d98438c5e8761c8060b</Sha>
|
||||
<Sha>cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.14-servicing.23519.10" 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.404">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>c5935a169a9a1461a515865b865c271f506bf798</Sha>
|
||||
<Sha>2cc2563e415051d6454568a35ad9d40308e22b50</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.404-servicing.23520.14">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.404-servicing.23520.40">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>c5935a169a9a1461a515865b865c271f506bf798</Sha>
|
||||
<Sha>2cc2563e415051d6454568a35ad9d40308e22b50</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.404-servicing.23520.14">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.404-servicing.23520.40">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>c5935a169a9a1461a515865b865c271f506bf798</Sha>
|
||||
<Sha>2cc2563e415051d6454568a35ad9d40308e22b50</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.404-servicing.23520.14">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.404-servicing.23520.40">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>c5935a169a9a1461a515865b865c271f506bf798</Sha>
|
||||
<Sha>2cc2563e415051d6454568a35ad9d40308e22b50</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.14-servicing.23519.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.14-servicing.23519.17" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>89f5db690a92e446dbb6eb1906d52788df1fe9a1</Sha>
|
||||
<Sha>3cf1ad1e72ee7a06055165309a5b38081e91d9a1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.14-servicing.23519.12" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.14-servicing.23519.17" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>e025c534b87f516425890f1401d052141898a574</Sha>
|
||||
<Sha>00ce9eab67537c1e291e8a7699323b86263803ec</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.7.0-beta.23472.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.14-servicing.23519.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.14-servicing.23519.17</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.14-servicing.23519.12</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.14-servicing.23519.17</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.404</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.404-servicing.23520.14</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.404-servicing.23520.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.404-servicing.23520.40</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.404-servicing.23520.40</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -96,8 +96,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.14-servicing.23519.19</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.14-servicing.23519.19</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.14-servicing.23520.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.14-servicing.23520.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.14</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.14</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue