dotnet · max-charlamb · Apr 26, 2025 · Apr 28, 2025 · Apr 29, 2025 · Apr 30, 2025
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 .vs/
 *.VC.db
 .venv/
+build.slnx
 
 # Build results
 [Aa]rtifacts/

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,8 +9,11 @@
     <LangVersion>Latest</LangVersion>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
+    <IsShipping>false</IsShipping>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -33,6 +36,8 @@
   -->
 
   <PropertyGroup>
+    <SrcDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src'))</SrcDir>
+    <TestDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'tests'))</TestDir>
     <ArtifactsDotnetTestDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'dotnet-test'))</ArtifactsDotnetTestDir>
   </PropertyGroup>
 
@@ -72,4 +77,13 @@
     <SupportedXUnitTestTargetFrameworks>net8.0</SupportedXUnitTestTargetFrameworks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetArch)' != 'x86'">
+    <DotNetInstallRoot>$(RepoRoot).dotnet-test\</DotNetInstallRoot>
+    <RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE</RegistryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetArch)' == 'x86'">
+    <DotNetInstallRoot>$(RepoRoot).dotnet-test\x86\</DotNetInstallRoot>
+    <RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node</RegistryRoot>
+  </PropertyGroup>
 </Project>
diff --git a/NuGet.config b/NuGet.config
@@ -7,7 +7,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
-    <add key="darc-pub-dotnet-dotnet-7dedd35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7dedd353/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-dotnet-5ddd0dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5ddd0ddc/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->

diff --git a/THIRD-PARTY-NOTICES.TXT b/THIRD-PARTY-NOTICES.TXT
@@ -1559,7 +1559,7 @@ SOFTWARE.
 
 -------------------------------------------------
 
-Source in src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source
+Source in src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source
 source found at https://github.com/xunit/samples.xunit.
 
 This set of code is covered by the following license:

diff --git a/build.proj b/build.proj
@@ -4,5 +4,4 @@
     <ProjectReference Include="src/dirs.proj" />
     <ProjectReference Include="src/tests/dirs.proj" Condition="'$(SkipTests)' != 'true'" />
   </ItemGroup>
-
 </Project>
@@ -111,10 +111,11 @@ test.cmd
 
 ## Loading solution file
 
-For a better dev inner loop experience, load `build.sln` at the root of the repository into either VS or VSCode.
-
-This file is generated from the `build.proj` traversal project and can be regenerated/updated using:
+For a better dev inner loop experience, generate the `build.slnx` file using
 
 ```pwsh
-./eng/generate-sln.ps1
+# Ensure local .dotnet is bootstrapped first (run build.cmd once if new clone)
+./eng/generate-slnx.ps1
 ```
+
+then load the file into either VS or VSCode.
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -14,22 +14,22 @@ This file should be imported by eng/Versions.props
     <XamarinAndroidToolsAndroidSdkPackageVersion>1.0.105-preview.225</XamarinAndroidToolsAndroidSdkPackageVersion>
     <!-- dotnet/dotnet dependencies -->
     <MicrosoftAspNetCoreAppRefPackageVersion>10.0.2</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.2-servicing.25601.110</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25601.110</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25601.110</MicrosoftCodeAnalysisAnalyzersPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25601.110</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.2-servicing.25603.103</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisAnalyzersPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.102</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftNETSdkPackageVersion>10.0.102-servicing.25601.110</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftNETSdkPackageVersion>10.0.102-servicing.25603.103</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25601.110</MicrosoftNETCorePlatformsPackageVersion>
-    <runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
-    <runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
-    <runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
-    <runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
-    <runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
-    <runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25603.103</MicrosoftNETCorePlatformsPackageVersion>
+    <runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
+    <runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
+    <runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
+    <runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
+    <runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
+    <runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
     <!-- dotnet/arcade dependencies -->
     <MicrosoftDotNetRemoteExecutorPackageVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorPackageVersion>
   </PropertyGroup>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -19,88 +19,88 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25601.110">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25601.110">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
     </Dependency>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
