[release/7.0.3xx] Update dependencies from dotnet/installer (#19770)
This pull request updates the following dependencies ## From https://github.com/dotnet/installer - **Subscription**: bf101622-944d-4df0-c2e9-08db41128f2e - **Build**: 20240110.10 - **Date Produced**: January 10, 2024 6:23:27 PM UTC - **Commit**: f612fda88dca0498425f1b888c36f0f711d493b0 - **Branch**: refs/heads/release/7.0.3xx - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 7.0.312-servicing.23580.5 to 7.0.313-servicing.24060.10][3] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.14 to 7.0.15][4] - **Microsoft.NETCore.App.Ref**: [from 7.0.14 to 7.0.15][5] - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: [from 7.0.14 to 7.0.15][6] [3]:bbbea0c398...f612fda88d
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC0a715692d8e2536c899faa0bb4f0cec2c2e33e36&targetVersion=GCc49ccc8727c620ce1cb8fb431bb3fe8f2e747236&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC808851b07acfa1c5c94b0d4f9fb50debedb2df70&targetVersion=GC8f4568cdaa2f9654fd133a17cd2dcc55b5f42455&_a=files [6]:942bfc8cb7...33b038b591
## 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) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.14 to 7.0.15 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NETCore.App.Ref**: from 7.0.14 to 7.0.15 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.14 to 7.0.15 (parent: Microsoft.NETCore.App.Ref)
This commit is contained in:
Родитель
88bdab74cc
Коммит
6f773a62fe
11
NuGet.config
11
NuGet.config
|
@ -10,10 +10,16 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-33b038b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-33b038b-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-33b038b-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-8f4568c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-8f4568c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-8f4568c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
|
||||
|
@ -61,11 +67,16 @@
|
|||
<add key="darc-pub-dotnet-runtime-dfda651" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-dfda6516/nuget/v3/index.json" />
|
||||
<!-- And a 6.0.26 feed -->
|
||||
<add key="darc-pub-dotnet-runtime-ff5a15a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ff5a15a9/nuget/v3/index.json" />
|
||||
<!-- And a 6.0.27 feed -->
|
||||
<add key="darc-pub-dotnet-runtime-709c22e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-709c22e2/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-8f4568c-1" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-8f4568c-2" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-8f4568c" value="true" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.312-servicing.23580.5">
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.313-servicing.24060.10">
|
||||
<Uri>https://github.com/dotnet/installer</Uri>
|
||||
<Sha>bbbea0c39892109cbb282dc751244cc996aa827c</Sha>
|
||||
<Sha>f612fda88dca0498425f1b888c36f0f711d493b0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23401.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
|
||||
</Dependency>
|
||||
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
|
||||
<Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
|
||||
</Dependency>
|
||||
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
|
||||
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.14" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.15" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha>
|
||||
<Sha>33b038b591f6e19c32a390333d41292cbd86d93c</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<!-- Versions updated by maestro -->
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>7.0.312-servicing.23580.5</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>7.0.313-servicing.24060.10</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.23401.1</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.14</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.15</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.15</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
|
||||
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23113.1</MicrosoftDotNetCecilPackageVersion>
|
||||
<!-- Manually updated versions -->
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "7.0.312-servicing.23580.5"
|
||||
"version": "7.0.313-servicing.24060.10"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче