[main] Source code updates from dotnet/dotnet (#49035)

v-wuzhai · web-flow · commit 90f6a9842fca · 2025-05-19T14:21:34.000+08:00
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -108,6 +108,3 @@
 # dotnet-format
 /src/BuiltInTools/dotnet-format @dotnet/roslyn-ide
 /test/dotnet-format.UnitTests @dotnet/roslyn-ide
-
-# Area: VMR & SourceBuild
-/eng/DotNetBuild.props @dotnet/source-build @dotnet/product-construction
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -54,7 +54,7 @@
           Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
 
   <!-- Update KnownFrameworkReferences to target the right version of the runtime -->
-  <!-- We cannot use live shims when building tool packs in VMR - only package for current arch is available. -->
+  <!-- Don't use live shims when building tool packs in .NET product build mode as only packages for the current arch are available. -->
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
                           and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
                           and '$(MSBuildProjectName)' != 'sdk-tasks'
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -35,7 +35,7 @@
     <Artifact Update="$(ArtifactsShippingPackagesDir)dotnet-sdk-pgo-*" Visibility="External" />
   </ItemGroup>
 
-  <!-- temporarily remove the .Msi workload pack nugets in the SDK official build until we switch to the VMR, but keep the manifest .Msi packages -->
+  <!-- Temporarily remove the .Msi workload pack nugets in non .NET product build mode (until the repo official build gets removed), but keep the manifest .Msi packages. -->
   <ItemGroup Condition="'$(DotNetBuild)' != 'true'">
     <MsiPackages Include="$(ArtifactsShippingPackagesDir)*.Msi.*.nupkg" />
     <MsiPackages Remove="$(ArtifactsShippingPackagesDir)*.Manifest-*.Msi.*.nupkg" />
diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
@@ -9,7 +9,7 @@ function InitializeCustomSDKToolset {
   }
 
   # The following frameworks and tools are used only for testing.
-  # Do not attempt to install them in source build.
+  # Do not attempt to install them in product build.
   if ($productBuild) {
     return
   }
diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh
@@ -6,7 +6,7 @@ function InitializeCustomSDKToolset {
   fi
 
   # The following frameworks and tools are used only for testing.
-  # Do not attempt to install them in source build.
+  # Do not attempt to install them in product build.
   if [[ $product_build == true ]]; then
     return
   fi
diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj
@@ -15,6 +15,16 @@
 
     <!-- Avoid https://github.com/dotnet/arcade/issues/9305 -->
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+
+    <!--
+      Disable CS9057 in source-only dev/ci builds. This is necessary because dotnet-watch distributes some ASP.NET Core
+      analyzers. These analyzers get built with a dependency on the live version of Microsoft.CodeAnalysis. In a dev/ci
+      build, the assembly version associated with Microsoft.CodeAnalysis in that case is 42.42.42.4242, set by Arcade in
+      dev/ci builds. So when building dotnet-watch with its analyzer dependencies, it will cause CS9057 because the 
+      analyzer assembly version is not the same as the compiler assembly version being used by the sdk that the project
+      is being built with. But this is fine because the analyzer is just being used here to distribute it with the tool.
+    -->
+    <NoWarn Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(OfficialBuild)' != 'true'">$(NoWarn);CS9057</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
@@ -77,8 +77,8 @@
     <ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
   </ItemGroup>
 
-  <!-- In the VMR build we explicitly build workloads in build pass 2.
-       In the SDK official build we build workloads as part of win-x64 -->
+  <!-- In .NET product build mode, explicitly build workloads in build pass 2.
+       In the SDK official build, build workloads as part of win-x64. -->
   <ItemGroup Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true' and '$(DotNetBuild)' != 'true' and '$(BuildWorkloads)' == 'true'">
     <ProjectReference Include="$(RepoRoot)src\Workloads\VSInsertion\workloads.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
   </ItemGroup>
diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets
@@ -15,26 +15,28 @@
       Overwrite="true"
       Encoding="ASCII" />
 
+    <!-- The Version.Details file doesn't contain live information when building the
+         .NET product inside the orchestrator. Therefore don't read from it in that mode. -->
     <GetDependencyInfo
       VersionDetailsXmlFile="$(RepositoryEngineeringDir)Version.Details.xml"
       DependencyName="Microsoft.NETCore.App.Ref"
-      Condition="'$(DotNetBuild)' != 'true'">
+      Condition="'$(DotNetBuildOrchestrator)' != 'true'">
        <Output TaskParameter="DependencyVersion" PropertyName="DepRuntimeVersion" />
        <Output TaskParameter="DependencyCommit" PropertyName="DepRuntimeCommit" />
     </GetDependencyInfo>
 
     <GetDependencyInfo
       VersionDetailsXmlFile="$(RepositoryEngineeringDir)Version.Details.xml"
       DependencyName="Microsoft.AspNetCore.App.Ref"
-      Condition="'$(DotNetBuild)' != 'true'">
+      Condition="'$(DotNetBuildOrchestrator)' != 'true'">
        <Output TaskParameter="DependencyVersion" PropertyName="DepAspNetCoreVersion" />
        <Output TaskParameter="DependencyCommit" PropertyName="DepAspNetCoreCommit" />
     </GetDependencyInfo>
 
     <GetDependencyInfo
       VersionDetailsXmlFile="$(RepositoryEngineeringDir)Version.Details.xml"
       DependencyName="Microsoft.WindowsDesktop.App.Ref"
-      Condition="'$(DotNetBuild)' != 'true'">
+      Condition="'$(DotNetBuildOrchestrator)' != 'true'">
        <Output TaskParameter="DependencyVersion" PropertyName="DepWindowsDesktopVersion" />
        <Output TaskParameter="DependencyCommit" PropertyName="DepWindowsDesktopCommit" />
     </GetDependencyInfo>
diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets
@@ -41,7 +41,7 @@
     <!-- Directory for the zipped up light command package -->
     <LightCommandPackagesDir>$(ArtifactsNonShippingPackagesDir)</LightCommandPackagesDir>
 
-    <!-- for local SDK builds we allow skipping the workload manifest msi generation to save build time, the sdk bundle won't contain the manifest msis in that case. -->
+    <!-- For local non .NET SDK product builds, allow skipping the workload manifest msi generation to save build time. The sdk bundle won't contain the manifest msis in that case. -->
     <AllowEmptyBuiltinWorkloadManifestMsi Condition="'$(DotNetBuild)' != 'true' and '$(BuildWorkloads)' != 'true' and '$(OfficialBuild)' != 'true'">true</AllowEmptyBuiltinWorkloadManifestMsi>
   </PropertyGroup>
 
diff --git a/src/WebSdk/Web/Tasks/Microsoft.NET.Sdk.Web.Tasks.csproj b/src/WebSdk/Web/Tasks/Microsoft.NET.Sdk.Web.Tasks.csproj
@@ -11,6 +11,17 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
+
+    <!--
+      Disable CS9057 in source-only dev/ci builds. This is necessary because the SDK distributes Microsoft.AspNetCore.Analyzers
+      with its Microsoft.NET.Sdk.Web.Tasks package. Microsoft.AspNetCore.Analyzers gets built with a dependency on the live
+      version of Microsoft.CodeAnalysis. In a dev/ci build, the assembly version associated with Microsoft.CodeAnalysis in 
+      that case is 42.42.42.4242, set by Arcade in dev/ci builds. So when building Microsoft.NET.Sdk.Web.Tasks with its
+      analyzer dependencies, it will cause CS9057 because the analyzer assembly version is not the same as the compiler
+      assembly version being used by the sdk that the project is being built with. But this is fine because the analyzer
+      is just being used here to distribute it with the Microsoft.NET.Sdk.Web.Tasks package.
+    -->
+    <NoWarn Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(OfficialBuild)' != 'true'">$(NoWarn);CS9057</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Workloads/VSInsertion/workloads.csproj b/src/Workloads/VSInsertion/workloads.csproj
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- in the VMR build in the second build pass we don't need to build the manifests since they're already downloaded from another vertical -->
+    <!-- In .NET product build mode in the second build pass, there's no need to build the manifests since they're already downloaded from another vertical -->
     <ProjectReference Include="$(RepoRoot)\src\Workloads\Manifests\manifest-packages.proj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
   </ItemGroup>
 
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj
@@ -1,4 +1,5 @@
-﻿<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+﻿<Project>
+
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
     <OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
@@ -46,4 +47,5 @@
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
 </Project>
diff --git a/test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj b/test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj
@@ -1,4 +1,5 @@
-﻿<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>net472;$(ToolsetTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition=" '$([MSBuild]::IsOSPlatform(`Windows`))' == 'false' ">$(ToolsetTargetFramework)</TargetFrameworks>
@@ -28,4 +29,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.NET.TestFramework/Commands/NuGetExeRestoreCommand.cs b/test/Microsoft.NET.TestFramework/Commands/NuGetExeRestoreCommand.cs
@@ -62,7 +62,9 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
                 using (var response = client.GetAsync(url).ConfigureAwait(false).GetAwaiter().GetResult())
                 using (var fs = new FileStream(nugetExePath, FileMode.CreateNew))
                 {
+#pragma warning disable CA2025 // we force synchronous so sourceCacheContext can't be disposed early
                     response.Content.CopyToAsync(fs).ConfigureAwait(false).GetAwaiter().GetResult();
+#pragma warning restore CA2025
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ function InitializeCustomSDKToolset {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`# The following frameworks and tools are used only for testing.`
`12`		`- # Do not attempt to install them in source build.`
	`12`	`+ # Do not attempt to install them in product build.`
`13`	`13`	`if ($productBuild) {`
`14`	`14`	`return`
`15`	`15`	`}`