Merged PR 34076: [internal/release/frameshift/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**:
- **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:c1ce247f-982c-4c66-45be-08dbbf92e44a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: c1ce247f-982c-4c66-45be-08dbbf92e44a
- **Build**: 20230929.29
- **Date Produced**: September 30, 2023 1:32:48 AM UTC
- **Commit**: 81bd2a95ea21deb9f26a689b6ee58156283b868d
- **Branch**: refs/heads/internal/release/frameshift/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.123-servicing.23478.12 to 6.0.123-servicing.23479.29][1]
- **Microsoft.NET.Sdk**: [from 6.0.123-servicing.23478.12 to 6.0.123-servicing.23479.29][1]
- **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0966287647&targetVersion=GC81bd2a95ea&_a=files
[2]: 301ba1ee5d...301ba1ee5d
[DependencyUpdate]: <> (End)
[marker]: <> (End:c1ce247f-982c-4c66-45be-08dbbf92e44a)
This commit is contained in:
DotNet Bot
Sean Reeser
commit
8ca4bae05a
3 changed files with 24 additions and 12 deletions
16
NuGet.config
16
NuGet.config
|
|
@ -8,19 +8,25 @@
|
|||
<!--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-1d49c49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d49c492/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-1d49c49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d49c492-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-1d49c49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d49c492-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-301ba1e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-301ba1ee/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-301ba1e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-301ba1ee-3/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-bff71fd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-bff71fd1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-bff71fd-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-bff71fd1-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-bff71fd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-bff71fd1-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-ac9d0f6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ac9d0f62/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-ac9d0f6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ac9d0f62-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-ac9d0f6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ac9d0f62-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" />
|
||||
|
|
@ -41,16 +47,22 @@
|
|||
<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-1d49c49-1" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-1d49c49-2" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-1d49c49" 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-301ba1e" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-301ba1e-3" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-bff71fd-1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-bff71fd-2" value="true" />
|
||||
<add key="darc-int-dotnet-templating-bff71fd" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-ac9d0f6-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-ac9d0f6-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-ac9d0f6" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>ac9d0f6242b48fca7e36d519cde33210a798adec</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.23-servicing.23475.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.23-servicing.23479.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
|
||||
</Dependency>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.23-servicing.23475.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.23-servicing.23479.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
|
||||
</Dependency>
|
||||
|
|
@ -103,14 +103,14 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>bff71fd17286a916e2b3c416e5d91717ff906b25</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.123-servicing.23478.12">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.123-servicing.23479.29">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>09662876479587805f5892daaa54569e6323deb3</Sha>
|
||||
<Sha>81bd2a95ea21deb9f26a689b6ee58156283b868d</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.123-servicing.23478.12">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.123-servicing.23479.29">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>09662876479587805f5892daaa54569e6323deb3</Sha>
|
||||
<Sha>81bd2a95ea21deb9f26a689b6ee58156283b868d</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.23-servicing.23477.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.123-servicing.23478.12</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.123-servicing.23478.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.123-servicing.23479.29</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.123-servicing.23479.29</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -68,8 +68,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.23-servicing.23475.15</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.23-servicing.23475.15</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.23-servicing.23479.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.23-servicing.23479.5</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.23</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.23</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.23</MicrosoftNETCoreAppRefPackageVersion>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue