Skip to content

[automated] Merge branch 'release/7.0.4xx' => 'main'#16134

Merged
marek-safar merged 80 commits intodotnet:mainfrom
dotnet-maestro-bot:merge/release/7.0.4xx-to-main
Apr 18, 2023
Merged

[automated] Merge branch 'release/7.0.4xx' => 'main'#16134
marek-safar merged 80 commits intodotnet:mainfrom
dotnet-maestro-bot:merge/release/7.0.4xx-to-main

Conversation

@dotnet-maestro-bot
Copy link
Copy Markdown

@dotnet-maestro-bot dotnet-maestro-bot commented Apr 17, 2023

I detected changes in the release/7.0.4xx 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.4xx by the following committers:

  • marcpopMSFT
  • 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/7.0.4xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/7.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-maestro-bot/core-sdk HEAD:merge/release/7.0.4xx-to-main
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.4xx-to-main

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/7.0.4xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/7.0.4xx-to-main main
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/7.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.4xx-to-main
or if you are using SSH 
git checkout -b merge/release/7.0.4xx-to-main main
git pull git@github.com:dotnet-maestro-bot/core-sdk merge/release/7.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.4xx-to-main

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.

dotnet-bot and others added 30 commits March 7, 2023 19:54
@dotnet-bot
Merge in 'release/7.0.2xx' changes
686291d
@dotnet-bot
Merge in 'release/7.0.2xx' changes
2d37618
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
c3fd193 
…otnet-sdk build 20230307.25

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.202 -> To Version 7.0.203
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
2a60f19 
…otnet-sdk build 20230307.34

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.202 -> To Version 7.0.203

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.5.0-6.23127.3 -> To Version 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk
@dotnet-bot @marcpopMSFT
Merged PR 29885: [internal/release/7.0.2xx] Update dependencies from …
fa6a368 
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230307.34
- **Date Produced**: March 8, 2023 3:34:32 AM UTC
- **Commit**: 3760d86
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.203][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23127.3 to 4.5.2-3.23152.4][3]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC288f106&targetVersion=GC3760d86&_a=files
[3]: dotnet/roslyn@e2bc27d...019bee6

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)

[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.Compilers.Toolset**: from 4.5.0-6.23127.3 to 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
e059a76 
…otnet-sdk build 20230309.19

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.203 -> To Version 7.0.203
@dotnet-bot @marcpopMSFT
Merged PR 29935: [internal/release/7.0.2xx] Update dependencies from …
62ccd21 
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230309.19
- **Date Produced**: March 9, 2023 10:02:00 PM UTC
- **Commit**: 0e787bc
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23157.34 to 7.0.203-servicing.23159.19][1]
  - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23157.34 to 7.0.203-servicing.23159.19][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23157.34 to 7.0.203-servicing.23159.19][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3760d86&targetVersion=GC0e787bc&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
@dotnet-bot
Merge in 'release/7.0.2xx' changes
8e88e45
@mmitche
Merged PR 30048: [internal/release/7.0.2xx] Merge from public
f7de182 
Merge from public release/7.0.2xx to internal/release/7.0.2xx and resolve conflicts if necessary
@dotnet-bot
Merge in 'release/7.0.2xx' changes
bf94d45
@dotnet-bot @mmitche
Merged PR 29969: [internal/release/7.0.2xx] Update dependencies from …
5c77098 
…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.NETCore.App.Ref**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 7.0.1 to 7.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.4-servicing.23119.3 to 7.0.5-servicing.23166.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.5.2-3.23152.4 to 4.5.2-3.23171.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0 to 17.5.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.4 to 7.0.4 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.4-servicing.23115.8 to 7.0.5-servicing.23163.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.4 to 7.0.4 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230311.3
- **Date Produced**: March 12, 2023 ...
@dotnet-bot @mmitche
Merged PR 30177: [internal/release/7.0.2xx] Update dependencies from …
3d94398 
…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 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23172.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscr...
@dotnet-bot @mmitche
Merged PR 30247: [internal/release/7.0.2xx] Update dependencies from …
f06de86 
…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.NETCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.5-servicing.23171.9 to 7.0.5-servicing.23174.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.4 to 7.0.5 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23171.12 to 7.0.5-servicing.23174.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.4 to 7.0.5 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230325.5
- **Date Produced**: March 25, 2023 4:49:25 PM UTC
- **Commit**: ff21619
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet....
@dotnet-bot @mmitche
Merged PR 30263: [internal/release/7.0.2xx] Update dependencies from …
a17b97b 
…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 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23175.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23176.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230326.4
- **Date Produced**: March 26, 2023 8:03:27 PM UTC
- **Commit**: 6791a59
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1]
  - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23175.5 to 7.0.203-servicing.23176.4][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23172.8 to 7.0.4-servicing.23176.2][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23175.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.5-servicing.23172.5 to 7.0.5-servicing.23176.1][...
@dotnet-bot @mmitche
Merged PR 30280: [internal/release/7.0.2xx] Update dependencies from …
5b005c1 
…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 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230327.18
- **Date Produced**: March 27, 2023 9:16:58 PM UTC
- **Commit**: e8a9e33
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1]
  - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.5][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6791a59d6b&targetVersion=GCe8a9e334c1&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC21bafd4940&targetVersion=GC265ddce1c1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
@vseanreesermsft
Update branding to 7.0.106
cbcd287
@marcpopMSFT
Update branding to 7.0.106 (dotnet#15978)
7ba969e
@marcpopMSFT
Stabilize branding and implicit version
aff5470
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230407.1
5cac85d 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23204.25 -> To Version 7.0.300-preview.23207.1

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.6.0-3.23181.8 -> To Version 4.6.0-3.23206.9 (parent: Microsoft.NET.Sdk
@nagilson
[release/7.0.3xx] Update dependencies from dotnet/sdk (dotnet#16011)
f6d7bb3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230407.5
14ca231 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23207.1 -> To Version 7.0.300-preview.23207.5

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.23165.1 -> To Version 7.0.100-1.23207.1 (parent: Microsoft.NET.Sdk
@v-wuzhai
[release/7.0.3xx] Update dependencies from dotnet/sdk (dotnet#16018)
fc574d1
@dotnet-maestro
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16030)
d936091 
[release/7.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.5.0-beta.23203.7 to 12.5.0-beta.23209.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23203.7 to 7.0.400-beta.23209.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23165.1 to 7.0.100-1.23207.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.6.0-3.23181.8 to 4.6.0-3.23206.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.6.0 to 17.7.0-preview-23207-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.msbuild: from 17.6.0-preview-23180-04 to 17.7.0-preview-23206-03 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.6.0-preview.3.61 to 6.7.0-preview.1.10 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
[release/7.0.3xx] Update dependencies from dotnet/sdk (dotnet#16034)
f990fab 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@vseanreesermsft
Merge commit '5b005c19f54dd103ae2cd4d9be6acbea187c5bcd' into internal…
96bae02 
…-merge-7.0.2xx-2023-04-11-1032
@mmitche
Merging internal commits for release/7.0.2xx (dotnet#16047)
9d9a225
@dotnet-maestro
[release/7.0.3xx] Update dependencies from dotnet/sdk (dotnet#16042)
6312afa 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[release/7.0.2xx] Update dependencies from dotnet/arcade (dotnet#16050)
2914abc 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[release/7.0.3xx] Update dependencies from dotnet/arcade (dotnet#16051)
756d733 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[release/7.0.4xx] Update dependencies from dotnet/arcade (dotnet#16052)
8d15a10 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
marcpopMSFT and others added 21 commits April 13, 2023 10:16
@marcpopMSFT
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (dotn…
d7c2da5 
…et#16084)
@marcpopMSFT
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (dotn…
283295c 
…et#16082)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230413.5
3d4a190 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.5.0-beta.23212.12 -> To Version 12.5.0-beta.23213.2 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230413.11
0c7a782 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230413.18
9bfec46 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.18

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230413.51
fcf332e 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23212.56 -> To Version 7.0.400-preview.23213.51

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.4 -> To Version 7.0.5 (parent: Microsoft.NET.Sdk
@v-wuzhai
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16101)
fa7aa4a
Merge branch 'release/7.0.2xx' into release/7.0.3xx
9270b32
@dotnet-maestro
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16115)
e3aefe0 
[release/7.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.5.0-beta.23213.4 to 12.5.0-beta.23213.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23213.4 to 7.0.400-beta.23213.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.6.0-3.23206.9 to 4.7.0-1.23213.8 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230413.70
c70010a 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23213.67 -> To Version 7.0.400-preview.23213.70

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.7.0-1.23213.8 -> To Version 4.7.0-1.23213.11 (parent: Microsoft.NET.Sdk
@v-wuzhai
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16116)
9afcc3b
@dotnet-maestro
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16122)
a4d9c14 
[release/7.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 17.7.0-preview-23212-01 to 17.7.0-preview-23212-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.msbuild: from 17.7.0-preview-23212-01 to 17.7.0-preview-23212-02 (parent: Microsoft.NET.Sdk)
@marcpopMSFT
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (dotn…
f8edc8d 
…et#16105)
@marcpopMSFT
Include the swr file in the nuget package
0f9a87b
@dotnet-maestro
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16125)
6c51fce 
[release/7.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 17.7.0-preview-23212-02 to 17.7.0-preview-23214-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.msbuild: from 17.7.0-preview-23212-02 to 17.7.0-preview-23214-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230416.8
38f62f0 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23214.18 -> To Version 7.0.400-preview.23216.8

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 4.7.0-1.23213.11 -> To Version 4.7.0-1.23214.8 (parent: Microsoft.NET.Sdk
@v-wuzhai
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16129)
b5d0d06
Merge branch 'release/7.0.3xx' into release/7.0.4xx
3e588da
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230417.1
39fd62a 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23216.8 -> To Version 7.0.400-preview.23217.1

Dependency coherency updates

Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
 From Version 17.7.0-preview-23214-01 -> To Version 17.7.0-preview-23217-02 (parent: Microsoft.NET.Sdk
@v-wuzhai
[release/7.0.4xx] Update dependencies from dotnet/sdk (dotnet#16130)
c3b9a06
@marcpopMSFT
Include the swr file in the nuget package (dotnet#16127)
3244be8
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/7.0.4xx-to-main branch from 2305110 to 3244be8 Compare April 17, 2023 16:02
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner April 18, 2023 02:45
@v-wuzhai v-wuzhai force-pushed the merge/release/7.0.4xx-to-main branch from 9a73a7d to 58b64c0 Compare April 18, 2023 06:04
@v-wuzhai v-wuzhai requested a review from marcpopMSFT April 18, 2023 06:04
@marek-safar marek-safar merged commit 16c10f8 into dotnet:main Apr 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marek-safar marek-safar marek-safar approved these changes

@marcpopMSFT marcpopMSFT Awaiting requested review from marcpopMSFT

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@dotnet-maestro-bot @marek-safar @dotnet-bot @mmitche @vseanreesermsft @marcpopMSFT @nagilson @v-wuzhai @dotnet-sb-bot @mthalman