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.

Sign up for GitHub

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

Jump to bottom

Merging internal commits for release/6.0.3xx #28469

Merged
merged 21 commits into from
Oct 14, 2022
Merged

Merging internal commits for release/6.0.3xx #28469

merged 21 commits into from
Oct 14, 2022

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dotnet-bot and others added 21 commits September 1, 2022 16:58
@dotnet-bot
Merge in 'release/6.0.3xx' changes
9cff9ad
@dotnet-bot
Merge in 'release/6.0.3xx' changes
d226374
@dotnet-bot
Merge in 'release/6.0.3xx' changes
7f19abf
@nagilson
[Backport] Fix Temp Paths for MSRC
dd58281
@nagilson
Remove localizablestrings from patch
29f28a8
@nagilson
Additional fixes for 6.0.3xx specifically
0ec8d78
@nagilson
Remove installingworkloadcommand
c66e6a7
@dotnet-bot
Merge in 'release/6.0.3xx' changes
1c57049
@nagilson
Merged PR 25596: [Backport] 6.0.3xx Temp Path Changes
4f67b11 
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/25327
@dotnet-bot
Merge in 'release/6.0.3xx' changes
0e4434b
@dotnet-bot
Merge in 'release/6.0.3xx' changes
93fa537
@mmitche
Merged PR 25662: Insert nuget.client 6.2.2-rc.1 into dotnet sdk 6.0.3xx
2336f3a 
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/22929
@Forgind
get msbuild bits
4a609e4
@Forgind
merge in release branch
5142b37
@Forgind
update nuget.config
be5abc9
@Forgind @marcpopMSFT
Merged PR 25784: Update 6.0.3xx with MSRC-fixed MSBuild
edd49c1 
get msbuild bits
@dotnet-bot @mmitche
Merged PR 25310: [internal/release/6.0.3xx] Update dependencies from …
fea4518 
…4 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46
- **Build**: 20220920.3
- **Date Produced**: September 20, 2022 4:17:57 PM UTC
- **Commit**: a596312f285b849740c070b3b9f0825dc0ba84cf
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.304 to 6.0.305][33]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.304 to 6.0.305][33]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.304 to 6.0.305][33]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3][33]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.304 to 6.0.305][33]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.304 to 6.0.305][33]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.304 to 6.0.305][33]

[33]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0b3a1bf&targetVersion=GCa596312&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46)

[marker]: <> (Begin:dc1c3afc-aa30-466e-4d3a-08da180de348)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: dc1c3afc-aa30-466e-4d3a-08da180de348
- **Build**: 20220919.10
- **Date Produced**: September 19, 2022 11:32:17 PM UTC
- **Commit**: 3bd501a063af406167e0195844048a3c222afd29
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10][31]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][31]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][31]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][31]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][31]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][32]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10][31]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10][31]

[31]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC163a635&targetVersion=GC3bd501a&_a=files
[32]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC0ec02c8&targetVersion=GC3bd501a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348)

[marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348
- *...
@dotnet-bot @mmitche
Merged PR 26194: [internal/release/6.0.3xx] Update dependencies from …
5d8812a 
…dnceng/internal/dotnet-templating dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46
- **Build**: 20220926.13
- **Date Produced**: September 26, 2022 2:47:07 PM UTC
- **Commit**: 13826b7b41995f89808a7b7644b41a89f81b33b6
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.305 to 6.0.305][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.305 to 6.0.305][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22470.3 to 6.0.305-servicing.22476.13][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.305 to 6.0.305][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.305 to 6.0.305][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.305 to 6.0.305][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46)

[marker]: <> (Begin:dc1c3afc-aa30-466e-4d3a-08da180de348)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: dc1c3afc-aa30-466e-4d3a-08da180de348
- **Build**: 20220926.5
- **Date Produced**: September 26, 2022 9:30:53 PM UTC
- **Commit**: 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC3bd501a&targetVersion=GC5a400c2&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348)
@dotnet-bot @mmitche
Merged PR 26218: [internal/release/6.0.3xx] Update dependencies from …
5fd3362 
…dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348
- **Build**: 20220926.12
- **Date Produced**: September 26, 2022 11:42:31 PM UTC
- **Commit**: 9efc206d0eec75172819678bbc4899d55ba01e9c
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

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

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC3678930&targetVersion=GC9efc206&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:ffc11ea2-d045-4ff5-4d39-08da180de348)

[marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46
- **Build**: 20220926.20
- **Date Produced**: September 26, 2022 11:58:43 PM UTC
- **Commit**: 4c6436d0fb4378537a091f06432b306ea8ef383e
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.305 to 6.0.305][2]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.305 to 6.0.305][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.13 to 6.0.305-servicing.22476.20][2]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: ...
@dotnet-bot @mmitche
Merged PR 26234: [internal/release/6.0.3xx] Update dependencies from …
0c33071 
…dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348
- **Build**: 20220926.17
- **Date Produced**: September 27, 2022 2:14:59 AM UTC
- **Commit**: 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

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

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC9efc206&targetVersion=GC32e8c8c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:ffc11ea2-d045-4ff5-4d39-08da180de348)

[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.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d1814f0c-875d-4709-e94c-08da181a39e5)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: d18...
@vseanreesermsft
Merge commit '0c33071e5eddb592a4b2122ec86afb2163873b6e' into internal…
0230e9f 
…-merge-6.0.3xx-2022-10-11-1013
@marcpopMSFT
Copy link
Member

@rbhanda @mmitche @vseanreesermsft does msbuild need to be pushed to the public feed:
D:\a_work\1\s\src\Tests\msbuild.Integration.Tests\msbuild.Integration.Tests.csproj : error NU1603: Microsoft.DotNet.Cli.Utils depends on Microsoft.Build (>= 17.2.2) but Microsoft.Build 17.2.2 was not found. An approximate best match of Microsoft.Build 17.3.0 was resolved. [D:\a_work\1\s\sdk.sln]
##[error]src\Tests\msbuild.Integration.Tests\msbuild.Integration.Tests.csproj(0,0): error NU1603: (NETCORE_ENGINEERING_TELEMETRY=Restore) Microsoft.DotNet.Cli.Utils depends on Microsoft.Build (>= 17.2.2) but Microsoft.Build 17.2.2 was not found. An approximate best match of Microsoft.Build 17.3.0 was resolved.

CC @rainersigwald

@rainersigwald
Copy link
Member

The change has private feeds for MSBuild (not sure why it has 5 of them) that I expected to work, but we should push them anyway. @Forgind can you point to the right official build?

This was referenced Oct 11, 2022
Closed
Closed
@mmitche
Copy link
Member

mmitche commented Oct 11, 2022

The change has private feeds for MSBuild (not sure why it has 5 of them) that I expected to work, but we should push them anyway. @Forgind can you point to the right official build?

That's expected. It's every feed where the specific msbuild packages have appeared. They are disabled though (since they are internal). The packages should be on nuget.org, and then end up on dotnet-public.

@Forgind
Copy link
Member

Forgind commented Oct 11, 2022

6.0.3xx corresponds to MSBuild 17.2, correct? https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=6677526&view=results is the build for 17.2.

@rainersigwald
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@build-analysis build-analysis bot mentioned this pull request Oct 14, 2022
Closed
2 tasks
@mmitche mmitche merged commit b85f6b7 into dotnet:release/6.0.3xx Oct 14, 2022
@nagilson nagilson mentioned this pull request Oct 14, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmitche mmitche mmitche approved these changes

Assignees
No one assigned
Labels
Area-Infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vseanreesermsft @marcpopMSFT @rainersigwald @mmitche @Forgind @dotnet-bot @nagilson