Merged PR 33333: [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.NETCore.App.Ref**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.11-servicing.23415.17 to 7.0.11-servicing.23418.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23415.17 to 7.0.11-servicing.23418.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23415.17 to 7.0.11-servicing.23418.12 (parent: Microsoft.NET.Sdk) [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**: 20230822.9 - **Date Produced**: August 22, 2023 5:40:17 PM UTC - **Commit**: 2fad12db2d9c657ef65e907a86bd5238abb95c56 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.111 to 7.0.111][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.111-servicing.23416.54 to 7.0.111-servicing.23422.9][1] - **Microsoft.NET.Sdk**: [from 7.0.111-servicing.23416.54 to 7.0.111-servicing.23422.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.111-servicing.23416.54 to 7.0.111-servicing.23422.9][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.11 to 7.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.11-servicing.23415.17 to 7.0.11-servicing.23418.12][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.11 to 7.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.11 to 7.0.11][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23415.17 to 7.0.11-servicing.23418.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23415.17 to 7.0.11-servicing.23418.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC142937b396&targetVersion=GC2fad12db2d&_a=files [2]: https:/...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
3b08edebdb
3 changed files with 23 additions and 23 deletions
|
|
@ -16,10 +16,10 @@
|
|||
<add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-de78412" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-de784122/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-41b7214" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-41b7214a/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-142937b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-142937b3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-2fad12d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2fad12db/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9f28c6a/nuget/v3/index.json" />
|
||||
|
|
@ -47,9 +47,9 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-29b2328" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-de78412" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-41b7214" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-142937b" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-2fad12d" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-c9f28c6" value="true" />
|
||||
|
|
|
|||
|
|
@ -17,30 +17,30 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>c9f28c6a29182e54d1c292d1cff9778315cee51c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23415.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha>
|
||||
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha>
|
||||
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23415.17" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha>
|
||||
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha>
|
||||
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha>
|
||||
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>de7841221e4ad56750e452db8ac4eab459b2ab23</Sha>
|
||||
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -100,20 +100,20 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha>
|
||||
<Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23416.54">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23422.9">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha>
|
||||
<Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23416.54">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23422.9">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha>
|
||||
<Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23416.54">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23422.9">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>142937b396f99e3331d8b9fa3c529e6169a7405f</Sha>
|
||||
<Sha>2fad12db2d9c657ef65e907a86bd5238abb95c56</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="7.0.11-servicing.23416.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@
|
|||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.111-servicing.23416.54</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23416.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.111-servicing.23422.9</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23422.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -82,8 +82,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23415.17</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23415.17</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.11</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.11</MicrosoftNETCoreAppRefPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue