Merged PR 29807: [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.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) [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**: 20230226.1 - **Date Produced**: February 26, 2023 10:01:39 PM UTC - **Commit**: bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.115-servicing.23120.14 to 6.0.115-servicing.23126.1][1] - **Microsoft.NET.Sdk**: [from 6.0.115-servicing.23120.14 to 6.0.115-servicing.23126.1][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfc573c3&targetVersion=GCbb0cd5e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
DotNet Bot
Matt Mitchell
parent
615151e6f2
commit
1d8c2d93c0
3 changed files with 32 additions and 22 deletions
14
NuGet.config
14
NuGet.config
|
|
@ -7,10 +7,12 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-b51b398" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b51b3987/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-6a6d775" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6a6d775f/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-0c39542" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-0c39542-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-0c39542-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
|
|
@ -19,9 +21,13 @@
|
|||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-7ffbda8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7ffbda84/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-7ffbda8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7ffbda84-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-7ffbda8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7ffbda84-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-1/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" />
|
||||
|
|
@ -42,16 +48,20 @@
|
|||
<disabledPackageSources>
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-b51b398" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-6a6d775" value="true" />
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-5edef4b" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-7ffbda8-1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-7ffbda8-2" value="true" />
|
||||
<add key="darc-int-dotnet-templating-7ffbda8" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
|
|
|
|||
|
|
@ -54,28 +54,28 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b51b398707b287a3d765ce0338f4b3a213ce2ced</Sha>
|
||||
<Sha>6a6d775f49623bbd742c02f89d373630668547bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.15-servicing.23120.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.15-servicing.23124.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b51b398707b287a3d765ce0338f4b3a213ce2ced</Sha>
|
||||
<Sha>6a6d775f49623bbd742c02f89d373630668547bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b51b398707b287a3d765ce0338f4b3a213ce2ced</Sha>
|
||||
<Sha>6a6d775f49623bbd742c02f89d373630668547bb</Sha>
|
||||
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.15-servicing.23120.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.15-servicing.23124.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b51b398707b287a3d765ce0338f4b3a213ce2ced</Sha>
|
||||
<Sha>6a6d775f49623bbd742c02f89d373630668547bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="6.0.15-servicing.23120.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="6.0.15-servicing.23124.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b51b398707b287a3d765ce0338f4b3a213ce2ced</Sha>
|
||||
<Sha>6a6d775f49623bbd742c02f89d373630668547bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="6.0.15-servicing.23120.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="6.0.15-servicing.23124.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b51b398707b287a3d765ce0338f4b3a213ce2ced</Sha>
|
||||
<Sha>6a6d775f49623bbd742c02f89d373630668547bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -103,14 +103,14 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>7ffbda84d04cce61619440af4dc884437eb1998a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.115-servicing.23120.14">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.115-servicing.23126.1">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>fc573c39acc28d9287e7aa638bd837922777e1b0</Sha>
|
||||
<Sha>bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.115-servicing.23120.14">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.115-servicing.23126.1">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>fc573c39acc28d9287e7aa638bd837922777e1b0</Sha>
|
||||
<Sha>bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8</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.15-servicing.23117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -46,18 +46,18 @@
|
|||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.15</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.15</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.15-servicing.23120.7</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.15-servicing.23120.7</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>6.0.15-servicing.23120.7</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>6.0.15-servicing.23120.7</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.15-servicing.23124.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.15-servicing.23124.4</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>6.0.15-servicing.23124.4</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>6.0.15-servicing.23124.4</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.115-servicing.23120.14</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.115-servicing.23120.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.115-servicing.23126.1</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.115-servicing.23126.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue