Skip to content

[release/11.0.1xx-preview1] Source code updates from dotnet/dotnet #52727

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

Merged
lewing merged 9 commits into from
Feb 7, 2026
Merged

[release/11.0.1xx-preview1] Source code updates from dotnet/dotnet #52727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b76f223
Update dependencies
dotnet-maestro[bot] Jan 29, 2026
54edac5
Update dependencies
dotnet-maestro[bot] Jan 29, 2026
88861f7
Merge branch 'release/11.0.1xx-preview1' into darc-release/11.0.1xx-p…
DonnaChen888 Jan 30, 2026
9dc5b45
Update dependencies
dotnet-maestro[bot] Jan 30, 2026
99cb42d
Add System.IO.Compression.ZStandard to WASM baselines
dsplaisted Jan 30, 2026
605b2b8
Merge branch 'release/11.0.1xx-preview1' into darc-release/11.0.1xx-p…
DonnaChen888 Feb 4, 2026
4a5be3a
Update CSC arguments
jjonescz Feb 4, 2026
966f25d
Update the canshow help baselines
marcpopMSFT Feb 6, 2026
882951f
Backflow from build 20260204.18
ViktorHofer Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 133 additions & 133 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

534 changes: 267 additions & 267 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals build.ubuntu.2204.amd64
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: Azure-Linux-3-Amd64
Expand All @@ -69,10 +69,10 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
demands: ImageOverride -equals Azure-Linux-3-Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}

Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26069.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26069.105",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26104.118",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26104.118",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
Expand Down
1 change: 1 addition & 0 deletions src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ private IEnumerable<string> GetCscArguments(
$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.Compression.dll",
$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.Compression.FileSystem.dll",
$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.Compression.ZipFile.dll",
$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.Compression.Zstandard.dll",
Copy link
Member

@ViktorHofer ViktorHofer Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jjonescz does this impact P1 meaning we should fix this for the produced P1 SDK?

Copy link
Member

@ViktorHofer ViktorHofer Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from that, are there any plans to avoid these hardcodes?

Copy link
Member

@jjonescz jjonescz Feb 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this impact P1 meaning we should fix this for the produced P1 SDK?

If the DLL is supposed to be in P1, then without this change it won't be referenced by file-based apps that skip builds, yeah. (Sounds like a low priority edge case to me though.)

Aside from that, are there any plans to avoid these hardcodes?

That would be straightforward to do technically I think but I would rather avoid that, that's why I chose this hard-coding in the first place; I have seen several times before that some unintended changes tried to slip through here - if this was automated, no-one would notice that. Also we only hardcode here the set of CSC arguments for the simplest command-line app. That should hardly ever change - if there is large change it's probably a bug - and so it seems like a good test in general to have (not just for file-based apps).

Copy link
Member

@ViktorHofer ViktorHofer Feb 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you hardcode all reference assemblies that are part of the microsoft.netcore.app.ref targeting pack. That will always change (grow). The source of truth is the ref pack's FrameworkList.xml file which provides the list of assemblies to reference and the TargetFrameworkVersion.

cc @ericstj for the ref pack

Copy link
Member

@jjonescz jjonescz Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, we can use that xml file instead of hardcoding the list of references, that makes sense to me.

Copy link
Member

@akoeplinger akoeplinger Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the user have a way to target net10.0 with this? the System.IO.Compression.Zstandard.dll won't exist in that reference pack and looks like it'd also set NET11_0_OR_GREATERdefine

Copy link
Member

@jjonescz jjonescz Feb 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the user have a way to target net10.0 with this?

They can set #:property TargetFramework=net10.0 or use Directory.Build.props or something like that - all of which will skip that optimized path (which uses hard-coded CSC args) and fallback to full MSBuild instead.

Copy link
Member

@ViktorHofer ViktorHofer Feb 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jjonescz since this PR is already merged, please file a tracking issue to capture our feedback around avoiding hardcodes

Copy link
Member

@jjonescz jjonescz Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#52934

Copy link
Member

@nagilson nagilson Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#53086

$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.dll",
$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.FileSystem.AccessControl.dll",
$"/reference:{DotNetRootPath}/packs/Microsoft.NETCore.App.Ref/{RuntimeVersion}/ref/net{TargetFrameworkVersion}/System.IO.FileSystem.dll",
Expand Down
177 changes: 176 additions & 1 deletion ...GenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,6 +1580,29 @@
"FileLength": -1,
"LastWriteTime": "0001-01-01T00:00:00+00:00"
},
{
"Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.Compression.Zstandard.wasm",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.IO.Compression.Zstandard.wasm",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "WasmResource",
"AssetTraitValue": "runtime",
"Fingerprint": "__fingerprint__",
"Integrity": "__integrity__",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\System.IO.Compression.Zstandard.wasm",
"FileLength": -1,
"LastWriteTime": "0001-01-01T00:00:00+00:00"
},
{
"Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.Compression.wasm",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -6364,6 +6387,29 @@
"FileLength": -1,
"LastWriteTime": "0001-01-01T00:00:00+00:00"
},
{
"Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.Compression.Zstandard.wasm.gz",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\",
"BasePath": "/",
"RelativePath": "_framework/System.IO.Compression.Zstandard.wasm.gz",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Alternative",
"AssetMergeBehavior": "",
"AssetMergeSource": "",
"RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.Compression.Zstandard.wasm",
"AssetTraitName": "Content-Encoding",
"AssetTraitValue": "gzip",
"Fingerprint": "__fingerprint__",
"Integrity": "__integrity__",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\System.IO.Compression.Zstandard.wasm.gz",
"FileLength": -1,
"LastWriteTime": "0001-01-01T00:00:00+00:00"
},
{
"Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.Compression.wasm.gz",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -12240,6 +12286,43 @@
}
]
},
{
"Route": "_framework/System.IO.Compression.Zstandard.wasm",
"AssetFile": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.Compression.Zstandard.wasm",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Cache-Control",
"Value": "no-cache"
},
{
"Name": "Content-Length",
"Value": "__content-length__"
},
{
"Name": "Content-Type",
"Value": "application/wasm"
},
{
"Name": "ETag",
"Value": "__etag__"
},
{
"Name": "Last-Modified",
"Value": "__last-modified__"
},
{
"Name": "Vary",
"Value": "Accept-Encoding"
}
],
"EndpointProperties": [
{
"Name": "integrity",
"Value": "__integrity__"
}
]
},
{
"Route": "_framework/System.IO.Compression.wasm",
"AssetFile": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.Compression.wasm",
Expand Down Expand Up @@ -23763,6 +23846,98 @@
}
]
},
{
"Route": "_framework/System.IO.Compression.Zstandard.wasm.gz",
"AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.Compression.Zstandard.wasm.gz",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Cache-Control",
"Value": "no-cache"
},
{
"Name": "Content-Encoding",
"Value": "gzip"
},
{
"Name": "Content-Length",
"Value": "__content-length__"
},
{
"Name": "Content-Type",
"Value": "application/wasm"
},
{
"Name": "ETag",
"Value": "__etag__"
},
{
"Name": "Last-Modified",
"Value": "__last-modified__"
},
{
"Name": "Vary",
"Value": "Accept-Encoding"
}
],
"EndpointProperties": [
{
"Name": "integrity",
"Value": "__integrity__"
}
]
},
{
"Route": "_framework/System.IO.Compression.Zstandard.wasm",
"AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.Compression.Zstandard.wasm.gz",
"Selectors": [
{
"Name": "Content-Encoding",
"Value": "gzip",
"Quality": "__quality__"
}
],
"ResponseHeaders": [
{
"Name": "Cache-Control",
"Value": "no-cache"
},
{
"Name": "Content-Encoding",
"Value": "gzip"
},
{
"Name": "Content-Length",
"Value": "__content-length__"
},
{
"Name": "Content-Type",
"Value": "application/wasm"
},
{
"Name": "ETag",
"Value": "__etag__"
},
{
"Name": "Last-Modified",
"Value": "__last-modified__"
},
{
"Name": "Vary",
"Value": "Accept-Encoding"
}
],
"EndpointProperties": [
{
"Name": "integrity",
"Value": "__integrity__"
},
{
"Name": "original-resource",
"Value": "__original-resource__"
}
]
},
{
"Route": "_framework/System.IO.Compression.wasm.gz",
"AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.Compression.wasm.gz",
Expand Down Expand Up @@ -37077,4 +37252,4 @@
]
}
]
}
}
Loading
Loading