From 70ec9db3f269c3baa771bc9b7fc4ea4c50751df6 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 17 Dec 2024 12:20:07 +0100
Subject: [PATCH] fixesss

---
 eng/Publishing.props                      | 4 ++--
 eng/packaging.targets                     | 4 ++--
 eng/pipelines/official/stages/publish.yml | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 562fc45c8c118..0d0ff3a2e39e1 100644
--- a/eng/Publishing.props
+++ b/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
diff --git a/eng/packaging.targets b/eng/packaging.targets
index 5e1e3bbf264bc..f2dc6bfcf5e13 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -27,10 +27,10 @@
     <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
     <BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack>
 
-    <!-- Generate packages for rid specific projects. -->
+    <!-- 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="'$(IsRIDSpecificProject)' == 'true'">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>
diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml
index 9553baae305f2..83b059ffc32a6 100644
--- a/eng/pipelines/official/stages/publish.yml
+++ b/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