Repository navigation
[automated] Merge branch 'release/7.0.2xx' => 'main' - #28875
Merged
dsplaisted merged 135 commits intoNov 4, 2022
Merged
Conversation
…otnet-windowsdesktop build 20220907.10 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.9 -> To Version 6.0.10
NuGet binary insertion for MSRC servicing, planned for October 2022 Patch Tuesday. MSRC 73498 - https://greymatter/MSRC/main.aspx?etc=112&id=ce925c1e-7d12-ed11-a867-000d3a6d3364&pagetype=entityrecord Reference - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/22928
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584 - **Build**: 20220907.10 - **Date Produced**: September 7, 2022 11:03:14 AM UTC - **Commit**: 359e99c5711a3db71d621b77d7209514498620a5 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22457.10][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22457.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCf40e7ce&targetVersion=GC359e99c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…otnet-windowsdesktop build 20220913.3 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.10 -> To Version 6.0.10
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584 - **Build**: 20220913.3 - **Date Produced**: September 14, 2022 1:05:30 AM UTC - **Commit**: c939db3de33a0c5f8e25bca227864fa08c21892d - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22457.10 to 6.0.10-servicing.22463.3][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22457.10 to 6.0.10-servicing.22463.3][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC359e99c&targetVersion=GCc939db3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…otnet-windowsdesktop build 20220914.6 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.10 -> To Version 6.0.10 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.9-servicing.22420.4 -> To Version 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64
…otnet-windowsdesktop build 20220914.9 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.10 -> To Version 6.0.10 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.9-servicing.22420.4 -> To Version 6.0.10-servicing.22456.13 (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.9-servicing.22420.4 to 6.0.10-servicing.22456.13 (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**: 20220914.9 - **Date Produced**: September 14, 2022 9:08:22 PM UTC - **Commit**: e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22463.3 to 6.0.10-servicing.22464.9][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22463.3 to 6.0.10-servicing.22464.9][3] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCc939db3&targetVersion=GCe2b5cfb&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCa97bb2a&targetVersion=GCee8dec2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…0221102.19 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.200-alpha.1.22524.8 -> To Version 7.0.200-alpha.1.22552.19
…0221102.22 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.200-alpha.1.22524.8 -> To Version 7.0.200-alpha.1.22552.22
…dd1d-0d73-4d3c-9d9a-6c97de7bf865 [release/7.0.1xx] Update dependencies from dotnet/roslyn
Switch back to the shipped RC2 build
…8481-403c-40d0-9b05-a6c396b7aee6 [release/7.0.2xx] Update dependencies from dotnet/templating
…102.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22529.1 -> To Version 7.0.1-beta.22552.2
…7f49-408e-462d-ad80-d1f6c74f7b56 [release/7.0.2xx] Update dependencies from dotnet/fsharp
…d8ae-95c3-4f78-88a0-f97465005861 [release/7.0.2xx] Update dependencies from microsoft/vstest
…/7.0.1xx-to-release/7.0.2xx [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'
…221102-03 Microsoft.NET.Test.Sdk From Version 17.5.0-preview-20221101-04 -> To Version 17.5.0-preview-20221102-03
…103.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22552.2 -> To Version 7.0.1-beta.22553.1
…ce6b-eaf9-4256-8877-77fa1746ef5c [release/7.0.2xx] Update dependencies from microsoft/vstest
…0703-61b3-4ecd-9e61-3d98f1c28dfc [release/7.0.2xx] Update dependencies from dotnet/fsharp
dotnet-maestro-bot
force-pushed
the
merge/release/7.0.2xx-to-main
branch
from
November 3, 2022 18:07
3b56afb to
1e15057
Compare
ghost
added
the …0221103.7 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.200-alpha.1.22552.22 -> To Version 7.0.200-alpha.1.22553.7
…103.8 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22553.1 -> To Version 7.0.1-beta.22553.8
…0221103.11 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.200-alpha.1.22552.22 -> To Version 7.0.200-alpha.1.22553.11
…103.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.5.0-1.22528.14 -> To Version 4.5.0-1.22553.5
…103.12 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22553.1 -> To Version 7.0.1-beta.22553.12
…3af0-f6e6-400b-b63c-1cd202504d23 [release/7.0.2xx] Update dependencies from dotnet/templating
…8680-0e86-4307-a3ee-e14d39a774d8 [release/7.0.2xx] Update dependencies from dotnet/fsharp
…67f8-ebe9-4b94-ae35-33b617d3c277 [release/7.0.2xx] Update dependencies from dotnet/roslyn
v-wuzhai
force-pushed
the
merge/release/7.0.2xx-to-main
branch
from
November 4, 2022 05:53
bef683d to
156336c
Compare
dsplaisted
approved these changes
Nov 4, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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/7.0.2xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/7.0.2xx 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/7.0.2xx-to-main'. 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.