Merged PR 39691: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20240517.45 - **Date Produced**: May 17, 2024 9:40:32 PM UTC - **Commit**: dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.106 to 8.0.107][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.106-servicing.24267.25 to 8.0.107-servicing.24267.45][2] - **Microsoft.NET.Sdk**: [from 8.0.106-servicing.24267.25 to 8.0.107-servicing.24267.45][2] - **Microsoft.TemplateEngine.Cli**: [from 8.0.106-servicing.24267.25 to 8.0.107-servicing.24267.45][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.5 to 8.0.6][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24266.4][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24266.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.5 to 8.0.6][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.5-servicing.24217.4 to 8.0.6-servicing.24266.2][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.5 to 8.0.6][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.5-servicing.24217.2 to 8.0.6-servicing.24266.5][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf&targetVersion=GCdc2cd02b8507bae3a94b784a8c852b9f1fa40bb0&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCdda23bbe00c4a4bfdd3732783f0cce37c11a4f40&targetVersion=GC745e5ba78bab21f191089ad0702d28b1f5c6550b&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6c37c986b6c8fc0669b38a03a03445a75b8227a6&targetVersion=GC4e8a67279888e260abf0cf5b027cc16ea7069799&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&targetVersion=GCc7a8451f8a664f44336c013032414c4a9ca4dc42&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) [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 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redi...
This commit is contained in:
DotNet Bot
Sean Reeser
parent
ffcedd2df7
commit
69ac1bf6d0
3 changed files with 33 additions and 49 deletions
24
NuGet.config
24
NuGet.config
|
|
@ -19,18 +19,10 @@
|
|||
<add key="darc-int-dotnet-runtime-fa5b0d8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fa5b0d8f/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-7d5e467" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-7d5e4675/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-dc2cd02" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-dc2cd02b/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-8/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-7/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-6/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-745e5ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-745e5ba7/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,18 +47,10 @@
|
|||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-fa5b0d8" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-7d5e467" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-dc2cd02" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-4" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-5" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-6" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-7" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb-8" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-dda23bb" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-745e5ba" 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.-->
|
||||
|
|
|
|||
|
|
@ -5,21 +5,21 @@
|
|||
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
|
||||
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
|
||||
-->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>dda23bbe00c4a4bfdd3732783f0cce37c11a4f40</Sha>
|
||||
<Sha>745e5ba78bab21f191089ad0702d28b1f5c6550b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.5-servicing.24217.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.6-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>dda23bbe00c4a4bfdd3732783f0cce37c11a4f40</Sha>
|
||||
<Sha>745e5ba78bab21f191089ad0702d28b1f5c6550b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.5-servicing.24217.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.6-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>dda23bbe00c4a4bfdd3732783f0cce37c11a4f40</Sha>
|
||||
<Sha>745e5ba78bab21f191089ad0702d28b1f5c6550b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>dda23bbe00c4a4bfdd3732783f0cce37c11a4f40</Sha>
|
||||
<Sha>745e5ba78bab21f191089ad0702d28b1f5c6550b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.6-servicing.24253.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
|
|
@ -85,22 +85,22 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>84f78e6c7d539fab38b30d7c0bf73769219b98f2</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.106">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.107">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf</Sha>
|
||||
<Sha>dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.106-servicing.24267.25">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.107-servicing.24267.45">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf</Sha>
|
||||
<Sha>dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.106-servicing.24267.25">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.107-servicing.24267.45">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf</Sha>
|
||||
<Sha>dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.106-servicing.24267.25">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.107-servicing.24267.45">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>7d5e4675c3a6c6fcf730c6296d1eb36ef64707bf</Sha>
|
||||
<Sha>dc2cd02b8507bae3a94b784a8c852b9f1fa40bb0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -124,13 +124,13 @@
|
|||
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</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="8.0.5-servicing.24217.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.6-servicing.24266.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>6c37c986b6c8fc0669b38a03a03445a75b8227a6</Sha>
|
||||
<Sha>4e8a67279888e260abf0cf5b027cc16ea7069799</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.5-servicing.24217.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.6-servicing.24266.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>b5af29a8f41f880f38fd015c6bcb7aeb816fcef6</Sha>
|
||||
<Sha>c7a8451f8a664f44336c013032414c4a9ca4dc42</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.5-servicing.24217.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.6-servicing.24266.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.5-servicing.24217.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.6-servicing.24266.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Supported versions -->
|
||||
|
|
@ -78,9 +78,9 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.106</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.106-servicing.24267.25</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.106-servicing.24267.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.107</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.107-servicing.24267.45</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.107-servicing.24267.45</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -105,10 +105,10 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.5-servicing.24217.5</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.5-servicing.24217.5</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.5</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.6-servicing.24266.4</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.6-servicing.24266.4</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.6</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
Loading…
Reference in a new issue