Skip to content

Merge branch 'release/9.0.2xx' => 'main' #45614

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
Merged
merged 24 commits into from
Jan 7, 2025
Merged

Merge branch 'release/9.0.2xx' => 'main' #45614

merged 24 commits into from
Jan 7, 2025

Conversation

v-wuzhai
Copy link
Contributor

No description provided.

Sergio0694 and others added 18 commits November 14, 2024 16:47
@Sergio0694
Fix failing tests using "UseUwp"
d2a4a8f
@YehezkelShB
Workaround for issue 40015: nuget restore uses 'resource' instead of …
436d2aa 
…'resources'

Fixes #40015
@Evangelink
Bump MSTest templates to 3.6.4
0bf8fbd
@Evangelink
Merge branch 'release/9.0.2xx' into mstest
adcb4b4
@dotnet-maestro
Update dependencies from https://github.com/nuget/nuget.client build …
71538aa 
…6.13.0.100

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.13.0-rc.98 -> To Version 6.13.0-rc.100
@marcpopMSFT
use the scouting image to unblock the nuget flow.
c28152f
@marcpopMSFT
[release/9.0.2xx] Workaround for issue 40015: nuget restore uses 'res…
9d8b465 
…ource' instead of 'resources' (#45115)
@marcpopMSFT
Cherry-pick 44859 into release/9.0.2xx: Fix failing tests because of …
e885ce7 
…"UseUwpTools" property (#44882)
@dsplaisted
[release/9.0.2xx] Update dependencies from nuget/nuget.client (#45526)
83d20b5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/razor build 202412…
d3b1684 
…19.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.24612.1 -> To Version 9.0.0-preview.24619.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/razor build 202412…
1ab03a5 
…19.4

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.24612.1 -> To Version 9.0.0-preview.24619.4
@Evangelink
Merge branch 'release/9.0.2xx' into mstest
a0137c6
@Evangelink
Bump MSTest templates to 3.6.4 (#45278)
88c3c7b
@dsplaisted
[release/9.0.2xx] Update dependencies from dotnet/razor (#45574)
79f2919
@tmat
File watcher improvements (#45131)
b810aa4
@tmat
[dotnet-watch] Make pipe reads and writes fully async (#45495)
bfa1bbc
@tmat
Use project name in project path map to account for multi-targeting (#…
2f99a87 
…45602)
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
a952a0c 
…se/9.0.2xx-to-main
@v-wuzhai v-wuzhai requested review from tmat and a team as code owners December 23, 2024 03:48
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Dec 23, 2024
This was referenced Dec 23, 2024
Closed
Open
Open
@v-wuzhai
Copy link
Contributor Author

@tmat Looks like the Microsoft.DotNet.Watch.UnitTests.ApplyDeltaTests.MauiBlazor test failed due to resource processing errors and a test host process crash. Could you take a look?

@v-wuzhai v-wuzhai mentioned this pull request Dec 23, 2024
Merged
@build-analysis build-analysis bot mentioned this pull request Dec 23, 2024
Open
3 tasks
@v-wuzhai
Copy link
Contributor Author

v-wuzhai commented Dec 24, 2024 •
edited
Loading

@dotnet/source-build @ViktorHofer Could you take a look at the source-build failures here?

@build-analysis build-analysis bot mentioned this pull request Dec 24, 2024
Open
@v-wuzhai
Copy link
Contributor Author

v-wuzhai commented Dec 30, 2024 •
edited
Loading

@tmat I noticed that the Microsoft.DotNet.Watch.UnitTests.ApplyDeltaTests.MauiBlazor test failed. Should we skip this test for now?

@build-analysis build-analysis bot mentioned this pull request Dec 30, 2024
Open
@ViktorHofer
Copy link
Member

[xUnit.net 00:22:33.26] dotnet-watch.Tests: [Long Running Test] 'Microsoft.DotNet.Watch.UnitTests.ApplyDeltaTests.MauiBlazor', Elapsed: 00:15:22

The test hang happens consistently in this and the previous builds. @tmat

@ViktorHofer ViktorHofer merged commit b02b70d into main Jan 7, 2025
34 of 37 checks passed
@ViktorHofer ViktorHofer deleted the dev/Jason/9.0.2xx-to-main branch January 7, 2025 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

@tmat tmat Awaiting requested review from tmat tmat is a code owner

Assignees
No one assigned
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@v-wuzhai @ViktorHofer @Sergio0694 @YehezkelShB @Evangelink @marcpopMSFT @dsplaisted @tmat @jkoritzinsky