Merged PR 33411: [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.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (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**: 20230825.34
- **Date Produced**: August 25, 2023 6:34:43 PM UTC
- **Commit**: f469d782833a83a3c210f3ed1807f2c05a2ba6d4
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.308 to 7.0.308][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.308-servicing.23425.20 to 7.0.308-servicing.23425.34][1]
  - **Microsoft.NET.Sdk**: [from 7.0.308-servicing.23425.20 to 7.0.308-servicing.23425.34][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.308-servicing.23425.20 to 7.0.308-servicing.23425.34][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-dev-certs**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-user-jwts**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-user-secrets**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC95fefa4d1d&targetVersion=GCf469d78283&_a=files
[2]: https...
This commit is contained in:
DotNet Bot 2023-08-25 19:08:32 +00:00 committed by Sean Reeser
commit 04c1377a0d
3 changed files with 30 additions and 30 deletions

View file

@ -10,7 +10,7 @@
<add key="darc-pub-DotNet-msbuild-Trusted-2679cf5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2679cf5a/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-cf068f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cf068f24/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-70048be" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-70048bee/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-79b01e4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-79b01e47/nuget/v3/index.json" />
@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-95fefa4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-95fefa4d/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-f469d78" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f469d782/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" />
@ -44,12 +44,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-cf068f2" value="true" />
<add key="darc-int-dotnet-aspnetcore-70048be" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-ecb34f8" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-95fefa4" value="true" />
<add key="darc-int-dotnet-sdk-f469d78" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-721967a" value="true" />

View file

@ -54,32 +54,32 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23422.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cf068f24c37b6166910886b26bde7bd32bf71259</Sha>
<Sha>70048beee894074e9718206a0017d9b080ee66ff</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.308">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a</Sha>
<Sha>f469d782833a83a3c210f3ed1807f2c05a2ba6d4</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.308-servicing.23425.20">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.308-servicing.23425.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a</Sha>
<Sha>f469d782833a83a3c210f3ed1807f2c05a2ba6d4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.308-servicing.23425.20">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.308-servicing.23425.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a</Sha>
<Sha>f469d782833a83a3c210f3ed1807f2c05a2ba6d4</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.308-servicing.23425.20">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.308-servicing.23425.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a</Sha>
<Sha>f469d782833a83a3c210f3ed1807f2c05a2ba6d4</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.11-servicing.23422.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -58,11 +58,11 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.11</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23422.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23422.8</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.11-servicing.23422.8</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.11-servicing.23422.8</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.11-servicing.23422.8</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.11-servicing.23425.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23425.2</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.11-servicing.23425.2</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.11-servicing.23425.2</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.11-servicing.23425.2</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.308</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.308-servicing.23425.20</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.308-servicing.23425.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.308-servicing.23425.34</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.308-servicing.23425.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>