Merged PR 39690: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240517.46 - **Date Produced**: May 17, 2024 9:49:12 PM UTC - **Commit**: 8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.423-servicing.24266.28 to 6.0.424-servicing.24267.46][2] - **Microsoft.NET.Sdk**: [from 6.0.423-servicing.24266.28 to 6.0.424-servicing.24267.46][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.30 to 6.0.31][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.30-servicing.24217.3 to 6.0.31-servicing.24266.6][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.30-servicing.24217.3 to 6.0.31-servicing.24266.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.30 to 6.0.31][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.30-servicing.24216.19 to 6.0.31-servicing.24266.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.30 to 6.0.31][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.30-servicing.24216.7 to 6.0.31-servicing.24266.4][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC806c8e273d42fa22ddf92440590d87bb16818ff7&targetVersion=GC8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCd0dfc3119d2aa9f601fcbdc56717b2f49781898e&targetVersion=GC31992eb5a715d2eaee71ccd7a8139a05d1c05311&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC431a1dcb7d4eafa215951499ad374ffde8622e61&targetVersion=GCcc6b27b00d494617f99060eb9e4ab4b362d06806&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCdee47a1e2958aa9b97d3c5edf9433312cc5a4634&targetVersion=GC9dd26a5992cddbe87e605d40ff71fe8137b6f7f5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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 6.0.30 to 6.0.31 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.30-servicing.24217.3 to 6.0.31-servicing.24266.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.Wind...
This commit is contained in:
DotNet Bot
Sean Reeser
parent
246e0ea446
commit
1bde71448b
3 changed files with 26 additions and 34 deletions
12
NuGet.config
12
NuGet.config
|
|
@ -21,11 +21,7 @@
|
|||
<add key="darc-int-dotnet-templating-899e481" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-899e481c/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-31992eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-31992eb5/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" />
|
||||
|
|
@ -55,11 +51,7 @@
|
|||
<add key="darc-int-dotnet-templating-899e481" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-4" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-31992eb" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.30" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
|
||||
<Sha>31992eb5a715d2eaee71ccd7a8139a05d1c05311</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.30-servicing.24217.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.31-servicing.24266.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
|
||||
<Sha>31992eb5a715d2eaee71ccd7a8139a05d1c05311</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.30-servicing.24217.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.31-servicing.24266.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
|
||||
<Sha>31992eb5a715d2eaee71ccd7a8139a05d1c05311</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.30" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
|
||||
<Sha>31992eb5a715d2eaee71ccd7a8139a05d1c05311</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24251.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
|
|
@ -103,23 +103,23 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>899e481c21a53dd5898ece5c211955f46740521e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.423-servicing.24266.28">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24267.46">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>806c8e273d42fa22ddf92440590d87bb16818ff7</Sha>
|
||||
<Sha>8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.423-servicing.24266.28">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24267.46">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>806c8e273d42fa22ddf92440590d87bb16818ff7</Sha>
|
||||
<Sha>8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f</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="6.0.30-servicing.24216.19" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.31-servicing.24266.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>431a1dcb7d4eafa215951499ad374ffde8622e61</Sha>
|
||||
<Sha>cc6b27b00d494617f99060eb9e4ab4b362d06806</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.30-servicing.24216.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>dee47a1e2958aa9b97d3c5edf9433312cc5a4634</Sha>
|
||||
<Sha>9dd26a5992cddbe87e605d40ff71fe8137b6f7f5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22513.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.30-servicing.24216.19</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.31-servicing.24266.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.30-servicing.24216.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.31-servicing.24266.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.423-servicing.24266.28</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.423-servicing.24266.28</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24267.46</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24267.46</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.30-servicing.24217.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.30-servicing.24217.3</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.30</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.30</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.31-servicing.24266.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.31-servicing.24266.6</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.31</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.31</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
Loading…
Reference in a new issue