Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #44178

Merged
merged 730 commits into from
Oct 16, 2024
Merged

Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #44178

merged 730 commits into from
Oct 16, 2024

Conversation

v-wuzhai
Copy link
Member

No description provided.

nagilson and others added 30 commits October 3, 2024 12:26
@nagilson
[release/8.0.4xx] Update dependencies from dotnet/razor (#43849)
3d9e991
@nagilson
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#43841)
d477a45
@nagilson
[release/9.0.1xx] Update dependencies from microsoft/vstest (#43874)
5a911a2
@marcpopMSFT
Switch PRs back to macos 13
e50e061
@dotnet-maestro
Update dependencies from https://github.com/nuget/nuget.client build …
b1ee021 
…6.12.0.127

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.12.0-rc.120 -> To Version 6.12.0-rc.127
@marcpopMSFT
Update manpages for 9.0 (#43776)
908961b
@marcpopMSFT
Merge remote-tracking branch 'origin/release/9.0.1xx' into locfiles/a…
a1a6d45 
…64e0070-3808-4a54-a5b5-0fd46ecd74db
@marcpopMSFT
Update branding to 6.0.428 (#43821)
9542cda
@dotnet-maestro @marcpopMSFT
Update dependencies from https://github.com/dotnet/linker build 20240…
170b529 
…923.1

Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24429.1 -> To Version 6.0.200-1.24473.1
@dotnet-maestro @marcpopMSFT
Update dependencies from https://github.com/dotnet/linker build 20240…
b3b0789 
…924.1

Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24473.1 -> To Version 6.0.200-1.24474.1
@dotnet-maestro @marcpopMSFT
Update dependencies from https://github.com/dotnet/linker build 20240…
4c28d29 
…924.2

Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24474.1 -> To Version 6.0.200-1.24474.2
@nagilson
[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#43835)
5a0344e
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
62bea71 
…003.12

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.8.0-7.24501.6 -> To Version 4.8.0-7.24503.12
@joeloff
Revert "Clean up error experience when downloading non-tools (#43045)" (
54abeef 
#43872)
@nohwnd
[release/9.0.1xx] Fix writing dotnet test results when terminal logge…
400deeb 
…r is off (#43871)
@dotnet-maestro
Update dependencies from https://github.com/microsoft/vstest build 20…
42c977a 
…241004.1

Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI
 From Version 17.12.0-release-24503-03 -> To Version 17.12.0-release-24504-01
@dotnet-maestro
Update dependencies from https://github.com/dotnet/razor build 202410…
97ab07c 
…02.3

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.24454.1 -> To Version 7.0.0-preview.24502.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
f677f0e 
…003.14

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.10.0-3.24453.2 -> To Version 4.10.0-3.24503.14
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
d3a3cea 
…003.19

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.11.0-3.24502.13 -> To Version 4.11.0-3.24503.19
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
eb0b9bd 
…004.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.12.0-3.24502.14 -> To Version 4.12.0-3.24504.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
c04c445 
…1004.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.12.0-preview-24477-01 -> To Version 17.12.3-preview-24504-01
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2024…
e27982c 
…1003.8

Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.0-rtm.24501.6 -> To Version 9.0.0-rtm.24503.8
@dotnet-maestro
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
6bd59f8 
…ld 20241004.2

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-rtm.24503.2 -> To Version 9.0.0-rtm.24504.2

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-rtm.24503.3 -> To Version 9.0.0-rtm.24503.10 (parent: Microsoft.WindowsDesktop.App.Ref
@NikolaMilosavljevic
Fix for source-build stage 2 compiler errors (#43879)
49e5d17
@dotnet-maestro
Update dependencies from https://github.com/dotnet/test-templates bui…
338e49f 
…ld 20241004.1

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rc.24503.1 -> To Version 1.1.0-rc.24504.1
@github-actions @MichaelSimons
[release/9.0.1xx] Update CODEOWNERS (#43906)
dbdec5f 
Co-authored-by: Michael Simons <msimons@microsoft.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/test-templates bui…
7fa2547 
…ld 20241004.2

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rc.24504.1 -> To Version 1.1.0-rc.24504.2
@nagilson
[release/9.0.1xx] Update dependencies from dotnet/arcade (#43837)
febff60
@nagilson
[release/9.0.1xx] Update dependencies from nuget/nuget.client (#43883)
3e044a7
@nagilson
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#43903
abfc229 
)
@v-wuzhai v-wuzhai requested review from a team, tmat, arunchndr and vijayrkn as code owners October 15, 2024 08:38
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Oct 15, 2024
This was referenced Oct 15, 2024
Closed
Open
@marcpopMSFT
Copy link
Member

Change looks reasonable after I fixed the implicit version. I kind of wish git supported partial merges so we could flow all the string changes first and then the rest as GH does not handle large PRs like this well and much of that is the string changes.

@tmat
Copy link
Member

tmat commented Oct 15, 2024

@v-wuzhai Could you disable the failing test and merge?

@tmat tmat requested a review from a team as a code owner October 15, 2024 23:56
@tmat
Copy link
Member

tmat commented Oct 15, 2024

@v-wuzhai Pushed commit disabling the test and filed #44210 to reenable

@tmat tmat enabled auto-merge (rebase) October 16, 2024 01:17
auto-merge was automatically disabled October 16, 2024 01:18

Rebase failed

@tmat tmat merged commit 66c7799 into release/9.0.2xx Oct 16, 2024
31 checks passed
@tmat tmat deleted the dev/Jason/merge/release/9.0.1xx-to-release/9.0.2xx branch October 16, 2024 01:21
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@marcpopMSFT marcpopMSFT marcpopMSFT approved these changes

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

@arunchndr arunchndr Awaiting requested review from arunchndr

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

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

Successfully merging this pull request may close these issues.