Skip to content
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

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

Open
wants to merge 102 commits into
base: main
Choose a base branch
from
Open

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

wants to merge 102 commits into from

Conversation

v-wuzhai
Copy link
Member

No description provided.

dotnet-maestro bot and others added 30 commits November 23, 2024 13:13
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
2bbe922 
…120.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
ecfed74 
…0241123.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.112-servicing.24564.2 -> To Version 8.0.112-servicing.24573.2
@v-wuzhai
[release/8.0.1xx] Update dependencies from dotnet/templating (#45070)
253272f
@v-wuzhai
[release/8.0.1xx] Update dependencies from dotnet/arcade (#45063)
b9df3ed
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sourcelink build 2…
485bc9a 
…0241217.1

Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab
 From Version 9.0.0-beta.24603.2 -> To Version 9.0.0-beta.24617.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
cd554fc 
…1218.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.12.18-preview-24610-04 -> To Version 17.12.21-preview-24618-01
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-refer…
8e17f09 
…ence-packages build 20241219.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24604.1 -> To Version 9.0.0-alpha.1.24619.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/scenario-tests bui…
86715a6 
…ld 20241220.5

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.24514.1 -> To Version 9.0.0-preview.24620.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/razor build 202412…
b712eac 
…29.2

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.24574.6 -> To Version 7.0.0-preview.24629.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
bfd72f1 
…229.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.12.0-3.24574.8 -> To Version 4.12.0-3.24629.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
da62d84 
…229.1

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.24574.6 -> To Version 4.10.0-3.24629.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
76b8c5d 
…223.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
6ee497c 
…223.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24572.2 -> To Version 9.0.0-beta.24623.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20241…
2d345cf 
…231.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.24574.8 -> To Version 4.12.0-3.24631.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/scenario-tests bui…
fd378e1 
…ld 20250101.2

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.24514.1 -> To Version 9.0.0-preview.25051.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
b2149cc 
…106.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.10.0-3.24574.6 -> To Version 4.10.0-3.25056.12
@surayya-MS
fix setting ContainerAppCommand
95c4909
@vseanreesermsft
Update branding to 8.0.113
88622d9
@vseanreesermsft
Update branding to 8.0.309
0313dc2
@vseanreesermsft
Update branding to 8.0.406
3945c33
@marcpopMSFT
Update branding to 8.0.113 (#45756)
a537663
@marcpopMSFT
Update branding to 8.0.309 (#45757)
42ea0e3
@marcpopMSFT
Update branding to 8.0.406 (#45758)
3422e38
@v-wuzhai
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
0acc242 
…merge/release/8.0.4xx-to-release/9.0.1xx
@v-wuzhai
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
35ee127 
…merge/release/8.0.3xx-to-release/8.0.4xx
@v-wuzhai
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
6c777ba 
…merge/release/8.0.1xx-to-release/8.0.3xx
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
416d0fa 
…0250107.5

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.405-servicing.24575.2 -> To Version 8.0.406-servicing.25057.5
@dotnet-maestro
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45358
f3c48f7 
)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[release/9.0.1xx] Update dependencies from dotnet/xdt (#45378)
7a28873 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[release/8.0.3xx] Update dependencies from dotnet/razor (#45449)
0d81978 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Sergio0694 and others added 19 commits January 10, 2025 16:33
@Sergio0694
Update .xlf files
863c60d
@Sergio0694
Add 'NETSDK1219' to deleted errors list
96fa393
@BeyondEvil @baronfel
Add support for using a pinned Digest for Container base images (#44461)
bb0a6e5 
Co-authored-by: Chet Husk <[email protected]>
@tmat
Use -e to set env variables (#45844)
4ab59c9
@Forgind
Make assembly version logic more robust Fixes #44042 (#45518)
fd19bf8 
Fixes #44042

Replaces the way we look for assembly version.
@Forgind
Skip experimental in recommending workloads (#45767)
ad31c61 
We've had issues around (heuristically) finding the appropriate workloads to recommend that the user install if they're missing packs. This should help in that it will avoid recommending experimental workloads if there are any other options.

I don't feel too attached to this PR.
@marcpopMSFT
[release/9.0.2xx] Update dependencies from dotnet/arcade (#45862)
6d7455a
@marcpopMSFT
Remove 'NETSDK1219' warning (#45538)
f6b778f
@marcpopMSFT
Merge branch 'release/9.0.2xx' into merge/release/9.0.1xx-to-release/…
30078a2 
…9.0.2xx
@Forgind
Support package@version syntax in dotnet new install, partial fix for #…
a84f7d8 
…45422 (#45545)

Progress towards #45422

This adds support for package@version syntax without removing support for package::version syntax. I'll add a follow-up PR in main to add a warning, and then we can remove support for package::version syntax in .NET 11.
@tmat
[dotnet-watch] Microsoft.DotNet.HotReload.Agent.PipeRpc source package (
7002321 
#45603)
@marcpopMSFT
Backport #44461 to release/9.0.2xx (#45594)
c3fb9d1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/scenario-tests bui…
7e378e2 
…ld 20250111.2

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25051.2 -> To Version 9.0.0-preview.25061.2
@v-wuzhai
[release/9.0.2xx] Update dependencies from dotnet/scenario-tests (#45902
a5c6b36 
)
@v-wuzhai
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#45860)
576cefb
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
443a40a 
…0250112.7

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.200-rtm.25059.2 -> To Version 9.0.200-rtm.25062.7
@v-wuzhai
[release/9.0.2xx] Update dependencies from dotnet/templating (#45916)
029b4b8
@v-wuzhai
Merge branch 'release/9.0.2xx'
9bfce37
@v-wuzhai
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
a83b881 
…se/9.0.2xx-to-main
@v-wuzhai v-wuzhai requested review from a team and tmat as code owners January 14, 2025 07:03
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Workloads untriaged Request triage from a team member labels Jan 14, 2025
@v-wuzhai v-wuzhai mentioned this pull request Jan 14, 2025
Closed
@v-wuzhai
Copy link
Member Author

@tmat PTAL

@build-analysis build-analysis bot mentioned this pull request Jan 14, 2025
Open
@marcpopMSFT
Copy link
Member

@tmat it's reporting a package downgrade from your change here:
src/BlazorWasmSdk/Tasks/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj(0,0): error NU1109: (NETCORE_ENGINEERING_TELEMETRY=Restore) Detected package downgrade: System.Buffers from 4.6.0 to centrally defined 4.5.1. Update the centrally managed package version to a higher version.

#45603

Can we get rid of the condition and just use the 4.6.0 version everywhere?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Area-Workloads 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 @marcpopMSFT @surayya-MS @vseanreesermsft @tmat @Forgind @kasperk81 @Sergio0694 @BeyondEvil