[automated] Merge branch 'release/9.0.2xx' => 'main' #44540

github-actions · 2024-10-31T01:00:35Z

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

tmat
v-wuzhai
dotnet-maestro[bot]
MiYanni
marcpopMSFT
Evangelink
baronfel
github-actions[bot]
invalid-email-address
dotnet-bot
javiercn
rainersigwald
mthalman
MichaelSimons
Sergio0694
manodasanW

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.

git fetch
git checkout release/9.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0.2xx

# 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/9.0.2xx-to-main

or if you are using SSH

git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.2xx-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/9.0.2xx-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/9.0.2xx-to-main main
git pull https://github.com/dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.2xx-to-main

or if you are using SSH

git checkout -b merge/release/9.0.2xx-to-main main
git pull [email protected]:dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.2xx-to-main

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.

…als (#44280)

)

… Build ID 2563738

…18.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24517.1 -> To Version 9.0.0-preview.24518.1

…1018.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24517-05 -> To Version 17.13.0-preview-24518-02

…1017.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.3-preview-24504-01 -> To Version 17.12.5-preview-24517-06

…ence-packages build 20241017.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24511.3 -> To Version 9.0.0-alpha.1.24517.1

…the correct port for the HTTP protocol (#44235)

… Build ID 2563997

…1018.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24518-02 -> To Version 17.13.0-preview-24518-03

…ing of the installers (#44289)

This reverts commit 75d8977.

… Build ID 2564066 (#44252)

…018.1 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-1.24517.9 -> To Version 4.13.0-1.24518.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…nce-packages (#44300)

…018.2 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-1.24518.1 -> To Version 4.13.0-1.24518.2

…18.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24518.1 -> To Version 9.0.0-preview.24518.2

…018.3 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-1.24518.2 -> To Version 4.13.0-1.24518.3

…18.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24515.11 -> To Version 9.0.0-preview.24518.3

…018.4 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-1.24518.3 -> To Version 4.13.0-1.24518.4

…se/9.0.2xx-to-main

mthalman · 2024-11-06T19:57:29Z

Getting this same X509CertificateLoader error in #44685.

…se/9.0.2xx-to-main

v-wuzhai · 2024-11-11T06:44:21Z

@marcpopMSFT Could you take a look at the failures here?

marcpopMSFT · 2024-11-11T18:07:58Z

@tmat the watch tests appear to be hanging in every leg they are running in:
dotnet-watch.Tests: [Long Running Test] 'Microsoft.DotNet.Watcher.Tests.ApplyDeltaTests.Aspire', Elapsed: 00:43:35

marcpopMSFT · 2024-11-19T23:32:55Z

@dotnet/product-construction VMR failing to sync because of an outdated patch.

ViktorHofer · 2024-11-20T08:26:38Z

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/online.NuGet.Config

+    <add key="darc-pub-dotnet-aspnetcore-3cc83de" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-3cc83de3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />


Should this change get reverted?

ViktorHofer · 2024-11-20T08:28:48Z

#44972 fixes that. The problem is that the nuget-client -> sdk (main) subscription was stale. I just updated it to the VS 17.13 channel. So, release/9.0.2xx was using newer dependencies than main.

…se/9.0.2xx-to-main

v-wuzhai · 2024-11-22T08:23:37Z

@tmat Looks like the dotnet watch tests have failed. Can you take a look?

…se/9.0.2xx-to-main

tmat · 2024-12-05T00:37:41Z

@v-wuzhai Feel free to disable any failing dotnet watch tests in all integrations from 9.0.2xx to main due to #42850

v-wuzhai and others added 30 commits October 18, 2024 15:12

[release/9.0.1xx] Update dependencies from dotnet/roslyn (#44278)

eb4d937

[release/9.0.1xx] Update dependencies from dotnet/source-build-extern…

fa7a629

…als (#44280)

[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#44279)

6d6c32f

[release/9.0.1xx] Update dependencies from dotnet/test-templates (#44263

74a8d17

)

[release/9.0.2xx] Update dependencies from dotnet/roslyn (#44293)

6173f10

Localized file check-in by OneLocBuild Task: Build definition ID 140:…

34bda53

… Build ID 2563738

Localized file check-in by OneLocBuild Task: Build definition ID 140:…

14a9e74

… Build ID 2563738

Update dependencies from https://github.com/dotnet/msbuild build 2024…

0123598

…1018.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24517-05 -> To Version 17.13.0-preview-24518-02

Update dependencies from https://github.com/dotnet/msbuild build 2024…

26ee292

…1017.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.3-preview-24504-01 -> To Version 17.12.5-preview-24517-06

Update dependencies from https://github.com/dotnet/source-build-refer…

5ba8ae6

…ence-packages build 20241017.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24511.3 -> To Version 9.0.0-alpha.1.24517.1

fix port error when fallback to http

16a7188

Fixed typo

b533829

add test for FallbackToHttpMessageHandler

ccceafd

use custom scheme Uri to check registry contains port or not

e35b936

[release/9.0.1xx] [Containers] Fix insecure registry handling to use …

b46a39a

…the correct port for the HTTP protocol (#44235)

Localized file check-in by OneLocBuild Task: Build definition ID 140:…

475af3d

… Build ID 2563997

Update dependencies from https://github.com/dotnet/msbuild build 2024…

b36aa46

…1018.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24518-02 -> To Version 17.13.0-preview-24518-03

Enable is shipping package in the installer redist to stabilize brand…

86042e2

…ing of the installers (#44289)

Revert "msbuild patch to remove BuildXL feed (#44199)"

c203912

This reverts commit 75d8977.

Localized file check-in by OneLocBuild Task: Build definition ID 140:…

a6272dd

… Build ID 2564066 (#44252)

Merge branch 'release/9.0.1xx' into marcpopMSFT-prepforrelease

1c7687b

[release/9.0.1xx] Update dependencies from dotnet/templating (#44302)

b95bbf9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

[release/9.0.1xx] Update dependencies from dotnet/source-build-refere…

f5127b1

…nce-packages (#44300)

Jason Zhai added 2 commits November 4, 2024 00:14

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

a2ed4b2

…se/9.0.2xx-to-main

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

106bbed

…se/9.0.2xx-to-main

mthalman mentioned this pull request Nov 6, 2024

Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 #44685

Merged

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

6639978

…se/9.0.2xx-to-main

build-analysis bot mentioned this pull request Nov 11, 2024

dotnet-watch tests failing #40006

Open

v-wuzhai and others added 2 commits November 14, 2024 15:10

Merge branch 'main' into merge/release/9.0.2xx-to-main

d5c300a

Merge branch 'main' into merge/release/9.0.2xx-to-main

c1b0a9a

marcpopMSFT approved these changes Nov 19, 2024

View reviewed changes

ViktorHofer reviewed Nov 20, 2024

View reviewed changes

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

d22c0dc

…se/9.0.2xx-to-main

nagilson enabled auto-merge November 25, 2024 19:18

marcpopMSFT and others added 3 commits November 26, 2024 09:59

Merge branch 'main' into merge/release/9.0.2xx-to-main

0304a38

Get the xlf files in sync

aab6e93

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

4037180

…se/9.0.2xx-to-main

build-analysis bot mentioned this pull request Dec 3, 2024

Microsoft.NET.Build.Containers.IntegrationTests are pulling from Docker Hub #42026

Closed

Merge branch 'main' into merge/release/9.0.2xx-to-main

3547383

Jason Zhai and others added 2 commits December 4, 2024 19:05

Try skipping Aspire test to unblock failing test

0aabe7a

Disable net3.1 ILLink tests

df734b4

nagilson merged commit 033eead into main Dec 5, 2024
39 checks passed

nagilson deleted the merge/release/9.0.2xx-to-main branch December 5, 2024 22:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/9.0.2xx' => 'main' #44540

[automated] Merge branch 'release/9.0.2xx' => 'main' #44540

Uh oh!

github-actions bot commented Oct 31, 2024

Uh oh!

mthalman commented Nov 6, 2024

Uh oh!

v-wuzhai commented Nov 11, 2024

Uh oh!

marcpopMSFT commented Nov 11, 2024

Uh oh!

marcpopMSFT commented Nov 19, 2024

Uh oh!

ViktorHofer Nov 20, 2024

Uh oh!

ViktorHofer commented Nov 20, 2024

Uh oh!

v-wuzhai commented Nov 22, 2024

Uh oh!

tmat commented Dec 5, 2024 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

		<add key="darc-pub-dotnet-aspnetcore-3cc83de" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-3cc83de3/nuget/v3/index.json" />
		<add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />

[automated] Merge branch 'release/9.0.2xx' => 'main' #44540

[automated] Merge branch 'release/9.0.2xx' => 'main' #44540

Uh oh!

Conversation

github-actions bot commented Oct 31, 2024

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

mthalman commented Nov 6, 2024

Uh oh!

v-wuzhai commented Nov 11, 2024

Uh oh!

marcpopMSFT commented Nov 11, 2024

Uh oh!

marcpopMSFT commented Nov 19, 2024

Uh oh!

ViktorHofer Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

ViktorHofer commented Nov 20, 2024

Uh oh!

v-wuzhai commented Nov 22, 2024

Uh oh!

tmat commented Dec 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

tmat commented Dec 5, 2024 •

edited

Loading