-    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.102-servicing.25601.110">
+    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.102-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.2">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
     <!-- Latest shared runtime version updated by darc -->
     <!-- We use platforms for the unstable package version and
       the ref pack as the stable version. We need them as download links
       use the unstable version, but the installed assets are all stable.  -->
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
+    <Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
     <!--
       These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
       Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
       they do not break the local dev experience.
     -->
-    <Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25601.110">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25601.110">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25601.110">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25603.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
+      <Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -8,6 +8,7 @@ Param(
     [switch] $privatebuild,
     [switch] $ci,
     [switch][Alias('bl')]$binaryLog,
+    [switch] $skiptest,
     [switch] $skipmanaged,
     [switch] $skipnative,
     [switch] $bundletools,
@@ -67,6 +68,10 @@ if (-not $skipnative) {
 
 # Install sdk for building, restore and build managed components.
 if (-not $skipmanaged) {
+    if ($skiptest) {
+        $remainingargs = "/p:SkipTests=true " + $remainingargs
+    }
+
     Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity $bl /p:TargetOS=$os /p:TargetArch=$architecture /p:TestArchitectures=$architecture $remainingargs"
 
     if ($lastExitCode -ne 0) {
@@ -111,7 +116,8 @@ if ($test) {
           /p:DotnetRuntimeDownloadVersion="$dotnetruntimedownloadversion" `
           /p:RuntimeSourceFeed="$runtimesourcefeed" `
           /p:RuntimeSourceFeedKey="$runtimesourcefeedkey" `
-          /p:LiveRuntimeDir="$liveRuntimeDir" 
+          /p:LiveRuntimeDir="$liveRuntimeDir" `
+          /p:IsTestRun=true
 
         if ($lastExitCode -ne 0) {
             exit $lastExitCode

diff --git a/eng/build.sh b/eng/build.sh
@@ -29,6 +29,7 @@ __SkipGenerateVersion=0
 __InstallRuntimes=0
 __PrivateBuild=0
 __Test=0
+__TestBuild=1
 __UnprocessedBuildArgs=
 __UseCdac=0
 __LiveRuntimeDir=
@@ -105,6 +106,10 @@ handle_arguments() {
             __Test=1
             ;;
 
+        skiptest|-skiptest)
+            __TestBuild=0
+            ;;
+
         usecdac|-usecdac)
             __UseCdac=1
             ;;
@@ -219,6 +224,11 @@ if [[ "$__ManagedBuild" == 1 ]]; then
 
     # __CommonMSBuildArgs contains TargetOS property
     echo "Commencing managed build for $__BuildType in $__RootBinDir/bin"
+
+    if [[ "$__TestBuild" != 1 ]]; then
+        __ManagedBuildArgs="$__ManagedBuildArgs /p:SkipTests=true"
+    fi
+
     "$__RepoRootDir/eng/common/build.sh" \
         --configuration "$__BuildType" \
         /p:TargetArch="$__TargetArch" \
@@ -251,7 +261,7 @@ if [[ "$__InstallRuntimes" == 1 || "$__PrivateBuild" == 1 ]]; then
         /p:TargetArch="$__TargetArch" \
         /p:TargetRid="$__TargetRid" \
         /p:TestArchitectures="$__TargetArch" \
-        /p:LiveRuntimeDir="$__LiveRuntimeDir" 
+        /p:LiveRuntimeDir="$__LiveRuntimeDir"
 fi
 
 #
@@ -314,6 +324,8 @@ if [[ "$__Test" == 1 ]]; then
         /p:RuntimeSourceFeed="$__RuntimeSourceFeed" \
         /p:RuntimeSourceFeedKey="$__RuntimeSourceFeedKey" \
         /p:LiveRuntimeDir="$__LiveRuntimeDir" \
+        /p:IsTestRun=true \
+        $__ManagedBuildArgs \
         $__CommonMSBuildArgs
 
       if [ $? != 0 ]; then
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     .vs/
     *.VC.db
     .venv/
+    build.slnx
     # Build results
     [Aa]rtifacts/
@@ Expand Down @@