[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #15243
Conversation
This file contains hidden or 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
…108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7
…e37b-9286-4c1e-beef-524fd2b247d4 [release/6.0.1xx] Update dependencies from dotnet/arcade
…110.1 (dotnet#14985) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22560.1 -> To Version 6.0.0-beta.22561.1
…24e0-34c5-472b-bc6b-c70ea35ada17 [release/6.0.1xx] Update dependencies from dotnet/arcade
…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
[release/6.0.4xx] Update Windows SDK projection
[release/6.0.3xx] Update Windows SDK projection
[release/6.0.1xx] Update Windows SDK projection
…-2022-11-29-1042 Update branding to 6.0.405
…-2022-11-29-1042 Update branding to 6.0.113
…et#15058) * [release/6.0.1xx] Add CI for security-partners-dotnet (dotnet#14963) * Add CI for dotnet-security-partners * Remove nuget configs from all repo submodules * Address code review * Move security-partners ci to tarball/eng dir * Copy out installer NuGet config before build * Fix relative path for installer template * Update src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml Co-authored-by: Michael Simons <[email protected]> * Revert "Remove nuget configs from all repo submodules" This reverts commit 87b8a2c. Co-authored-by: Michael Simons <[email protected]> * Update branding to 6.0.113 Co-authored-by: Logan Bussell <[email protected]> Co-authored-by: Michael Simons <[email protected]> Co-authored-by: Sean Reeser <[email protected]> Co-authored-by: Marc Paine <[email protected]> Co-authored-by: Matt Mitchell <[email protected]>
…ence-packages build 20221130.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22570.2 -> To Version 6.0.0-servicing.22580.2
…b19e-c314-4bf3-b2c4-759cf84b5048 [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221201.10 - **Date Produced**: December 1, 2022 5:48:23 PM UTC - **Commit**: c1c65f7 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4] - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b87201&targetVersion=GCc1c65f7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
…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.WindowsDesktop.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22575.6 to 6.0.405-rtm.22580.43 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P...
…-merge-6.0.4xx-2023-01-10-1108
dotnet-maestro-bot
force-pushed
the
merge/release/6.0.4xx-to-release/7.0.1xx
branch
from
4632e19 to
4beb82d
Compare
v-wuzhai
requested review from
marcpopMSFT and
wtgodbe
and removed request for
marcpopMSFT and
wtgodbe
|
Superceded by #15247 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
I detected changes in the release/6.0.4xx branch which have not been merged yet to release/7.0.1xx. I'm a robot and am configured to help you automatically keep release/7.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:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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/7.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.