Merged PR 34675: [internal/release/7.0.3xx] 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.14 to 7.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.13 to 7.0.14 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.13 to 7.0.14 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20231019.79 - **Date Produced**: October 20, 2023 5:31:08 AM UTC - **Commit**: 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.311 to 7.0.311][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.311-servicing.23519.56 to 7.0.311-servicing.23519.79][1] - **Microsoft.NET.Sdk**: [from 7.0.311-servicing.23519.56 to 7.0.311-servicing.23519.79][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.311-servicing.23519.56 to 7.0.311-servicing.23519.79][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.14 to 7.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.14-servicing.23518.19 to 7.0.14-servicing.23519.10][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.14 to 7.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.14 to 7.0.14][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23518.19 to ...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
a071c22f15
3 changed files with 30 additions and 30 deletions
10
NuGet.config
10
NuGet.config
|
|
@ -13,13 +13,13 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-6326dc6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6326dc6f/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-44da825" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-44da825c/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-942bfc8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-942bfc8c/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-2527cb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2527cb5f/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-808851b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-6695db9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6695db9c/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-4f8ecaa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4f8ecaad/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-5775219" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5775219f/nuget/v3/index.json" />
|
||||
|
|
@ -47,9 +47,9 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-6326dc6" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-2527cb5" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-808851b" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-6695db9" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-4f8ecaa" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-5775219" value="true" />
|
||||
|
|
|
|||
|
|
@ -17,30 +17,30 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>5775219ff811a6bb4f4d894bb980b6f4245bfc94</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.14-servicing.23518.19" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.14-servicing.23519.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2527cb5f039d4ec799a3c61b4cab7723eff9be37</Sha>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2527cb5f039d4ec799a3c61b4cab7723eff9be37</Sha>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.14-servicing.23518.19" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.14-servicing.23519.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2527cb5f039d4ec799a3c61b4cab7723eff9be37</Sha>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2527cb5f039d4ec799a3c61b4cab7723eff9be37</Sha>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2527cb5f039d4ec799a3c61b4cab7723eff9be37</Sha>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>2527cb5f039d4ec799a3c61b4cab7723eff9be37</Sha>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</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.311">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93</Sha>
|
||||
<Sha>4f8ecaad5ba4d24317cd9f26689466f192e2eec8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.311-servicing.23519.56">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.311-servicing.23519.79">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93</Sha>
|
||||
<Sha>4f8ecaad5ba4d24317cd9f26689466f192e2eec8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.311-servicing.23519.56">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.311-servicing.23519.79">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93</Sha>
|
||||
<Sha>4f8ecaad5ba4d24317cd9f26689466f192e2eec8</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.311-servicing.23519.56">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.311-servicing.23519.79">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93</Sha>
|
||||
<Sha>4f8ecaad5ba4d24317cd9f26689466f192e2eec8</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.14-servicing.23518.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -167,13 +167,13 @@
|
|||
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
|
||||
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.13" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.14" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha>
|
||||
<Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.13" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.14" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha>
|
||||
<Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1">
|
||||
<Uri>https://github.com/dotnet/deployment-tools</Uri>
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@
|
|||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.311</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.311-servicing.23519.56</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.311-servicing.23519.56</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.311-servicing.23519.79</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.311-servicing.23519.79</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -86,8 +86,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.14-servicing.23518.19</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.14-servicing.23518.19</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.14-servicing.23519.10</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.14-servicing.23519.10</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
|
|
@ -231,8 +231,8 @@
|
|||
<XamarinMacOSWorkloadManifestVersion>12.3.2372</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>16.0.1478</XamarinTvOSWorkloadManifestVersion>
|
||||
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
|
||||
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.13</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
|
||||
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.13</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
|
||||
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.14</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
|
||||
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.14</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</EmscriptenWorkloadManifestVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue