Merged PR 32711: [internal/release/7.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 7.0.10 to 7.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230717.22 - **Date Produced**: July 17, 2023 8:22:07 PM UTC - **Commit**: 82f22c431bb683309ba75d749d920ae8ffb06c02 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.110 to 7.0.110][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.110-servicing.23367.11 to 7.0.110-servicing.23367.22][1] - **Microsoft.NET.Sdk**: [from 7.0.110-servicing.23367.11 to 7.0.110-servicing.23367.22][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.110-servicing.23367.11 to 7.0.110-servicing.23367.22][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.10 to 7.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.10 to 7.0.10][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.10 to 7.0.10][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.10-servicing.2...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
31bb610fc7
3 changed files with 27 additions and 27 deletions
|
|
@ -19,10 +19,10 @@
|
||||||
<add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
<!-- Begin: Package sources from dotnet-sdk -->
|
<!-- Begin: Package sources from dotnet-sdk -->
|
||||||
<add key="darc-int-dotnet-sdk-5894fb6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5894fb6b/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-sdk-82f22c4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-82f22c43/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-sdk -->
|
<!-- End: Package sources from dotnet-sdk -->
|
||||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||||
<add key="darc-int-dotnet-windowsdesktop-f387463" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f3874631/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-windowsdesktop-996ed6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--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" />
|
<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 -->
|
<!-- Begin: Package sources from dotnet-runtime -->
|
||||||
<add key="darc-int-dotnet-runtime-a6dbb80" value="true" />
|
<add key="darc-int-dotnet-runtime-a6dbb80" value="true" />
|
||||||
<!-- Begin: Package sources from dotnet-sdk -->
|
<!-- Begin: Package sources from dotnet-sdk -->
|
||||||
<add key="darc-int-dotnet-sdk-5894fb6" value="true" />
|
<add key="darc-int-dotnet-sdk-82f22c4" value="true" />
|
||||||
<!-- End: Package sources from dotnet-sdk -->
|
<!-- End: Package sources from dotnet-sdk -->
|
||||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||||
<add key="darc-int-dotnet-windowsdesktop-f387463" value="true" />
|
<add key="darc-int-dotnet-windowsdesktop-996ed6b" value="true" />
|
||||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,19 @@
|
||||||
<ProductDependencies>
|
<ProductDependencies>
|
||||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||||
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
|
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23367.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||||
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
|
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23367.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||||
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
|
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||||
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
|
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
|
|
@ -100,29 +100,29 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.110">
|
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.110">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha>
|
<Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.110-servicing.23367.11">
|
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.110-servicing.23367.22">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha>
|
<Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.110-servicing.23367.11">
|
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.110-servicing.23367.22">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha>
|
<Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha>
|
||||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.110-servicing.23367.11">
|
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.110-servicing.23367.22">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3</Sha>
|
<Sha>82f22c431bb683309ba75d749d920ae8ffb06c02</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
<!-- 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.10-servicing.23363.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||||
<Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha>
|
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||||
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
|
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||||
|
|
|
||||||
|
|
@ -37,11 +37,11 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.10-servicing.23363.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||||
|
|
@ -70,8 +70,8 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.110</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.110</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||||
<MicrosoftNETSdkPackageVersion>7.0.110-servicing.23367.11</MicrosoftNETSdkPackageVersion>
|
<MicrosoftNETSdkPackageVersion>7.0.110-servicing.23367.22</MicrosoftNETSdkPackageVersion>
|
||||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.110-servicing.23367.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.110-servicing.23367.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||||
|
|
@ -92,8 +92,8 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.10-servicing.23364.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.10-servicing.23367.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.10-servicing.23364.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.10-servicing.23367.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.10</MicrosoftWindowsDesktopAppRefPackageVersion>
|
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.10</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue