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

github-actions · 2024-12-18T18:53:24Z

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:

tlmii
marcpopMSFT
dsplaisted
v-wuzhai
dotnet-maestro[bot]
surayya-MS
dotnet-bot
invalid-email-address
github-actions[bot]
tmat
edvilme
nagilson
dotnet-sb-bot
JoeRobich
joeloff
v-codyguan
vseanreesermsft

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 git@github.com: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.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/9.0.2xx-to-main origin/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 fetch
git checkout -b merge/release/9.0.2xx-to-main origin/main
git pull git@github.com:dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.

…dnceng/internal/dotnet-runtime This pull request updates the following dependencies [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.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.10 to 8.0.9 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7 - **Build**: 20240924.4 - **Date Produced**: September 24, 2024 10:50:51 PM UTC - **Commit**: 81cabf2857a01351e5ab578947c7403a5b128ad1 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][3] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][3] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][3] - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][3] - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][3] - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][3] - **System.Reflection.MetadataLoadContext**: [from 8.0.1 to 8.0.1][3] - **System.Security.Cryptography.Pkcs**: [from 8.0.1 to 8.0.1][3] - **System.Security.Cryptography.Xml**: [from 8.0.2 to 8.0.2][3] - **System.ServiceProcess.ServiceController**: [from 8.0.1 to 8.0.1][3] - **System.Text.Json**: [from 8.0.5 to 8.0.5][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.10 to 8.0.9][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdcf4a22cf8671c1abe880ebec4cfd906c99588bf&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files [4]: https://git...

Merge from public release/8.0.1xx to internal/release/8.0.1xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code enhancement and dependency updates. #### PR Summary This pull request introduces a new feature for device ID retrieval and updates several dependencies. - Added `src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs` to implement device ID retrieval and caching across different OS platforms. - Updated dependency versions in `eng/Version.Details.xml` for `Microsoft.Net.Compilers.Toolset`, `Microsoft.CodeAnalysis`, and other related packages. - Modified `NuGet.config` to include additional package sources and update existing ones.

…otnet-runtime build 20241017.7 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.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.10-servicing.24474.4 -> To Version 8.0.11-servicing.24517.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.9 -> To Version 8.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64

…otnet-aspnetcore build 20241018.1 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.10-servicing.24468.4 -> To Version 8.0.11-servicing.24518.1

…otnet-windowsdesktop build 20241018.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.10 -> To Version 8.0.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.10-servicing.24468.10 -> To Version 8.0.11-servicing.24518.4 (parent: Microsoft.WindowsDesktop.App.Ref

…otnet-aspnetcore build 20241018.14 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.11-servicing.24518.1 -> To Version 8.0.11-servicing.24518.14

…otnet-aspnetcore build 20241021.4 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.11-servicing.24518.14 -> To Version 8.0.11-servicing.24521.4

…3 repositories This pull request updates the following dependencies [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 8.0.10-servicing.24468.10 to 8.0.11-servicing.24518.4 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7 - **Build**: 20241017.7 - **Date Produced**: October 17, 2024 11:26:32 PM UTC - **Commit**: 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.9 to 8.0.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&_a=files [2]: dotnet/emsdk@d667257...f623714 [DependencyUpdate]: <> (End) [marker]: <> (End:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897 - **Build**: 20241018.1 - **Date Produced**: October 18, 2024 9:36:47 AM UTC - **Commit**: fc878b7641ff2e87598c6425f1a736184deb6619 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24518.1][3] - **dotnet-user-jwts**: [from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24518.1][3] -...

…otnet-aspnetcore build 20241021.16 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.11-servicing.24521.4 -> To Version 8.0.11-servicing.24521.16

…otnet-windowsdesktop build 20241021.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.11 -> To Version 8.0.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.11-servicing.24518.4 -> To Version 8.0.11-servicing.24521.7 (parent: Microsoft.WindowsDesktop.App.Ref

…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897 - **Build**: 20241021.16 - **Date Produced**: October 22, 2024 1:22:37 AM UTC - **Commit**: 47576478939fdd59b4400ad135f47938af486ab3 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.11 to 8.0.11][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.11 to 8.0.11][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.11 to 8.0.11][1] - **Microsoft.JSInterop**: [from 8.0.11 to 8.0.11][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC8e8ededd851fffe2166dd41bf850caabf833d13a&targetVersion=GC47576478939fdd59b4400ad135f47938af486ab3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897) [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 8.0.11-servicing.24518.4 to 8.0.11-servicing.24521.7 (parent: Microsoft.Windows...

…-merge-8.0.1xx-2024-11-12-1242

…112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12

…0241114.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.112-servicing.24555.9 -> To Version 8.0.112-servicing.24564.2

…15.13 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24052.1 -> To Version 7.0.0-preview.24565.13

…1121.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.12-preview-24571-01 -> To Version 17.12.13-preview-24571-03

…24.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24565.13 -> To Version 7.0.0-preview.24574.1

…124.2 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.24527.6 -> To Version 4.8.0-7.24574.2

…merge/release/8.0.1xx-to-release/8.0.3xx

ViktorHofer · 2024-12-18T21:42:41Z

src/roslyn/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Build) The target "GetTargetFrameworksWithPlatformForSingleTargetFramework" does not exist in the project.

Failing because this PR brings a new roslyn with this commit in: dotnet/roslyn@58d7d7b.

cc @jaredpar @jjonescz

OK found the issue: dotnet/roslyn#76506

…ent from nuget.config Fixes #44312 (#45410) Fixes #44312 If a user doesn't have nuget.org as a source in their nuget.config, we shouldn't assume they want it. This sends a message for dotnet tool search if nuget.org is absent, as it is needed for dotnet tool search to work properly, instead of running the command. For other commands like dotnet new details, it does not automatically add nuget.org to the sources. image image (Neither command implicitly went to nuget.org.)

v-wuzhai · 2024-12-19T07:50:23Z

@ViktorHofer Looks like your changes were forcefully overwritten, so I created a new PR #45561 to replace this one.

ViktorHofer · 2024-12-19T08:37:32Z

Wow... Any idea why the bot does a force push?

v-wuzhai · 2024-12-19T08:58:26Z

@f-alizada, do you know why this is happening?

f-alizada · 2024-12-19T12:03:40Z

It force-pushes only in case there are no open PRs opened from this branch.
I'll investigate more on why this is happening, because clearly it was not the case for this particular PR.

…ource' instead of 'resources' (#45115)

…"UseUwpTools" property (#44882)

maestro-prod-Primary and others added 30 commits September 24, 2024 23:59

Merge commit 'c1f738a4ae61eac0fbbd3826753fb7a3eb8030af'

9b27227

Merge commit 'f3835a7fb45497f53fc92ca7dd4a06793884b1cd' into internal…

b3f71fa

…-merge-8.0.1xx-2024-11-12-1242

Fix the template tests

88e514c

Merging internal commits for release/8.0.1xx (#44824)

c6fce02

Update dependencies from https://github.com/dotnet/arcade build 20241…

3911022

…112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12

Fix failing tests using "UseUwp"

d2a4a8f

Update dependencies from https://github.com/dotnet/templating build 2…

ccaa6b0

…0241114.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.112-servicing.24555.9 -> To Version 8.0.112-servicing.24564.2

[release/8.0.1xx] Update dependencies from dotnet/razor (#44900)

2bc3ee8

[release/8.0.1xx] Update dependencies from dotnet/templating (#44883)

c9bfb52

Don't download Windows SDK ref pack for C++ projects

0056886

[release/8.0.1xx] Update dependencies from dotnet/arcade (#44872)

055e879

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

90b59c7

…1121.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.12-preview-24571-01 -> To Version 17.12.13-preview-24571-03

Work around COM concurrency issue when accessing VS instances

0d47aa1

[release/8.0.1xx] Update dependencies from dotnet/razor (#45074)

f93bb0c

[release/8.0.1xx] Update dependencies from dotnet/roslyn (#45080)

4a50aac

Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …

eff3a2c

…merge/release/8.0.1xx-to-release/8.0.3xx

github-actions bot requested review from a team and tmat as code owners December 18, 2024 18:53

dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Dec 18, 2024

[release/9.0.2xx] fix(cli): dotnet help new link opening (#45404)

0c8a668

ViktorHofer approved these changes Dec 18, 2024

View reviewed changes

ViktorHofer mentioned this pull request Dec 18, 2024

[main] Update dependencies from dotnet/arcade #45353

Closed

ViktorHofer enabled auto-merge December 18, 2024 23:00

use the scouting image to unblock the nuget flow.

c28152f

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

Failure on Helix tests - Tests timing out #40074

Open

github-actions bot force-pushed the merge/release/9.0.2xx-to-main branch from 24faa4a to 20ac0a6 Compare December 19, 2024 03:19

This was referenced Dec 19, 2024

slow macOS - "##[error]The job running on agent Azure Pipelines 9 ran longer than the maximum time of 60 minutes." dotnet/dnceng#1883

Open

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

f-alizada mentioned this pull request Dec 19, 2024

The inter branch merge flow in sdk repo force-pushes the changes dotnet/arcade#15352

Closed

2 tasks

marcpopMSFT added 2 commits December 19, 2024 10:17

[release/9.0.2xx] Workaround for issue 40015: nuget restore uses 'res…

9d8b465

…ource' instead of 'resources' (#45115)

Cherry-pick 44859 into release/9.0.2xx: Fix failing tests because of …

e885ce7

…"UseUwpTools" property (#44882)

f-alizada mentioned this pull request Dec 19, 2024

Add PR filtration by source branch dotnet/arcade#15355

Merged

[release/9.0.2xx] Update dependencies from nuget/nuget.client (#45526)

83d20b5

ViktorHofer closed this Dec 19, 2024

auto-merge was automatically disabled December 19, 2024 23:58
Pull request was closed

ViktorHofer deleted the merge/release/9.0.2xx-to-main branch December 19, 2024 23:58

github-actions bot restored the merge/release/9.0.2xx-to-main branch December 20, 2024 10:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

github-actions bot commented Dec 18, 2024

ViktorHofer commented Dec 18, 2024 •

edited

Loading

v-wuzhai commented Dec 19, 2024

ViktorHofer commented Dec 19, 2024

v-wuzhai commented Dec 19, 2024

f-alizada commented Dec 19, 2024

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

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

Conversation

github-actions bot commented Dec 18, 2024

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

ViktorHofer commented Dec 18, 2024 • edited Loading

v-wuzhai commented Dec 19, 2024

ViktorHofer commented Dec 19, 2024

v-wuzhai commented Dec 19, 2024

f-alizada commented Dec 19, 2024

ViktorHofer commented Dec 18, 2024 •

edited

Loading