Skip to content

Commit 1085cdb

Browse files
[main] Source code updates from dotnet/dotnet (#122375)
> [!NOTE] > This is a codeflow update. It may contain both source code changes from > [the VMR](https://github.com/dotnet/dotnet) > as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:f7901f87-9f24-40d6-9bc1-564863937237) ## From https://github.com/dotnet/dotnet - **Subscription**: [f7901f87-9f24-40d6-9bc1-564863937237](https://maestro.dot.net/subscriptions?search=f7901f87-9f24-40d6-9bc1-564863937237) - **Build**: [20251209.8](https://dev.azure.com/dnceng/internal/_build/results?buildId=2857483) ([294068](https://maestro.dot.net/channel/8298/github:dotnet:dotnet/build/294068)) - **Date Produced**: December 9, 2025 11:15:07 PM UTC - **Commit**: [d65136bfc1cc606d916ceaa102a4c1925e2b5d59](dotnet/dotnet@d65136b) - **Commit Diff**: [ce3dea8...d65136b](dotnet/dotnet@ce3dea8...d65136b) - **Branch**: [main](https://github.com/dotnet/dotnet/tree/main) **Updated Dependencies** - From [5.3.0-1.25608.101 to 5.3.0-1.25609.108][1] - Microsoft.CodeAnalysis - Microsoft.CodeAnalysis.Analyzers - Microsoft.CodeAnalysis.CSharp - Microsoft.Net.Compilers.Toolset - From [11.0.100-alpha.1.25608.101 to 11.0.100-alpha.1.25609.108][1] - Microsoft.CodeAnalysis.NetAnalyzers - Microsoft.DotNet.ApiCompat.Task - Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport - From [11.0.0-beta.25608.101 to 11.0.0-beta.25609.108][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Archives - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.Build.Tasks.Installers - Microsoft.DotNet.Build.Tasks.Packaging - Microsoft.DotNet.Build.Tasks.TargetFramework - Microsoft.DotNet.Build.Tasks.Templating - Microsoft.DotNet.Build.Tasks.Workloads - Microsoft.DotNet.CodeAnalysis - Microsoft.DotNet.GenAPI - Microsoft.DotNet.GenFacades - Microsoft.DotNet.Helix.Sdk - Microsoft.DotNet.PackageTesting - Microsoft.DotNet.RemoteExecutor - Microsoft.DotNet.SharedFramework.Sdk - Microsoft.DotNet.XliffTasks - Microsoft.DotNet.XUnitExtensions - From [0.11.5-alpha.25608.101 to 0.11.5-alpha.25609.108][1] - Microsoft.DotNet.Cecil - From [2.9.3-beta.25608.101 to 2.9.3-beta.25609.108][1] - Microsoft.DotNet.XUnitAssert - Microsoft.DotNet.XUnitConsoleRunner - From [11.0.0-alpha.1.25608.101 to 11.0.0-alpha.1.25609.108][1] - Microsoft.NET.Sdk.IL - Microsoft.NETCore.App.Ref - Microsoft.NETCore.ILAsm - runtime.native.System.IO.Ports - System.Reflection.Metadata - System.Reflection.MetadataLoadContext - System.Text.Json - From [7.0.0-preview.1.10901 to 7.0.0-preview.1.11008][1] - NuGet.Frameworks - NuGet.Packaging - NuGet.ProjectModel - NuGet.Versioning - From [3.0.0-alpha.1.25608.101 to 3.0.0-alpha.1.25609.108][1] - System.CommandLine - From [19.1.0-alpha.1.25564.1 to 19.1.0-alpha.1.25574.1](dotnet/dotnet@df75e5e...a504aeb) - runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools [marker]: <> (End:f7901f87-9f24-40d6-9bc1-564863937237) [1]: dotnet/dotnet@ce3dea8...d65136b [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@65e09c0...17c915f - dotnet/aspnetcore@70d8511...344dc33 - dotnet/efcore@9a86835...a6111ce - dotnet/sdk@65384c6...6a6992f - dotnet/source-build-reference-packages@d6738f1...1c0ba39 - dotnet/sourcelink@c84e22b...d656e7b <details> <summary>Diff the source with this PR branch</summary> ```bash darc vmr diff --name-only https://github.com/dotnet/dotnet:d65136bfc1cc606d916ceaa102a4c1925e2b5d59..https://github.com/dotnet/runtime:darc-main-4a243a17-8293-4aac-8417-aa625023bc21 ``` </details> [marker]: <> (End:Footer:CodeFlow PR) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 3d2c5f9 commit 1085cdb

File tree

7 files changed

+217
-217
lines changed

7 files changed

+217
-217
lines changed

eng/Version.Details.props

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 137 additions & 137 deletions
Large diffs are not rendered by default.

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"dotnet": "10.0.100"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25608.101",
12-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25608.101",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25608.101",
11+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25609.108",
12+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25609.108",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25609.108",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
16-
"Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.25608.101"
16+
"Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.25609.108"
1717
}
1818
}

