Use -pack switch instead of -allconfigurations to create packages

docs/project/library-servicing.md

@@ -14,7 +14,7 @@ Keep in mind that we still need package authoring in .NET 8 and older versions.
 
 Develop and test your change as normal.  For packages, you may want to test them outside the repo infrastructure. To do so, execute the following steps:
 
-1. From a clean copy of your branch, run `build.cmd/sh libs -allconfigurations`
+1. From a clean copy of your branch, run `build.cmd/sh libs -pack`
 
 2. Check in `artifacts\bin\packages\Debug` for the existence of your package, with the appropriate package version.
 

eng/DotNetBuild.props

@@ -50,14 +50,13 @@
            Properties that control flags from the VMR build, and the expected output for the VMR build should be added to this file. -->
 
       <!-- Enable regular Arcade signing and publishing in VMR build -->
-      <InnerBuildArgs Condition="'$(DotNetBuildOrchestrator)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)publish</InnerBuildArgs>
+      <InnerBuildArgs Condition="'$(DotNetBuildOrchestrator)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(Sign)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)sign</InnerBuildArgs>
 
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArch)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)os $(TargetOS)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(CrossBuild)' == 'true' or ('$(TargetArch)' != '$(_hostArch)' and '$(ShortStack)' != 'true')">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration)</InnerBuildArgs>
-      <InnerBuildArgs Condition="'$(ShortStack)' != 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)allconfigurations</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>

eng/Publishing.props

@@ -77,14 +77,14 @@
 
     <!--
       Packages that aren't matched above as RID-specific are considered RID-agnostic. Also include
-      the AllConfigurations packages from the Libraries build.
+      the packages from the Libraries build.
     -->
     <RidAgnosticNupkgToPublishFile
       Include="
         $(DownloadDirectory)**\Microsoft.NET.Workload.Mono.Toolchain.*Manifest-*.nupkg;
         $(DownloadDirectory)**\Microsoft.NET.Sdk.WebAssembly.Pack.*.nupkg;
         $(DownloadDirectory)*\$(PublishRidAgnosticPackagesFromPlatform)\**\*.nupkg;
-        $(DownloadDirectory)*\*AllConfigurations\**\*.nupkg"
+        $(DownloadDirectory)*\Libraries_WithPackages\**\*.nupkg"
       Exclude="@(RuntimeNupkgFile);@(DownloadedSymbolNupkgFile)" />
 
     <TransportPackagesToPublishFile

eng/Subsets.props

@@ -219,7 +219,6 @@
   <ItemDefinitionGroup>
     <ProjectToBuild>
       <Test>false</Test>
-      <Pack>false</Pack>
       <Publish>false</Publish>
       <BuildInParallel>false</BuildInParallel>
     </ProjectToBuild>

eng/build.ps1

@@ -1,13 +1,13 @@
 [CmdletBinding(PositionalBinding=$false)]
 Param(
   [switch][Alias('h')]$help,
+  [switch]$pack,
   [switch][Alias('t')]$test,
   [ValidateSet("Debug","Release","Checked")][string[]][Alias('c')]$configuration = @("Debug"),
   [string][Alias('f')]$framework,
   [string]$vs,
   [string][Alias('v')]$verbosity = "minimal",
   [ValidateSet("windows","linux","osx","android","browser","wasi")][string]$os,
-  [switch]$allconfigurations,
   [switch]$coverage,
   [string]$testscope,
   [switch]$testnobuild,
@@ -77,7 +77,6 @@ function Get-Help() {
   Write-Host ""
 
   Write-Host "Libraries settings:"
-  Write-Host "  -allconfigurations      Build packages for all build configurations."
   Write-Host "  -coverage               Collect code coverage when testing."
   Write-Host "  -framework (-f)         Build framework: net10.0 or net48."
   Write-Host "                          [Default: net10.0]"
@@ -312,7 +311,7 @@ foreach ($argument in $PSBoundParameters.Keys)
     "hostConfiguration"      { $arguments += " /p:HostConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" }
     "framework"              { $arguments += " /p:BuildTargetFramework=$($PSBoundParameters[$argument].ToLowerInvariant())" }
     "os"                     { $arguments += " /p:TargetOS=$($PSBoundParameters[$argument])" }
-    "allconfigurations"      { $arguments += " /p:BuildAllConfigurations=true" }
+    "pack"                   { $arguments += " -pack /p:BuildAllConfigurations=true" }
     "properties"             { $arguments += " " + $properties }
     "verbosity"              { $arguments += " -$argument " + $($PSBoundParameters[$argument]) }
     "cmakeargs"              { $arguments += " /p:CMakeArgs=`"$($PSBoundParameters[$argument])`"" }

eng/build.sh

@@ -65,7 +65,6 @@ usage()
   echo ""
 
   echo "Libraries settings:"
-  echo "  --allconfigurations        Build packages for all build configurations."
   echo "  --coverage                 Collect code coverage when testing."
   echo "  --framework (-f)           Build framework: net10.0 or net48."
   echo "                             [Default: net10.0]"
@@ -308,8 +307,8 @@ while [[ $# > 0 ]]; do
       shift 2
       ;;
 
-     -allconfigurations)
-      arguments="$arguments /p:BuildAllConfigurations=true"
+     -pack)
+      arguments="$arguments --pack /p:BuildAllConfigurations=true"
       shift 1
       ;;
 

eng/packaging.targets

@@ -27,15 +27,10 @@
     <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
     <BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack>
 
-    <!-- Generate packages for rid specific projects or for allconfigurations during build. -->
-    <!-- A package isn't generated if in servicing or in runtimelab. Intended to be overridden at project level. -->
+    <!-- Generate packages for rid specific projects when not in runtimelab (to avoid binclashes when using the same feed). -->
     <IsRIDSpecificProject Condition="$(MSBuildProjectName.StartsWith('runtime.')) and
                                      !$(MSBuildProjectName.StartsWith('runtime.native'))">true</IsRIDSpecificProject>
-    <GeneratePackageOnBuild Condition="(
-                                        '$(BuildAllConfigurations)' == 'true' or
-                                        '$(IsRIDSpecificProject)' == 'true'
-                                       ) and
-                                       '$(GitHubRepositoryName)' != 'runtimelab'">true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild Condition="'$(IsRIDSpecificProject)' == 'true' and '$(GitHubRepositoryName)' != 'runtimelab'">true</GeneratePackageOnBuild>
 
     <!-- During NoBuild pack invocations, skip project reference build. Necessary for the IncludeProjectReferencesWithPackAttributeInPackage target. -->
     <BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>

eng/pipelines/global-build.yml

@@ -82,8 +82,7 @@ extends:
                 eq(variables['isRollingBuild'], true))
 
       #
-      # Build Libraries AllConfigurations. This exercises the code path where we build libraries for all
-      # configurations on a non Windows operating system.
+      # Build Libraries (all TFMs) and create packages on a non Windows operating system.
       #
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
@@ -92,8 +91,8 @@ extends:
           platforms:
           - linux_x64_dev_innerloop
           jobParameters:
-            nameSuffix: Libraries_AllConfigurations
-            buildArgs: -subset libs -allconfigurations
+            nameSuffix: Libraries_WithPackages
+            buildArgs: -subset libs -pack
             timeoutInMinutes: 120
             condition:
               or(

eng/pipelines/official/stages/publish.yml

@@ -1,6 +1,5 @@
 parameters:
   PublishRidAgnosticPackagesFromPlatform: windows_x64
-  publishingInfraVersion: 3
 
 stages:
 
@@ -28,7 +27,6 @@ stages:
 # Stages-based publishing entry point
 - template: /eng/common/templates-official/post-build/post-build.yml
   parameters:
-    publishingInfraVersion: ${{ parameters.publishingInfraVersion }}
     validateDependsOn:
     - PrepareForPublish
     # The following checks are run after the build in the validation and release pipelines

eng/pipelines/runtime-official.yml

@@ -454,7 +454,7 @@ extends:
                     name: MonoRuntimePacks
 
       #
-      # Build libraries AllConfigurations for packages
+      # Build libraries (all TFMs) and packages
       #
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
@@ -464,13 +464,13 @@ extends:
           - windows_x64
           jobParameters:
             templatePath: 'templates-official'
-            buildArgs: -s tools+libs -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
-            nameSuffix: Libraries_AllConfigurations
+            buildArgs: -s tools+libs -pack -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
+            nameSuffix: Libraries_WithPackages
             isOfficialBuild: ${{ variables.isOfficialBuild }}
             postBuildSteps:
               - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
                 parameters:
-                  name: Libraries_AllConfigurations
+                  name: Libraries_WithPackages
             timeoutInMinutes: 95
       #
       # Build SourceBuild packages

eng/pipelines/runtime-richnav.yml

@@ -39,7 +39,7 @@ extends:
             richCodeNavigationLanguage: "csharp"
             nameSuffix: Libs
             timeoutInMinutes: 240
-            buildArgs: -s libs.sfx+libs.oob -allConfigurations
+            buildArgs: -s libs.sfx+libs.oob -pack
             preBuildSteps:
               - script: dotnet.cmd nuget add source -n richnav "https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json"
                 displayName: Add richnav NuGet feed

eng/pipelines/runtime.yml

@@ -1225,7 +1225,7 @@ extends:
                 eq(variables['isRollingBuild'], true))
 
       #
-      # Build and test libraries AllConfigurations
+      # Build and test libraries for all TFMs and create packages
       #
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
@@ -1234,8 +1234,8 @@ extends:
           platforms:
           - windows_x64
           jobParameters:
-            buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
-            nameSuffix: Libraries_AllConfigurations
+            buildArgs: -test -s tools+libs+libs.tests -pack -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
+            nameSuffix: Libraries_WithPackages
             timeoutInMinutes: 150
             condition: >-
               or(

eng/pipelines/runtimelab-official.yml

@@ -64,7 +64,7 @@ extends:
             - windows_x64
             jobParameters:
               templatePath: 'templates-official'
-              buildArgs: -s tools+libs -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
+              buildArgs: -s tools+libs -allConfigurations -c $(_BuildConfig) /p:BuildAllConfigurations=true /p:TestAssemblies=false /p:TestPackages=true
               nameSuffix: Libraries_AllConfigurations
               isOfficialBuild: true
               postBuildSteps:

eng/pipelines/runtimelab.yml

@@ -103,7 +103,7 @@ extends:
             platforms:
             - windows_x64
             jobParameters:
-              buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
+              buildArgs: -test -s tools+libs+libs.tests -c $(_BuildConfig) /p:BuildAllConfigurations=true /p:TestAssemblies=false /p:TestPackages=true
               nameSuffix: Libraries_AllConfigurations
               timeoutInMinutes: 150
               extraVariablesTemplates:

src/libraries/oob.proj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project Sdk="Microsoft.Build.Traversal">
 
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
@@ -69,7 +69,7 @@
 
   <Target Name="SetAzureDevOpsVariableForBuiltPackages"
           Condition="'$(ContinuousIntegrationBuild)' == 'true'"
-          AfterTargets="Build;Pack">
+          AfterTargets="Pack">
     <Message Condition="Exists('$(ArtifactsDir)packages')" Importance="High" Text="##vso[task.setvariable variable=_librariesBuildProducedPackages]true" />
   </Target>
 

src/libraries/pretest.proj

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.Build.Traversal">
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <Import Project="BuildTask.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
 
   <PropertyGroup Condition="'$(ContinuousIntegrationBuild)' != 'true'">
     <!-- Create an intermediate runsettings file to enable VSTest discovery. -->
@@ -8,10 +9,6 @@
     <CreateVsCodeRunSettingsFile>true</CreateVsCodeRunSettingsFile>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
   <!--
     Explicitly build the externals.csproj project first to create the PlatformManifest for
     the targeting and runtimepack before the test runners which consume that asset are built.
@@ -139,7 +136,7 @@
   </Target>
 
   <!-- Generate the runtime pack's RuntimeList.xml -->
   <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetSharedFrameworkTaskFile)"/>
   <Target Name="GenerateRuntimeListFile"
           DependsOnTargets="GetRuntimePackFiles"
           AfterTargets="BuildExternalsProject"
@@ -159,5 +156,4 @@
                              RootAttributes="@(FrameworkListRootAttribute)" />
   </Target>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
 </Project>

src/libraries/sfx.proj

@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project Sdk="Microsoft.Build.Traversal">
 
-  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+  <Import Project="BuildTask.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
 
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
     <BuildInParallel>false</BuildInParallel>
-    <IsPackable>false</IsPackable>
     <FrameworkListOutputPath>$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml</FrameworkListOutputPath>
     <!-- Import the illink file which contains some of the logic required to illink the shared framework assemblies. -->
     <ExplicitlyImportCustomILLinkTargets>true</ExplicitlyImportCustomILLinkTargets>
@@ -37,7 +36,7 @@
   </Target>
 
   <!-- Generate the targeting pack's framework list so that out-of-band projects can leverage it. -->
   <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetSharedFrameworkTaskFile)"/>
   <Target Name="GenerateFrameworkListFile"
           DependsOnTargets="GetGenerateFrameworkListFileInputs"
           AfterTargets="Build"