Merged PR 29718: [internal/release/7.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 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230217.5
- **Date Produced**: February 17, 2023 6:41:52 PM UTC
- **Commit**: 378d9d9a2ffa93defb6326895edf0415d1ba0346
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23116.10 to 7.0.104-servicing.23117.5][1]
  - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23116.10 to 7.0.104-servicing.23117.5][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23116.10 to 7.0.104-servicing.23117.5][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.4 to 7.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2]
  - **dotnet-dev-certs**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2]
  - **dotnet-user-jwts**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2]
  - **dotnet-user-secrets**: [from 7.0.4-servicing.23113.13 to 7.0.4-servicing.23116.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC92f3c6d&targetVersion=GC378d9d9&_a=files
[2]: https://dev.azure.com/dnceng/in...
This commit is contained in:
DotNet Bot 2023-02-17 21:23:21 +00:00 committed by Matt Mitchell
parent 8afd714a8f
commit b074888efc
3 changed files with 30 additions and 30 deletions

View file

@ -7,7 +7,7 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-cbb5992" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cbb5992f/nuget/v3/index.json" /> <add key="darc-int-dotnet-aspnetcore-90d5b7e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-90d5b7ef/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" /> <add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" />
@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-dcb489a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dcb489a4/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-dcb489a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dcb489a4/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-92f3c6d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-92f3c6d2/nuget/v3/index.json" /> <add key="darc-int-dotnet-sdk-378d9d9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-378d9d9a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-60e0e83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-60e0e836/nuget/v3/index.json" /> <add key="darc-int-dotnet-windowsdesktop-60e0e83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-60e0e836/nuget/v3/index.json" />
@ -44,12 +44,12 @@
<disabledPackageSources> <disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-cbb5992" value="true" /> <add key="darc-int-dotnet-aspnetcore-90d5b7e" value="true" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-dcb489a" value="true" /> <add key="darc-int-dotnet-runtime-dcb489a" value="true" />
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-92f3c6d" value="true" /> <add key="darc-int-dotnet-sdk-378d9d9" value="true" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-60e0e83" value="true" /> <add key="darc-int-dotnet-windowsdesktop-60e0e83" value="true" />

View file

@ -54,32 +54,32 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.4-servicing.23113.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.4-servicing.23116.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.4-servicing.23113.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.4-servicing.23116.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.4-servicing.23113.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-dev-certs" Version="7.0.4-servicing.23116.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.4-servicing.23113.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-user-jwts" Version="7.0.4-servicing.23116.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.4-servicing.23113.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-user-secrets" Version="7.0.4-servicing.23116.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>cbb5992f76fadb3fcd8d90897f3f644bd162e365</Sha> <Sha>90d5b7ef35b89c5051c45b3326c75000d6842666</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
@ -100,20 +100,20 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.104"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.104">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8</Sha> <Sha>378d9d9a2ffa93defb6326895edf0415d1ba0346</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.104-servicing.23116.10"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.104-servicing.23117.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8</Sha> <Sha>378d9d9a2ffa93defb6326895edf0415d1ba0346</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.104-servicing.23116.10"> <Dependency Name="Microsoft.NET.Sdk" Version="7.0.104-servicing.23117.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8</Sha> <Sha>378d9d9a2ffa93defb6326895edf0415d1ba0346</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.104-servicing.23116.10"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.104-servicing.23117.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>92f3c6d2d4c1a62ea731fb2f2f8366e42802cbb8</Sha> <Sha>378d9d9a2ffa93defb6326895edf0415d1ba0346</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- 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.3-servicing.23072.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.3-servicing.23072.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -52,11 +52,11 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore --> <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.4</MicrosoftAspNetCoreAppRefPackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>7.0.4</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.4-servicing.23113.13</MicrosoftAspNetCoreAppRefInternalPackageVersion> <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.4-servicing.23116.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.4-servicing.23113.13</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion> <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.4-servicing.23116.4</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.4-servicing.23113.13</dotnetdevcertsPackageVersion> <dotnetdevcertsPackageVersion>7.0.4-servicing.23116.4</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.4-servicing.23113.13</dotnetuserjwtsPackageVersion> <dotnetuserjwtsPackageVersion>7.0.4-servicing.23116.4</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.4-servicing.23113.13</dotnetusersecretsPackageVersion> <dotnetusersecretsPackageVersion>7.0.4-servicing.23116.4</dotnetusersecretsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@ -64,8 +64,8 @@
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.104</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.104</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.104-servicing.23116.10</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>7.0.104-servicing.23117.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.104-servicing.23116.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.104-servicing.23117.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>