Fix CPM in official builds (2) (#73532)

* Fix CPM in official builds * more * more * more * more * work around sdk-tasks.ps1 issue * more
dotnet · May 17, 2024 · c99dd49 · c99dd49
1 parent 05e5ec7
commit c99dd49
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/eng/InternalTools.props b/eng/InternalTools.props
@@ -6,6 +6,10 @@
           https://devdiv.pkgs.visualstudio.com/_packaging/Engineering/nuget/v3/index.json;
           https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
         </RestoreSources>
+        <RestoreSources>
+          $(RestoreSources);
+          https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
+        </RestoreSources>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props
@@ -1,6 +1,8 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
-
+  <PropertyGroup>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
+  </PropertyGroup>
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
 </Project>
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
     <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
   </PropertyGroup>
   <ItemGroup>
@@ -16,7 +15,8 @@
     <PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
   </ItemGroup>
   <PropertyGroup>
-    <RestoreSources></RestoreSources>
+    <RestoreSources>
+    </RestoreSources>
     <RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
       https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
     </RestoreSources>

diff --git a/global.json b/global.json
@@ -8,8 +8,7 @@
     "dotnet": "9.0.100-preview.3.24204.13",
     "vs": {
       "version": "17.8.0"
-    },
-    "xcopy-msbuild": "17.8.1-2"
+    }
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24265.1",