Skip to content

Commit

Permalink
Merged PR 36665: [internal/release/7.0.3xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…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.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (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**: 20240119.10
- **Date Produced**: January 19, 2024 6:17:10 PM UTC
- **Commit**: e526ba29cdfac238c7dc40905b855b2ddc7d9d77
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.313 to 7.0.313][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.NET.Sdk**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f3b71634ebe0f75164461f73d6305d1aeb44...
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Jan 19, 2024
2 parents 72c9ce8 + dd89f67 commit 7b4633f
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
8 changes: 4 additions & 4 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-ba2ce58" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ba2ce581/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-610fe43" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-610fe433/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ca51060" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ca510604/nuget/v3/index.json" />
Expand All @@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1f3b716" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-1f3b7163/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-e526ba2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-e526ba29/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f58ad2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f58ad2d6/nuget/v3/index.json" />
Expand All @@ -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-ba2ce58" value="true" />
<add key="darc-int-dotnet-aspnetcore-610fe43" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-567edaf" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-1f3b716" value="true" />
<add key="darc-int-dotnet-sdk-e526ba2" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f58ad2d" value="true" />
Expand Down
38 changes: 19 additions & 19 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,32 +54,32 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.16-servicing.24067.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.16-servicing.24068.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.16-servicing.24067.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.16-servicing.24068.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.16-servicing.24067.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.16-servicing.24068.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.16-servicing.24067.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.16-servicing.24068.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.16-servicing.24067.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.16-servicing.24068.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ba2ce5819947cc6aa7724dbc54201d5c6596de0c</Sha>
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</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>
Expand All @@ -100,20 +100,20 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.313">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1f3b71634ebe0f75164461f73d6305d1aeb4403d</Sha>
<Sha>e526ba29cdfac238c7dc40905b855b2ddc7d9d77</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.313-servicing.24068.62">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.313-servicing.24069.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1f3b71634ebe0f75164461f73d6305d1aeb4403d</Sha>
<Sha>e526ba29cdfac238c7dc40905b855b2ddc7d9d77</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.313-servicing.24068.62">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.313-servicing.24069.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1f3b71634ebe0f75164461f73d6305d1aeb4403d</Sha>
<Sha>e526ba29cdfac238c7dc40905b855b2ddc7d9d77</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.313-servicing.24068.62">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.313-servicing.24069.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1f3b71634ebe0f75164461f73d6305d1aeb4403d</Sha>
<Sha>e526ba29cdfac238c7dc40905b855b2ddc7d9d77</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.16-servicing.24067.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.16</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.16-servicing.24067.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.16-servicing.24067.19</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.16-servicing.24067.19</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.16-servicing.24067.19</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.16-servicing.24067.19</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.16-servicing.24068.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.16-servicing.24068.15</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.16-servicing.24068.15</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.16-servicing.24068.15</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.16-servicing.24068.15</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.313</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.313-servicing.24068.62</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.313-servicing.24068.62</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.313-servicing.24069.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.313-servicing.24069.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit 7b4633f

Please sign in to comment.