Merge remote-tracking branch 'upstream/main' into use-faster-better-macs

Author: Steve Pfister

Directory.Build.props

@@ -96,7 +96,7 @@
     <NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
     <NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
 
-    <!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
+    <!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
          in src/mono/wasm/build/WasmApp.LocalBuild.props
          and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
     <NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
@@ -117,12 +117,6 @@
     <!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
     <ApiCompatNetCoreAppBaselineVersion>8.0.0</ApiCompatNetCoreAppBaselineVersion>
     <ApiCompatNetCoreAppBaselineTFM>net8.0</ApiCompatNetCoreAppBaselineTFM>
-
-    <TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
-    <!-- Don't build for NETFramework during source-build. -->
-    <TargetFrameworkForNETFrameworkTasks Condition="'$(DotNetBuildFromSource)' == 'true'" />
-
-    <TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
   </PropertyGroup>
 
   <PropertyGroup Label="CalculateConfiguration">

docs/area-owners.md

@@ -96,7 +96,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
 | area-System.Formats.Tar                        | @jeffhandley         | @dotnet/area-system-formats-tar                     |                                                                                                                                                                                                                                                                                           |
 | area-System.Globalization                      | @ericstj             | @dotnet/area-system-globalization                   |                                                                                                                                                                                                                                                                                           |
 | area-System.IO                                 | @jeffhandley         | @dotnet/area-system-io                              |                                                                                                                                                                                                                                                                                           |
-| area-System.IO.Compression                     | @jeffhandley         | @dotnet/area-system-io-compression                  | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul>                                                                                                                                                                                                                 |
+| area-System.IO.Compression                     | @ericstj             | @dotnet/area-system-io-compression                  | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul>                                                                                                                                                                                                                 |
 | area-System.IO.Hashing                         | @jeffhandley         | @dotnet/area-system-io-hashing                      | APIs within the System.IO.Hashing namespace, which align more with cryptography than with I/O                                                                                                                                                                                             |
 | area-System.IO.Pipelines                       | @adityamandaleeka    | @davidfowl @halter73                                |                                                                                                                                                                                                                                                                                           |
 | area-System.IO.Ports                           | @jeffhandley         | @dotnet/area-system-io-ports                        |                                                                                                                                                                                                                                                                                           |

eng/SourceBuild.props renamed to eng/DotNetBuild.props

@@ -81,7 +81,6 @@
         Split large components into separate packages.
       -->
       <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-runtime-*$(ArchiveExtension)" Category="runtime" />
-
       <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*Microsoft.DotNet.ILCompiler.*.nupkg" Category="ILCompiler" />
 
       <IntermediateNupkgArtifactFile
@@ -92,6 +91,15 @@
         Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\dotnet-crossgen2-*$(ArchiveExtension)"
         Category="Crossgen2Archive" />
     </ItemGroup>
+
+    <ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
+      <!-- Include installers when in product VMR builds. These are not necessary when building the repo-only build as we don't
+           need them in downstream source-only PR legs. We could include them, but it may bump us over the package size limit. -->
+      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.msi" />
+      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.deb" />
+      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.rpm" />
+      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\*.pkg" />
+    </ItemGroup>
   </Target>
 
 </Project>