Merged PR 34114: [internal/release/frameshift/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.12 to 7.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774 - **Build**: 20230929.68 - **Date Produced**: September 30, 2023 5:41:36 AM UTC - **Commit**: 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - **Branch**: refs/heads/internal/release/frameshift/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1] - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.12 to 7.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.12 to 7.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2] - **dotnet-dev-certs**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2] - **dotnet-user-jwts**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2] - **dotnet-user-secrets**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2cabc04368&targetVersion=GC...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
bbe858fa8c
3 changed files with 38 additions and 30 deletions
16
NuGet.config
16
NuGet.config
|
|
@ -10,18 +10,22 @@
|
|||
<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-b6dd95f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b6dd95ff/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49/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-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-4a824ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-4a824ef-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-4a824ef-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-2cabc04" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2cabc043/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-5a48ee0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5a48ee08/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-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" />
|
||||
|
|
@ -43,14 +47,18 @@
|
|||
<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-b6dd95f" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-4a824ef-1" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-4a824ef-2" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-4a824ef" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-2cabc04" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-5a48ee0" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
|
|
|
|||
|
|
@ -54,32 +54,32 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.12-servicing.23478.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.12-servicing.23479.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.12-servicing.23478.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.12-servicing.23479.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.12-servicing.23478.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.12-servicing.23479.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="7.0.12-servicing.23478.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="7.0.12-servicing.23479.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.12-servicing.23478.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.12-servicing.23479.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03</Sha>
|
||||
<Sha>57512b49997283599b00a6b67d0ccebaec171daf</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.309">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>2cabc043689054a1f0ddf5895d32572190515ae8</Sha>
|
||||
<Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.309-servicing.23479.6">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.309-servicing.23479.68">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>2cabc043689054a1f0ddf5895d32572190515ae8</Sha>
|
||||
<Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.309-servicing.23479.6">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.309-servicing.23479.68">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>2cabc043689054a1f0ddf5895d32572190515ae8</Sha>
|
||||
<Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.309-servicing.23479.6">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.309-servicing.23479.68">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>2cabc043689054a1f0ddf5895d32572190515ae8</Sha>
|
||||
<Sha>5a48ee082690a5e3b6a0b51632071f89c2f8d725</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.12-servicing.23478.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@
|
|||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.12</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.12</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.12-servicing.23478.22</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.12-servicing.23478.22</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.12-servicing.23478.22</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>7.0.12-servicing.23478.22</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.12-servicing.23478.22</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.12-servicing.23479.22</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.12-servicing.23479.22</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.12-servicing.23479.22</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>7.0.12-servicing.23479.22</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.12-servicing.23479.22</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
|
|
@ -70,8 +70,8 @@
|
|||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.309</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.309-servicing.23479.6</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.309-servicing.23479.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.309-servicing.23479.68</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.309-servicing.23479.68</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue