Skip to content

[main] Source code updates from dotnet/dotnet #56126

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
jjonescz merged 6 commits into from
Sep 8, 2026
Merged

[main] Source code updates from dotnet/dotnet #56126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95f7df7
Backflow from https://github.com/dotnet/dotnet / 082832b build 330383
dotnet-maestro[bot] Sep 4, 2026
87e4d22
Update dependencies from build 330383
dotnet-maestro[bot] Sep 4, 2026
c809a20
Regenerate file-based app compiler arguments
mthalman Sep 4, 2026
54e12bf
Backflow from https://github.com/dotnet/dotnet / 3c8d132 build 330470
dotnet-maestro[bot] Sep 5, 2026
706bf79
Merge main into darc-main-bb7f1e4a-9576-4884-8c3a-b9494c49f034
dotnet-maestro[bot] Sep 5, 2026
486ad70
Update dependencies from build 330470
dotnet-maestro[bot] Sep 5, 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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.helix.jobmonitor": {
"version": "11.0.0-beta.26452.110",
"version": "11.0.0-beta.26453.118",
"commands": [
"dotnet-helix-job-monitor"
]
Expand Down
250 changes: 125 additions & 125 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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 @@ -27,8 +27,8 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26452.110",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26452.110",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26453.118",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26453.118",
"Microsoft.Build.NoTargets": "3.7.134",
"Microsoft.Build.Traversal": "4.1.82",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.14",
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -37,7 +37,6 @@ .. GetFrameworkReferenceArguments(),
"/deterministic+",
"/langversion:15.0",
"/features:FileBasedProgram",
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig",

@jjonescz jjonescz Sep 4, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hm, why would this disappear from a build of a simple command-line app? Is that expected?

@jjonescz jjonescz Sep 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, I think this comes from dotnet/roslyn#80540, so it is expected.

$"/analyzerconfig:{objDir}/{FileName}.GeneratedMSBuildEditorConfig.editorconfig",
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_11_default.globalconfig",
$"/analyzer:{SdkPath}/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll",
Expand Down
8 changes: 4 additions & 4 deletions ...Tests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATaskTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,27 +408,27 @@ private static TAsyncDisposable Create<TAsyncDisposable>()
where TAsyncDisposable : IAsyncDisposable => throw null;
private static Task<TAsyncDisposable> CreateAsync<TAsyncDisposable>()
where TAsyncDisposable : IAsyncDisposable => throw null;

public async Task M1<TAsyncDisposable>()
where TAsyncDisposable : IAsyncDisposable
{
await using var resource = Create<TAsyncDisposable>().ConfigureAwait(false);
}

public async Task M2<TAsyncDisposable>()
where TAsyncDisposable : IAsyncDisposable
{
await using var resource = (await CreateAsync<TAsyncDisposable>().ConfigureAwait(false)).ConfigureAwait(false);
}

public async Task M3<TAsyncDisposable>()
where TAsyncDisposable : IAsyncDisposable
{
await using (var resource = Create<TAsyncDisposable>().ConfigureAwait(false))
{
}
}

public async Task M4<TAsyncDisposable>()
where TAsyncDisposable : IAsyncDisposable
{
Expand Down
2 changes: 0 additions & 2 deletions src/Workloads/Manifests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsShipping Condition="'$(MSBuildProjectName)' == 'Microsoft.NET.Workload.Emscripten.Current.Transport.Manifest'">false</IsShipping>
<IsShippingPackage>$(IsShipping)</IsShippingPackage>
<IncludeSymbols>false</IncludeSymbols>
<PackageVersion Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">$(DotNet1xxWorkloadManifestVersion)</PackageVersion>
Expand All @@ -22,7 +21,6 @@
<!-- Append the version iteration if it's not empty -->
<_workloadVersionSuffix Condition="'$(_workloadVersionSuffix)' != '' and '$(PrereleaseVersionIteration)' != ''">$(_workloadVersionSuffix).$(PrereleaseVersionIteration)</_workloadVersionSuffix>
<PackageId>$(MSBuildProjectName)-$(BuiltinWorkloadFeatureBand)$(_workloadVersionSuffix)</PackageId>
<PackageId Condition="'$(MSBuildProjectName)' == 'Microsoft.NET.Workload.Emscripten.Current.Transport.Manifest'">Microsoft.NET.Workload.Emscripten.Current.Manifest-$(BuiltinWorkloadFeatureBand).Transport</PackageId>
</PropertyGroup>

<PropertyGroup>
Expand Down
3 changes: 0 additions & 3 deletions ...rent.Transport.Manifest/Microsoft.NET.Workload.Emscripten.Current.Transport.Manifest.proj
View file
Open in desktop

This file was deleted.

Loading