mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 35763: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

Browse source 
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.15 to 7.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (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**: 20231201.25
- **Date Produced**: December 1, 2023 9:21:41 PM UTC
- **Commit**: c0aa76c865eb72b183247119752dfabca811f17a
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.115 to 7.0.115][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1]
  - **Microsoft.NET.Sdk**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2]
  - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2]
  - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2]
  - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1d1af5d700&targetVersion=GCc0aa76c865...
This commit is contained in:
DotNet Bot 2023-12-01 21:52:36 +00:00 • committed by Matt Mitchell
parent 2f13a3f01e
commit d0b4dae10e
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
NuGet.config
View file

@ -7,7 +7,7 @@
<clear />
<!--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-360f156" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-360f1564/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c49ccc8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c49ccc87/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-33b038b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5/nuget/v3/index.json" />
@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-8f4568c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1d1af5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-1d1af5d7/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-c0aa76c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-c0aa76c8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-acb200f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-acb200f3/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-360f156" value="true" />
<add key="darc-int-dotnet-aspnetcore-c49ccc8" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-8f4568c" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1d1af5d" value="true" />
<add key="darc-int-dotnet-sdk-c0aa76c" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-acb200f" value="true" />

38
eng/Version.Details.xml
View file

@ -54,32 +54,32 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.15-servicing.23577.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.15-servicing.23601.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.15-servicing.23577.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.15-servicing.23601.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.15-servicing.23577.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.15-servicing.23601.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.15-servicing.23577.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.15-servicing.23601.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.15-servicing.23577.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.15-servicing.23601.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>360f1564385745dd9e9acc53e697f8e63ff41126</Sha>
<Sha>c49ccc8727c620ce1cb8fb431bb3fe8f2e747236</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.115">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e</Sha>
<Sha>c0aa76c865eb72b183247119752dfabca811f17a</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.115-servicing.23579.12">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.115-servicing.23601.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e</Sha>
<Sha>c0aa76c865eb72b183247119752dfabca811f17a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.115-servicing.23579.12">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.115-servicing.23601.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e</Sha>
<Sha>c0aa76c865eb72b183247119752dfabca811f17a</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.115-servicing.23579.12">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.115-servicing.23601.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e</Sha>
<Sha>c0aa76c865eb72b183247119752dfabca811f17a</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.15-servicing.23573.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

14
eng/Versions.props
View file

@ -58,11 +58,11 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.15</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.15</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.15-servicing.23577.31</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.15-servicing.23577.31</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.15-servicing.23577.31</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.15-servicing.23577.31</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.15-servicing.23577.31</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.15-servicing.23601.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.15-servicing.23601.10</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.15-servicing.23601.10</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.15-servicing.23601.10</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.15-servicing.23601.10</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.115</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.115-servicing.23579.12</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.115-servicing.23579.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.115-servicing.23601.25</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.115-servicing.23601.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>