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

Merged PR 34753: [internal/release/7.0.3xx] 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.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.14 to 7.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16 (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**: 20231023.38
- **Date Produced**: October 24, 2023 1:59:08 AM UTC
- **Commit**: c4047673ed10f28cc58ad806c54e25037b0469d8
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.311 to 7.0.311][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.311-servicing.23520.57 to 7.0.311-servicing.23523.38][1]
  - **Microsoft.NET.Sdk**: [from 7.0.311-servicing.23520.57 to 7.0.311-servicing.23523.38][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.311-servicing.23520.57 to 7.0.311-servicing.23523.38][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.14 to 7.0.14][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.14 to 7.0.14][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **dotnet-dev-certs**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **dotnet-user-jwts**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]
  - **dotnet-user-secrets**: [from 7.0.14-servicing.23519.18 to 7.0.14-servicing.23523.16][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1aeeb83bf2&targetVersion=GCc4047673ed...
This commit is contained in:
DotNet Bot 2023-10-24 04:42:48 +00:00 committed by Sean Reeser
commit 3d9518d885
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

@ -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-523c17f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-523c17fe/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-0a71569" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-0a715692/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-942bfc8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-942bfc8c/nuget/v3/index.json" />
@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-808851b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1aeeb83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-1aeeb83b/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-c404767" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-c4047673/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-496fa85" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-496fa854/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-523c17f" value="true" />
<add key="darc-int-dotnet-aspnetcore-0a71569" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-808851b" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1aeeb83" value="true" />
<add key="darc-int-dotnet-sdk-c404767" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-496fa85" value="true" />

38
eng/Version.Details.xml
View file

@ -54,32 +54,32 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.14-servicing.23519.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.14-servicing.23523.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.14-servicing.23519.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.14-servicing.23523.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.14-servicing.23519.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.14-servicing.23523.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.14-servicing.23519.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.14-servicing.23523.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.14-servicing.23519.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.14-servicing.23523.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>523c17fe7c87ab56a50214d7ed8685ceb8752f30</Sha>
<Sha>0a715692d8e2536c899faa0bb4f0cec2c2e33e36</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.311">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1aeeb83bf2bcdf717b8c5258d5da8be46821f80b</Sha>
<Sha>c4047673ed10f28cc58ad806c54e25037b0469d8</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.311-servicing.23520.57">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.311-servicing.23523.38">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1aeeb83bf2bcdf717b8c5258d5da8be46821f80b</Sha>
<Sha>c4047673ed10f28cc58ad806c54e25037b0469d8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.311-servicing.23520.57">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.311-servicing.23523.38">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1aeeb83bf2bcdf717b8c5258d5da8be46821f80b</Sha>
<Sha>c4047673ed10f28cc58ad806c54e25037b0469d8</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.311-servicing.23520.57">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.311-servicing.23523.38">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1aeeb83bf2bcdf717b8c5258d5da8be46821f80b</Sha>
<Sha>c4047673ed10f28cc58ad806c54e25037b0469d8</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.14-servicing.23520.9" 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.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.14-servicing.23519.18</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.14-servicing.23519.18</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.14-servicing.23519.18</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.14-servicing.23519.18</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.14-servicing.23519.18</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.14-servicing.23523.16</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.14-servicing.23523.16</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.14-servicing.23523.16</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.14-servicing.23523.16</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.14-servicing.23523.16</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.311</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.311-servicing.23520.57</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.311-servicing.23520.57</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.311-servicing.23523.38</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.311-servicing.23523.38</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>