Merged PR 31406: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6 (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**: 20230519.18 - **Date Produced**: May 19, 2023 8:33:19 PM UTC - **Commit**: 2377cfd304a7a1611445f9c322162c3a23c2ef4a - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23269.10 to 6.0.118-servicing.23269.18][1] - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23269.10 to 6.0.118-servicing.23269.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23269.7][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.6][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC27be6925f7&targetVersion=GC2377cfd304&_a=files [2]: https://d...
This commit is contained in:
DotNet Bot
Matt Mitchell
parent
5efa4daa65
commit
e5df0d9a01
3 changed files with 22 additions and 22 deletions
|
|
@ -21,7 +21,7 @@
|
|||
<add key="darc-int-dotnet-templating-9d4fcb0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9d4fcb0f/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-e79c355" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e79c355e/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-6cc1fd9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6cc1fd96/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-9d4fcb0" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-e79c355" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-6cc1fd9" 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.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>e79c355ec611c39c236842d55b62dfbfc1a228d5</Sha>
|
||||
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.18-servicing.23268.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>e79c355ec611c39c236842d55b62dfbfc1a228d5</Sha>
|
||||
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.18-servicing.23268.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>e79c355ec611c39c236842d55b62dfbfc1a228d5</Sha>
|
||||
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>e79c355ec611c39c236842d55b62dfbfc1a228d5</Sha>
|
||||
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23268.10" 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>9d4fcb0fa4867411dce1339944c2ec0815034a70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.118-servicing.23269.10">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.118-servicing.23269.18">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>27be6925f7669ffedd0dabe11bddec20cfb3d6fc</Sha>
|
||||
<Sha>2377cfd304a7a1611445f9c322162c3a23c2ef4a</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.118-servicing.23269.10">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.118-servicing.23269.18">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>27be6925f7669ffedd0dabe11bddec20cfb3d6fc</Sha>
|
||||
<Sha>2377cfd304a7a1611445f9c322162c3a23c2ef4a</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.18-servicing.23268.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.18-servicing.23268.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>bac4e66c4abaf7e2a20990556b315f015cd518ca</Sha>
|
||||
<Sha>9e5f193ed61f002d5d870df9c8b0b5e880fa595c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.18-servicing.23268.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.18-servicing.23269.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>f82a2b2d304233b5e27a18fbc2ff65ede97e37eb</Sha>
|
||||
<Sha>7cd35b1648ac297ea6404c1f7645aaae8a216938</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.18-servicing.23268.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.18-servicing.23268.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.18-servicing.23268.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.18-servicing.23269.6</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.118-servicing.23269.10</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.118-servicing.23269.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.118-servicing.23269.18</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.118-servicing.23269.18</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.18-servicing.23268.4</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.18-servicing.23268.4</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.18</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.18</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue