Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #44031

Merged
merged 59 commits into from
Oct 9, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 9, 2024

I detected changes in the release/6.0.4xx branch which have not been merged yet to release/8.0.1xx. I'm a robot and am configured to help you automatically keep release/8.0.1xx up to date, so I've opened this PR.

This PR merges commits made on release/6.0.4xx by the following committers:

  • mmitche
  • vseanreesermsft
  • nagilson
  • marcpopMSFT
  • Cosifne
  • dotnet-bot
  • v-wuzhai
  • dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/6.0.4xx
git pull --ff-only
git checkout release/8.0.1xx
git pull --ff-only
git merge --no-ff release/6.0.4xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0.4xx-to-release/8.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull https://github.com/dotnet/sdk merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
or if you are using SSH
git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull [email protected]:dotnet/sdk merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

Mirroring and others added 30 commits August 6, 2024 20:54
…3 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: a80f4faa-cecd-4d15-c1ec-08da65ba3b2f
- **Build**: 20240812.10
- **Date Produced**: August 13, 2024 2:56:37 AM UTC
- **Commit**: 4493500184d43f2d0c60001d557433e40de1663c
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.34 to 6.0.34][3]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][3]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.34 to 6.0.34][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e4bec0ab4141e6681c87e3f34317f3d670946cd&targetVersion=GC4493500184d43f2d0c60001d557433e40de1663c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20240813.2
- **Date Produced**: August 13, 2024 11:41:29 PM UTC
- **Commit**: 526b783fc75e702512a29ede591c4335dce62d6f
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][4]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][4]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24406.5 to 6.0.34-servicing.24413.2][4]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24406.5 to 6.0.34-servicing.24413.2][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7748e8750e5b93731c9ebd20aae01dd5b6abaaab&targetVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20240807.6
- **Date Produced**: August 7, 2024 10:41:17 PM UTC
- **Commit**: 461f5091a1b0ac7a12af350bb2a094e248cd757c
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.33-servici...
…dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240815.7
- **Date Produced**: August 15, 2024 8:11:11 PM UTC
- **Commit**: 8258476be31dcbbb6c69693eeafda17db361f28f
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.425 to 6.0.425][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.425 to 6.0.425][2]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.425 to 6.0.425][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.425-rtm.24415.3 to 6.0.425-rtm.24415.7][2]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.425 to 6.0.425][2]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.425 to 6.0.425][2]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.425 to 6.0.425][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5263aa653cf19dfec7fb5c1b8051d508f448096a&targetVersion=GC8258476be31dcbbb6c69693eeafda17db361f28f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)
…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 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20240815.7
- **Date Produced**: August 16, 2024 1:03:31 AM UTC
- **Commit**: 4e044058aadccd22bc0dc7ecb27ca7f5ab270584
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: a80f4faa-cecd-4d15-c1ec-08da65ba3b2f
- **Build**: 20240816.23
- **Date Produced**: August 17, 2024 4:41:32 AM UTC
- **Commit**: 98588b0f0d72383aca8722755d838ae1d542ce62
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.34 to 6.0.34][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.34 to 6.0.34][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4493500184d43f2d0c60001d557433e40de1663c&targetVersion=GC98588b0f0d72383aca8722755d838ae1d542ce62&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240817.1
- **Date Produced**: August 17, 2024 4:05:50 PM UTC
- **Commit**: 1a1d03fbcbcf9d373c1f0c87c20506b5de300388
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.425 to 6.0.425][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.425 to 6.0.425][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.425 to 6.0.425][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.425-rtm.24415.7 to 6.0.425-rtm.24417.1][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.425 to 6.0.425][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.425 to 6.0.425][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.425 to 6.0.425][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC8258476be31dcbbb6c69693eeafda17db361f28f&targetVersion=GC1a1d03fbcbcf9d373c1f0c87c20506b5de300388&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20240817.1
- **Date Produced**: August 17, 2024 4:21:43 PM UTC
- **Commit**: e19ee616d4c5538bc5adb2335d85e0c7f9d30000
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **dotnet-user-secrets**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.34 to 6.0.34][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][2]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.34 to 6.0.34][2]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.34 to 6.0.34][2]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.34 to 6.0.34][2]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.34 to 6.0.34][2]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0...
…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 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20240819.1
- **Date Produced**: August 19, 2024 5:18:35 PM UTC
- **Commit**: 7132545b5ef9cfe30512311811ee420b1f208971
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&targetVersion=GC7132545b5ef9cfe30512311811ee420b1f208971&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&targetVersion=GC0716b4331761db24b6c5f2f52e8bcd32b6bd065b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…otnet-aspnetcore build 20240903.6

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.34-servicing.24417.1 -> To Version 6.0.35-servicing.24453.6
…otnet-aspnetcore build 20240904.6

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.35-servicing.24453.6 -> To Version 6.0.35-servicing.24454.6
…otnet-runtime build 20240905.11

Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0
 From Version 6.0.0 -> To Version 6.0.1
…otnet-runtime build 20240909.5

Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0
 From Version 6.0.1 -> To Version 6.0.1
…otnet-runtime build 20240909.14

Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0
 From Version 6.0.1 -> To Version 6.0.1
…otnet-runtime build 20240909.18

Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0
 From Version 6.0.1 -> To Version 6.0.1
….4xx

#43112

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and script updates.

#### PR Summary
This pull request merges changes from the public release branch to the internal release branch, focusing on script updates and cleanup.
- Added `nuget-verification.ps1` to verify Microsoft NuGet packages.
- Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1` scripts.
- Updated `publish-build-assets.yml` and `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`.
- Updated dependencies in `Version.Details.xml` to newer versions.
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20240904.6
- **Date Produced**: September 5, 2024 2:08:15 AM UTC
- **Commit**: 4413239935644e4c528bd400fed7ae65a2667e4c
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **dotnet-user-secrets**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.JSInterop**: [from 6.0.35 to 6.0.35][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24453.6 to 6.0.35-servicing.24454.6][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC559806d223a382821be5ec8f7e0e15d33c01cc01&targetVersion=GC4413239935644e4c528bd400fed7ae65a2667e4c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1963f8a1-5df7-4929-7e1e-08da65ba3032)

[marker]: <> (Begin:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: a80f4faa-cecd-4d15-c1ec-08da65ba3b2f
- **Build**: 20240909.18
- **Date Produced**: September 10, 2024 9:34:05 AM UTC
- **Commit**: b357f86ce3bce7c232ea242074b17bebdc50b543
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.DependencyModel**: [from 6.0.1 to 6.0.1][7]
  - **Microsoft.NET.HostModel**: [from 6.0.35-servicing.24459.14 to 6.0.35-servicing.24459.18][7]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.35 to 6.0.35][7]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.35 to 6.0.35][7]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [fro...
…otnet-aspnetcore build 20240911.15

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.35-servicing.24454.6 -> To Version 6.0.35-servicing.24461.15
…otnet-aspnetcore build 20240912.3

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.35-servicing.24461.15 -> To Version 6.0.35-servicing.24462.3
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20240912.3
- **Date Produced**: September 12, 2024 5:48:20 PM UTC
- **Commit**: 1ad4097713d52a22315021099f2a185ae68abbe1
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **dotnet-user-secrets**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.JSInterop**: [from 6.0.35 to 6.0.35][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24461.15 to 6.0.35-servicing.24462.3][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC89786c0208cb785eb4826fe2c805f1da79bfc3f3&targetVersion=GC1ad4097713d52a22315021099f2a185ae68abbe1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1963f8a1-5df7-4929-7e1e-08da65ba3032)
…909.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 6.0.0-beta.24413.1 -> To Version 6.0.0-beta.24459.5
…otnet-windowsdesktop build 20240912.8

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.34 -> To Version 6.0.35

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.34-servicing.24417.2 -> To Version 6.0.35-servicing.24462.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64
…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 6.0.34-servicing.24417.2 to 6.0.35-servicing.24462.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20240912.8
- **Date Produced**: September 12, 2024 8:09:55 PM UTC
- **Commit**: 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.35][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.34-servicing.24417.2 to 6.0.35-servicing.24462.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7132545b5ef9cfe30512311811ee420b1f208971&targetVersion=GC01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC0716b4331761db24b6c5f2f52e8bcd32b6bd065b&targetVersion=GC869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…otnet-aspnetcore build 20240912.14

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.35-servicing.24462.3 -> To Version 6.0.35-servicing.24462.14
dotnet-bot and others added 19 commits September 16, 2024 20:20
…otnet-templating build 20240916.3

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common
 From Version 6.0.425 -> To Version 6.0.427
…dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240916.3
- **Date Produced**: September 16, 2024 7:42:38 PM UTC
- **Commit**: 7de8a2867cf734967eef78d8e82902f3e84650b7
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.425 to 6.0.427][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.425 to 6.0.427][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.425 to 6.0.427][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.425-rtm.24417.1 to 6.0.427-rtm.24466.3][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.425 to 6.0.427][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.425 to 6.0.427][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.425 to 6.0.427][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC1a1d03fbcbcf9d373c1f0c87c20506b5de300388&targetVersion=GC7de8a2867cf734967eef78d8e82902f3e84650b7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and script updates.

#### PR Summary
This pull request merges changes from the public repository, focusing on script updates and cleanup.
- Added `nuget-verification.ps1` to verify Microsoft NuGet packages.
- Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1` scripts.
- Updated `publish-build-assets.yml` and `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`.
- Updated dependencies in `Version.Details.xml` to newer versions.
The real payload https://dev.azure.com/dnceng/internal/_build/results?buildId=2535223&view=results

