Merged PR 29178: [internal/release/6.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 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230124.26 - **Date Produced**: January 24, 2023 7:38:33 PM UTC - **Commit**: 9f111ce1a19301c2258920ba362206837c5ef8b0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23074.15 to 6.0.114-servicing.23074.26][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23074.15 to 6.0.114-servicing.23074.26][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC70e268d&targetVersion=GC9f111ce&_a=files [2]: https://dev...
This commit is contained in:
DotNet Bot
Matt Mitchell
parent
5d7b9b0cf1
commit
346c0065dd
3 changed files with 22 additions and 22 deletions
|
|
@ -21,7 +21,7 @@
|
|||
<add key="darc-int-dotnet-templating-629fc1a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-629fc1a8/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-1312fab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1312fabe/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-c9ab6d8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9ab6d88/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,7 +52,7 @@
|
|||
<add key="darc-int-dotnet-templating-629fc1a" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-1312fab" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-c9ab6d8" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>1312fabe6644dfaf40da8052d8960291e688dd86</Sha>
|
||||
<Sha>c9ab6d88179966c84260fc580b27cdb719a7e918</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.14-servicing.23072.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>1312fabe6644dfaf40da8052d8960291e688dd86</Sha>
|
||||
<Sha>c9ab6d88179966c84260fc580b27cdb719a7e918</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.14-servicing.23072.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>1312fabe6644dfaf40da8052d8960291e688dd86</Sha>
|
||||
<Sha>c9ab6d88179966c84260fc580b27cdb719a7e918</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>1312fabe6644dfaf40da8052d8960291e688dd86</Sha>
|
||||
<Sha>c9ab6d88179966c84260fc580b27cdb719a7e918</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23073.9" 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>629fc1a8b3d53b551ea512c4f0294062dcd30afe</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.114-servicing.23074.15">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.114-servicing.23074.26">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>70e268dcc55cdc08f9b2f46db120e1780b062f26</Sha>
|
||||
<Sha>9f111ce1a19301c2258920ba362206837c5ef8b0</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.114-servicing.23074.15">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.114-servicing.23074.26">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>70e268dcc55cdc08f9b2f46db120e1780b062f26</Sha>
|
||||
<Sha>9f111ce1a19301c2258920ba362206837c5ef8b0</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.14-servicing.23070.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.14-servicing.23074.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>18f3f47e1880fa6cea7648845ea73c74cf7a9857</Sha>
|
||||
<Sha>4bc32ea9adb33cefd6131fcd533e35e3e7e83441</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.14-servicing.23070.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>d40327ad15e6653d027e003749a3bf16fd603101</Sha>
|
||||
<Sha>9e190e3d952203836d77bb0f1c42984524e1122d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" 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.14-servicing.23070.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.14-servicing.23074.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.14-servicing.23070.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.14-servicing.23074.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.114-servicing.23074.15</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.114-servicing.23074.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.114-servicing.23074.26</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.114-servicing.23074.26</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -78,8 +78,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.14-servicing.23072.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.14-servicing.23072.1</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.14-servicing.23074.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.14-servicing.23074.3</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.14</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.14</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue