Merged PR 31548: [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.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk)

[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**: 20230525.3
- **Date Produced**: May 25, 2023 2:43:34 PM UTC
- **Commit**: 6cdde441589050768345f112c683cf297e5fc29b
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1]
  - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.7 to 7.0.7][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2]
  - **dotnet-dev-certs**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2]
  - **dotnet-user-jwts**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2]
  - **dotnet-user-secrets**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC616c6598ad&targetVersion=GC6cdde44158&_a=files
[2]: https://dev.azure.com/dnceng/i...
This commit is contained in:
DotNet Bot 2023-05-25 15:16:12 +00:00 committed by Matt Mitchell
parent e815cb91a8
commit 8ce8908424
3 changed files with 30 additions and 34 deletions

View file

@ -9,9 +9,7 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-9e3df7f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-9e3df7fa/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-9e3df7f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-9e3df7fa-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-9e3df7f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-9e3df7fa-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-3dfc6fd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3dfc6fda/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-b3cf128" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b3cf1285/nuget/v3/index.json" />
@ -22,7 +20,7 @@
<add key="darc-int-dotnet-runtime-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-616c659" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-616c6598/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-6cdde44" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6cdde441/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-2f39602" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029/nuget/v3/index.json" />
@ -49,14 +47,12 @@
<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-9e3df7f-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-9e3df7f-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-9e3df7f" value="true" />
<add key="darc-int-dotnet-aspnetcore-3dfc6fd" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-5b20af4" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-616c659" value="true" />
<add key="darc-int-dotnet-sdk-6cdde44" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-2f39602-1" value="true" />

View file

@ -54,32 +54,32 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.7-servicing.23269.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.7-servicing.23274.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23269.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23274.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.7-servicing.23269.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.7-servicing.23274.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.7-servicing.23269.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.7-servicing.23274.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.7-servicing.23269.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.7-servicing.23274.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9e3df7fae521f32d0c463347d219982d518879db</Sha>
<Sha>3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -100,20 +100,20 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.304">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>616c6598add9d0166644bc20da2c4741b952b3ea</Sha>
<Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.304-servicing.23274.11">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.304-servicing.23275.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>616c6598add9d0166644bc20da2c4741b952b3ea</Sha>
<Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.304-servicing.23274.11">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.304-servicing.23275.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>616c6598add9d0166644bc20da2c4741b952b3ea</Sha>
<Sha>6cdde441589050768345f112c683cf297e5fc29b</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.304-servicing.23274.11">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.304-servicing.23275.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>616c6598add9d0166644bc20da2c4741b952b3ea</Sha>
<Sha>6cdde441589050768345f112c683cf297e5fc29b</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.7-servicing.23272.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -58,11 +58,11 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.7</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.7</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.7-servicing.23269.11</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23269.11</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.7-servicing.23269.11</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.7-servicing.23269.11</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.7-servicing.23269.11</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.7-servicing.23274.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23274.8</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.7-servicing.23274.8</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.7-servicing.23274.8</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.7-servicing.23274.8</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.304</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.304-servicing.23274.11</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.304-servicing.23274.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.304-servicing.23275.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.304-servicing.23275.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>