src/mono/sample/Android/AndroidSampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
Condition="'$(ArchiveTests)' != 'true' and '$(DeployAndRun)' == 'true'"
3333
AfterTargets="_AfterAndroidBuild"
3434
DependsOnTargets="$(AndroidBuildDependsOn)" >
35-
<Exec Command="$(DotNetTool) xharness android test --package-name=net.dot.HelloAndroid --instrumentation=net.dot.MonoRunner --app=$(AndroidBundleDir)/bin/HelloAndroid.apk --expected-exit-code=42 --output-directory=$(AndroidBundleDir)/log" />
35+
<Exec Command="&quot;$(DotNetTool)&quot; xharness android test --package-name=net.dot.HelloAndroid --instrumentation=net.dot.MonoRunner --app=&quot;$(AndroidBundleDir)/bin/HelloAndroid.apk&quot; --expected-exit-code=42 --output-directory=&quot;$(AndroidBundleDir)/log&quot;" />
3636
</Target>
3737

3838
<Target Name="CopySampleAppToHelixTestDir"

src/mono/sample/iOS-NativeAOT/Program.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<Target Name="RunAppBundle"
6767
AfterTargets="_AppleGenerateAppBundle"
6868
Condition="'$(DeployAndRun)' == 'true'">
69-
<Exec Condition="'$(TargetOS)' == 'iossimulator'" Command="dotnet xharness apple run --app=$(AppBundlePath) --targets=ios-simulator-64 --output-directory=/tmp/out" />
70-
<Exec Condition="'$(TargetOS)' == 'ios'" Command="dotnet xharness apple run --app=$(AppBundlePath) --targets=ios-device --output-directory=/tmp/out" />
69+
<Exec Condition="'$(TargetOS)' == 'iossimulator'" Command="dotnet xharness apple run --app=&quot;$(AppBundlePath)&quot; --targets=ios-simulator-64 --output-directory=/tmp/out" />
70+
<Exec Condition="'$(TargetOS)' == 'ios'" Command="dotnet xharness apple run --app=&quot;$(AppBundlePath)&quot; --targets=ios-device --output-directory=/tmp/out" />
7171
</Target>
7272

7373
</Project>

src/mono/sample/iOS/Program.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
AfterTargets="_AppleGenerateAppBundle"
4545
Condition="'$(ArchiveTests)' != 'true' and '$(DeployAndRun)' == 'true'">
4646
<!-- Install and run on a device or simulator -->
47-
<Exec Condition="'$(TargetOS)' == 'iossimulator'" Command="dotnet xharness apple run --app=$(AppBundlePath) --targets=ios-simulator-64 --output-directory=/tmp/out" />
48-
<Exec Condition="'$(TargetOS)' == 'ios'" Command="dotnet xharness apple run --app=$(AppBundlePath) --targets=ios-device --output-directory=/tmp/out" />
47+
<Exec Condition="'$(TargetOS)' == 'iossimulator'" Command="dotnet xharness apple run --app=&quot;$(AppBundlePath)&quot; --targets=ios-simulator-64 --output-directory=/tmp/out" />
48+
<Exec Condition="'$(TargetOS)' == 'ios'" Command="dotnet xharness apple run --app=&quot;$(AppBundlePath)&quot; --targets=ios-device --output-directory=/tmp/out" />
4949

5050
<!-- run on maccatalyst -->
51-
<Exec Condition="'$(TargetOS)' == 'maccatalyst'" Command="open -W $(AppBundlePath)" />
51+
<Exec Condition="'$(TargetOS)' == 'maccatalyst'" Command="open -W &quot;$(AppBundlePath)&quot;" />
5252
</Target>
5353

5454
<Target Name="CopySampleAppToHelixTestDir"

src/mono/sample/mbr/apple/AppleDelta.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
<Message Importance="High" Text="Xcode: $(XcodeProjectPath)"/>
7171
<Message Importance="High" Text="App: $(AppBundlePath)"/>
7272

73-
<Exec Condition="'$(TargetOS)' == 'iossimulator'" Command="dotnet xharness apple run --app=$(AppBundlePath) --targets=ios-simulator-64 --output-directory=/tmp/out" />
73+
<Exec Condition="'$(TargetOS)' == 'iossimulator'" Command="dotnet xharness apple run --app=&quot;$(AppBundlePath)&quot; --targets=ios-simulator-64 --output-directory=/tmp/out" />
7474

7575
<!-- run on MacCatalyst -->
76-
<Exec Condition="'$(TargetOS)' == 'maccatalyst'" Command="dotnet xharness apple run --app=$(AppBundlePath) --targets=maccatalyst --output-directory=/tmp/out" />
76+
<Exec Condition="'$(TargetOS)' == 'maccatalyst'" Command="dotnet xharness apple run --app=&quot;$(AppBundlePath)&quot; --targets=maccatalyst --output-directory=/tmp/out" />
7777

7878
</Target>
7979

0 commit comments

Comments
 (0)