Skip to content

Commit

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

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20240423.11
- **Date Produced**: April 23, 2024 9:33:27 PM UTC
- **Commit**: d68182ae8a8caa7d5235597a4430f669bf2d95b1
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.409 to 7.0.409][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.409-servicing.24218.20 to 7.0.409-servicing.24223.11][1]
  - **Microsoft.NET.Sdk**: [from 7.0.409-servicing.24218.20 to 7.0.409-servicing.24223.11][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.409-servicing.24218.20 to 7.0.409-servicing.24223.11][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.19 to 7.0.19][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.19 to 7.0.19][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][2]
  - **dotnet-dev-certs**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][2]
  - **dotnet-user-jwts**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][2]
  - **dotnet-user-secrets**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5530243c9f565279357c46d34c861c007a25e593&targetVe...
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Apr 23, 2024
1 parent 579ef85 commit 0c6be68
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 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-77d58ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-77d58ec6/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-8edf68f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8edf68fb/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-06b2bc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-06b2bc11/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-4f16685" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4f16685f/nuget/v3/index.json" />
Expand All @@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-19f489b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-19f489b8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-5530243" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5530243c/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-d68182a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d68182ae/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d96741e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d96741e3/nuget/v3/index.json" />
Expand All @@ -38,19 +38,19 @@
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" />
<!-- Temporary feed for Xamarin workload manifest -->
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
</packageSources>
<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-8edf68f" value="true" />
<add key="darc-int-dotnet-aspnetcore-06b2bc1" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-19f489b" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-5530243" value="true" />
<add key="darc-int-dotnet-sdk-d68182a" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d96741e" 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.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
<Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</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.409">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5530243c9f565279357c46d34c861c007a25e593</Sha>
<Sha>d68182ae8a8caa7d5235597a4430f669bf2d95b1</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.409-servicing.24218.20">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.409-servicing.24223.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5530243c9f565279357c46d34c861c007a25e593</Sha>
<Sha>d68182ae8a8caa7d5235597a4430f669bf2d95b1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.409-servicing.24218.20">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.409-servicing.24223.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5530243c9f565279357c46d34c861c007a25e593</Sha>
<Sha>d68182ae8a8caa7d5235597a4430f669bf2d95b1</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.409-servicing.24218.20">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.409-servicing.24223.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5530243c9f565279357c46d34c861c007a25e593</Sha>
<Sha>d68182ae8a8caa7d5235597a4430f669bf2d95b1</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.19-servicing.24216.14" 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 @@ -56,20 +56,20 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.19</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.19</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.19-servicing.24216.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.19-servicing.24216.12</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.19-servicing.24216.12</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.19-servicing.24216.12</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.19-servicing.24216.12</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.19-servicing.24223.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.19-servicing.24223.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.19-servicing.24223.6</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.19-servicing.24223.6</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.19-servicing.24223.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.409</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.409-servicing.24218.20</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.409-servicing.24218.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.409-servicing.24223.11</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.409-servicing.24223.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit 0c6be68

Please sign in to comment.