[release/8.0.1xx-xcode15.4] Fix conflicts in 59520d4 (#21107)

It looks like commit 59520d4 was missing parts of commit 2abbaf9.

Author: pjcollins

dotnet/package/common.csproj

@@ -126,13 +126,15 @@
     <Error Condition="Exists($(AssetManifestPath))" Text="The manifest file '$(AssetManifestPath)' already exists." />
 
     <ItemGroup>
-      <BuildArtifacts Include="$(NupkgPath)\Microsoft*.$(_PlatformName).*.nupkg" />
+      <ItemsToPush Include="$(NupkgPath)\*.nupkg" />
     </ItemGroup>
 
-    <Error Condition="'@(BuildArtifacts)' == ''" Text="No packages to create manifest from." />
+    <Error Condition="'@(ItemsToPush)' == ''" Text="No packages to push." />
+
+    <Message Text="Publishing %(ItemsToPush.Identity)" Importance="normal" />
 
     <ItemGroup>
-      <ManifestBuildData Include="InitialAssetsLocation=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+      <ManifestBuildData Include="InitialAssetsLocation=" />
       <ManifestBuildData Include="AzureDevOpsBuildId=$(BUILD_BUILDID)" />
       <ManifestBuildData Include="AzureDevOpsBuildDefinitionId=$(SYSTEM_DEFINITIONID)" />
       <ManifestBuildData Include="AzureDevOpsProject=$(SYSTEM_TEAMPROJECT)" />
@@ -151,22 +153,16 @@
         ManifestCommit="$(BUILD_SOURCEVERSION)"
         AssetManifestPath="$(AssetManifestPath)"
         PublishingVersion="3" />
-  </Target>
-
-  <Target Name="PushManifestToBuildAssetRegistry" >
-    <PropertyGroup>
-      <VersionPrefix>1.0.0</VersionPrefix>
-    </PropertyGroup>
 
     <MSBuild
         Targets="Restore"
         Projects="$(PkgMicrosoft_DotNet_Arcade_Sdk)\tools\SdkTasks\PublishBuildAssets.proj"
-        Properties="Configuration=$(Configuration);RepoRoot=$(_RepositoryPath);VersionPrefix=$(VersionPrefix);NuGetPackageRoot=$(_RepositoryPath)\packages\"
+        Properties="Configuration=$(Configuration);RepoRoot=$(_RepositoryPath);VersionPrefix=$(_PackageVersion);NuGetPackageRoot=$(_RepositoryPath)\packages\"
     />
 
     <MSBuild
         Projects="$(PkgMicrosoft_DotNet_Arcade_Sdk)\tools\SdkTasks\PublishBuildAssets.proj"
-        Properties="Configuration=$(Configuration);RepoRoot=$(_RepositoryPath);VersionPrefix=$(VersionPrefix);ManifestsPath=$(BarManifestOutputPath);MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com;NuGetPackageRoot=$(_RepositoryPath)\packages\"
+        Properties="Configuration=$(Configuration);RepoRoot=$(_RepositoryPath);VersionPrefix=$(_PackageVersion);ManifestsPath=$(ArtifactsLogDir)AssetManifest;MaestroApiEndpoint=https://maestro.dot.net;NuGetPackageRoot=$(_RepositoryPath)\packages\"
     />
   </Target>
 

tools/devops/automation/build-pipeline.yml

@@ -45,6 +45,10 @@ parameters:
   displayName: 'Push Nugets (dotnet)'
   default: true
 
+- name: pushNugetsToMaestro
+  type: boolean
+  default: true
+
 - name: testConfigurations
   displayName: Test configurations to run
   type: object
@@ -251,6 +255,7 @@ extends:
         forceInsertion: ${{ parameters.forceInsertion }}
         skipESRP: ${{ parameters.skipESRP }}
         pushNugets: ${{ parameters.pushNugets }}
+        pushNugetsToMaestro: ${{ parameters.pushNugetsToMaestro }}
         ${{ if ne(length(parameters.testConfigurations), 0)}}:
           testConfigurations: ${{ parameters.testConfigurations }}
         deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}

tools/devops/automation/templates/build/build-nugets.yml

@@ -62,7 +62,10 @@ steps:
       timeoutInMinutes: 180
 
     # build nugets
-    - template: build-nugets.yml
+    - bash: $(Build.SourcesDirectory)/xamarin-macios/tools/devops/automation/scripts/bash/build-nugets.sh
+      displayName: 'Build Nugets'
+      condition: and(succeeded(), contains(variables['configuration.BuildNugets'], 'True'), ne(variables['ENABLE_DOTNET'], ''))
+      timeoutInMinutes: 180
 
     - bash: $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/automation/scripts/bash/generate-workload-rollback.sh
       name: workload_file

tools/devops/automation/templates/build/build-pkgs.yml

@@ -32,6 +32,10 @@ parameters:
   type: boolean
   default: true # default to true until otherwhise
 
+- name: pushNugetsToMaestro
+  type: boolean
+  default: true
+
 - name: isPR
   type: boolean
 
@@ -419,6 +423,7 @@ stages:
         repositoryAlias: ${{ parameters.repositoryAlias }}
         commit: ${{ parameters.commit }}
         pushNugets: ${{ parameters.pushNugets }}
+        pushNugetsToMaestro: ${{ parameters.pushNugetsToMaestro }}
 
 - stage: funnel
   displayName: '${{ parameters.stageDisplayNamePrefix }}Collect signed artifacts'

tools/devops/automation/templates/main-stage.yml

@@ -21,6 +21,10 @@ parameters:
   type: boolean
   default: true
 
+- name: pushNugetsToMaestro
+  type: boolean
+  default: true
+
 - name: stageDisplayNamePrefix
   type: string
   default: ''