----
#### AI description  (iteration 1)
#### PR Classification
Code update for internal release configuration.

#### PR Summary
This pull request updates the internal release configuration for version 6.0.4xx.
- Updated `NuGet.config` to add new package sources for `dotnet-templating`, `dotnet-aspnetcore`, `dotnet-runtime`, and `dotnet-windowsdesktop`.
- Modified `eng/Version.Details.xml` to update the `dotnet-format` dependency version and its repository URI.
- Updated `eng/Versions.props` to reflect the new version of `dotnet-format`.
- Updated Versions.props - update format version to 6.4.546803
- Updated Version.Details.xml - update format to 6.4.546803

----
#### AI description  (iteration 1)
#### PR Classification
Version update for internal release.

#### PR Summary
This pull request updates the version of the `dotnet-format` dependency for the internal release 6.0.4xx.
- Updated `dotnet-format` version from `6.4.546001` to `6.4.546803` in `/eng/Version.Details.xml`
- Updated `dotnetformatVersion` property to `6.4.546803` in `/eng/Versions.props`
The mac latest image has been updated
…923.1

Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24429.1 -> To Version 6.0.200-1.24473.1
…924.1

Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24473.1 -> To Version 6.0.200-1.24474.1
…924.2

Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24474.1 -> To Version 6.0.200-1.24474.2
@github-actions github-actions bot force-pushed the merge/release/6.0.4xx-to-release/8.0.1xx branch from 8f2f826 to abee3fb Compare October 9, 2024 16:02
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Oct 9, 2024
.vsts-ci.yml Outdated Show resolved Hide resolved
.vsts-pr.yml Outdated Show resolved Hide resolved
@marcpopMSFT marcpopMSFT enabled auto-merge October 9, 2024 17:25
@marcpopMSFT marcpopMSFT merged commit f0a51e6 into release/8.0.1xx Oct 9, 2024
17 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/6.0.4xx-to-release/8.0.1xx branch October 9, 2024 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants