Merging internal commits for release/7.0.1xx #40908
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:2e49bcfd-e55b-458e-663c-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e49bcfd-e55b-458e-663c-08da7ef6346a - **Build**: 20240416.8 - **Date Produced**: April 16, 2024 7:54:10 PM UTC - **Commit**: a32eb05bd8bdfc8ec0db899c28fb05063c70b1b0 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.TemplateEngine.Abstractions**: [from 7.0.118 to 7.0.119][3] - **Microsoft.TemplateEngine.Mocks**: [from 7.0.118-servicing.24169.13 to 7.0.119-servicing.24216.8][3] - **Microsoft.TemplateEngine.TestHelper**: [from 7.0.118-servicing.24169.13 to 7.0.119-servicing.24216.8][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC8b5d461ba8a0163639ce090e5edac9ef7e8ad9ef&targetVersion=GCa32eb05bd8bdfc8ec0db899c28fb05063c70b1b0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e49bcfd-e55b-458e-663c-08da7ef6346a) [marker]: <> (Begin:e5a08a41-d0d3-41f6-e6f4-08da7ef62759) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: e5a08a41-d0d3-41f6-e6f4-08da7ef62759 - **Build**: 20240415.23 - **Date Produced**: April 16, 2024 8:09:52 AM UTC - **Commit**: 19f489b8b49b0ffacdffaed17801a6bcb3375c7a - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.ILCompiler**: [from 7.0.18 to 7.0.19][2] - **Microsoft.NET.HostModel**: [from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.18 to 7.0.19][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.18 to 7.0.19][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.18 to 7.0.19][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.18 to 7.0.19][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC544c7e6eb3d5525c6f85341f51217d81d7c8ed80&targetVersion=GC19f489b8b49b0ffacdffaed17801a6bcb3375c7a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e5a08a41-d0d3-41f6-e6f4-08da7ef62759) [marker]: <> (Begin:20a3161b-1171-4204-6f62-08da7ef6374d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 20a3161b-1171-4204-6f62-08da7ef6374d - **Build**: 20240412.6 - **Date Produced**: April 13, 2024 12:32:26 AM UTC - **Commit**: 1591ba79a566ff3d70c1a120260d02bb2c677177 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24212.6][3] - **do...
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:20a3161b-1171-4204-6f62-08da7ef6374d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 20a3161b-1171-4204-6f62-08da7ef6374d - **Build**: 20240416.12 - **Date Produced**: April 16, 2024 9:36:13 PM UTC - **Commit**: 8edf68fbb682d821ced5523038eb69302834bf51 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **dotnet-user-jwts**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **dotnet-user-secrets**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.Analyzers**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.Authorization**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.Components.Web**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] - **Microsoft.AspNetCore.TestHost**: [from 7.0.19 to 7.0.19][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 7.0.19 to 7.0.19][1] - **Microsoft.JSInterop**: [from 7.0.19 to 7.0.19][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.19-servicing.24212.6 to 7.0.19-servicing.24216.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1591ba79a566ff3d70c1a120260d02bb2c677177&targetVersion=GC8edf68fbb682d821ced5523038eb69302834bf51&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:20a3161b-1171-4204-6f62-08da7ef6374d) [marker]: <> (Begin:2e49bcfd-e55b-458e-663c-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e49bcfd-e55b-458e-663c-08da7ef6346a - **Build**: 20240416.10 - **Date Produced**: April 16, 2024 9:52:44 PM UTC - **Commit**: ab592e36b4df86ba66eae4e68465ef464ef4270d - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.TemplateEngine.Abstractions**: [from 7.0.119 to 7.0.119][2] - **Microsoft.TemplateEngine.Mocks**: [from 7.0.119-servicing.24216.8 to 7.0.119-servicing.24216.10][2] - **Microsoft.TemplateEngine.TestHelper...
…dnceng/internal/dotnet-windowsdesktop 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.NET.Sdk.WindowsDesktop**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24216.3 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fcff5d67-4caf-41c6-139b-08da7ef5fa55) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: fcff5d67-4caf-41c6-139b-08da7ef5fa55 - **Build**: 20240416.14 - **Date Produced**: April 17, 2024 12:38:51 AM UTC - **Commit**: d96741e3c0f3653534ab6d14ff85a7c36e511e36 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.18 to 7.0.19][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.18 to 7.0.19][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24216.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCaf494c5c30f33cdb12a68420c4d4a7d791b21ed0&targetVersion=GCd96741e3c0f3653534ab6d14ff85a7c36e511e36&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC71273b560061b69cef763838282ef085e53a73cb&targetVersion=GCfec2496fcc461acb4b77037a364677967ac68d9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:fcff5d67-4caf-41c6-139b-08da7ef5fa55)
…dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:2e49bcfd-e55b-458e-663c-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e49bcfd-e55b-458e-663c-08da7ef6346a - **Build**: 20240417.3 - **Date Produced**: April 17, 2024 4:43:53 PM UTC - **Commit**: 7a22fe8edb9cebb329e2bac415e16682033af1ac - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.TemplateEngine.Abstractions**: [from 7.0.119 to 7.0.119][1] - **Microsoft.TemplateEngine.Mocks**: [from 7.0.119-servicing.24216.10 to 7.0.119-servicing.24217.3][1] - **Microsoft.TemplateEngine.TestHelper**: [from 7.0.119-servicing.24216.10 to 7.0.119-servicing.24217.3][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCab592e36b4df86ba66eae4e68465ef464ef4270d&targetVersion=GC7a22fe8edb9cebb329e2bac415e16682033af1ac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e49bcfd-e55b-458e-663c-08da7ef6346a)
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:20a3161b-1171-4204-6f62-08da7ef6374d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 20a3161b-1171-4204-6f62-08da7ef6374d - **Build**: 20240423.6 - **Date Produced**: April 23, 2024 8:27:54 PM UTC - **Commit**: 06b2bc111203f9b9ff0914a7715675a9a66bdac9 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **dotnet-user-jwts**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **dotnet-user-secrets**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.Analyzers**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.Authorization**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.Components.Web**: [from 7.0.19 to 7.0.19][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] - **Microsoft.AspNetCore.TestHost**: [from 7.0.19 to 7.0.19][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 7.0.19 to 7.0.19][1] - **Microsoft.JSInterop**: [from 7.0.19 to 7.0.19][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC8edf68fbb682d821ced5523038eb69302834bf51&targetVersion=GC06b2bc111203f9b9ff0914a7715675a9a66bdac9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:20a3161b-1171-4204-6f62-08da7ef6374d)
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
marcpopMSFT
approved these changes
May 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.