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

v-wuzhai · 2024-10-15T08:38:26Z

No description provided.

…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

…64e0070-3808-4a54-a5b5-0fd46ecd74db

…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

…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

…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

…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

#43872)

…r is off (#43871)

…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

…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

…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

…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

…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

…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

…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

…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

…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

Co-authored-by: Michael Simons <msimons@microsoft.com>

…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

)

marcpopMSFT · 2024-10-15T16:30:00Z

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 · 2024-10-15T23:19:10Z

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

…Works

tmat · 2024-10-15T23:56:42Z

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

nagilson and others added 30 commits October 3, 2024 12:26

[release/8.0.4xx] Update dependencies from dotnet/razor (#43849)

Loading
Loading status checks…

3d9e991

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#43841)

Loading
Loading status checks…

d477a45

[release/9.0.1xx] Update dependencies from microsoft/vstest (#43874)

Loading
Loading status checks…

5a911a2

Switch PRs back to macos 13

Loading
Loading status checks…

e50e061

Update manpages for 9.0 (#43776)

Loading
Loading status checks…

908961b

Merge remote-tracking branch 'origin/release/9.0.1xx' into locfiles/a…

Loading
Loading status checks…

a1a6d45

…64e0070-3808-4a54-a5b5-0fd46ecd74db

Update branding to 6.0.428 (#43821)

Loading
Loading status checks…

9542cda

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

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

Update dependencies from https://github.com/dotnet/linker build 20240…

Loading
Loading status checks…

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

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

Loading
Loading status checks…

5a0344e

Revert "Clean up error experience when downloading non-tools (#43045)" (

Loading
Loading status checks…

54abeef

#43872)

[release/9.0.1xx] Fix writing dotnet test results when terminal logge…

Loading
Loading status checks…

400deeb

…r is off (#43871)

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

Loading
Loading status checks…

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

Fix for source-build stage 2 compiler errors (#43879)

Loading
Loading status checks…

49e5d17

Update dependencies from https://github.com/dotnet/test-templates bui…

Loading
Loading status checks…

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

[release/9.0.1xx] Update CODEOWNERS (#43906)

Loading
Loading status checks…

dbdec5f

Co-authored-by: Michael Simons <msimons@microsoft.com>

Update dependencies from https://github.com/dotnet/test-templates bui…

Loading
Loading status checks…

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

[release/9.0.1xx] Update dependencies from dotnet/arcade (#43837)

Loading
Loading status checks…

febff60

[release/9.0.1xx] Update dependencies from nuget/nuget.client (#43883)

Loading
Loading status checks…

3e044a7

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

Loading
Loading status checks…

abfc229

)

marcpopMSFT and others added 5 commits October 14, 2024 14:03

.NET 9 RC 2, MAUI baseline manifests (#44162)

Loading
Loading status checks…

3a1bc29

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

Loading
Loading status checks…

5fe8cea

)

[release/9.0.1xx] Update dependencies from dotnet/aspnetcore (#44167)

Loading
Loading status checks…

92c6995

[release/9.0.1xx] Update dependencies from dotnet/scenario-tests (#44154

Loading
Loading status checks…

0009da1

)

Merge branch 'release/9.0.1xx' into release/9.0.2xx

Loading
Loading status checks…

173ba0a

v-wuzhai requested review from a team, tmat, arunchndr and vijayrkn as code owners October 15, 2024 08:38

dotnet-issue-labeler bot added Area-CodeFlow untriaged labels Oct 15, 2024

update .xlf

Loading
Loading status checks…

8bf501f

This was referenced Oct 15, 2024

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #43839

Closed

Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works test fails #44179

Open

switch back to manual versions that are N-1 for implicit versions

Loading
Loading status checks…

a4ef2d0

marcpopMSFT approved these changes Oct 15, 2024

View reviewed changes

Disable Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_…

Loading
Loading status checks…

9661a07

…Works

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

tmat enabled auto-merge (rebase) October 16, 2024 01:17

auto-merge was automatically disabled October 16, 2024 01:18
Rebase failed

tmat merged commit 66c7799 into release/9.0.2xx Oct 16, 2024
31 checks passed

tmat deleted the dev/Jason/merge/release/9.0.1xx-to-release/9.0.2xx branch October 16, 2024 01:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

v-wuzhai commented Oct 15, 2024

marcpopMSFT commented Oct 15, 2024

tmat commented Oct 15, 2024

tmat commented Oct 15, 2024

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

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

Conversation

v-wuzhai commented Oct 15, 2024

marcpopMSFT commented Oct 15, 2024

tmat commented Oct 15, 2024

tmat commented Oct 15, 2024