Use Arcade's internal tool restore project for restoring IBCMerge (#26133)

diff --git a/eng/Versions.props b/eng/Versions.props
index 29cd577..0b14929 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,6 +10,7 @@
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <PreReleaseVersionLabel>preview9</PreReleaseVersionLabel>
     <!-- Opt-in/out repo features -->
+    <UsingToolIbcOptimization>true</UsingToolIbcOptimization>
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
     <UsingToolXliff>false</UsingToolXliff>
     <!-- Package versions -->
@@ -25,8 +26,6 @@
     <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
     <!-- core-setup -->
     <MicrosoftNETCoreAppVersion>3.0.0-preview9-19411-11</MicrosoftNETCoreAppVersion>
-    <!-- dotnet-core-internal-tooling -->
-    <IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion>
     <!-- dotnet-optimization -->
     <optimizationIBCCoreCLRVersion>99.99.99-master-20190807.1</optimizationIBCCoreCLRVersion>
     <optimizationPGOCoreCLRVersion>99.99.99-master-20190807.1</optimizationPGOCoreCLRVersion>

diff --git a/eng/build-job.yml b/eng/build-job.yml
index 6626f2a..40d4ae9 100644 (file)
--- a/eng/build-job.yml
+++ b/eng/build-job.yml
@@ -115,7 +115,7 @@ jobs:
           inputs:
             command: restore
             feedsToUse: config
-            projects: 'src/.nuget/optdata/ibcmerge.csproj'
+            projects: '$(Build.SourcesDirectory)/eng/common/internal/Tools.csproj'
             nugetConfigPath: 'eng/internal/NuGet.config'
             restoreDirectory: '$(Build.SourcesDirectory)\.packages'
             verbosityRestore: 'normal'

diff --git a/src/.nuget/optdata/ibcmerge.csproj b/src/.nuget/optdata/ibcmerge.csproj
index 71f9e4e..fd22730 100644 (file)
--- a/src/.nuget/optdata/ibcmerge.csproj
+++ b/src/.nuget/optdata/ibcmerge.csproj
@@ -5,10 +5,6 @@
     <RuntimeIdentifiers>win7-x64;win7-x86;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="microsoft.dotnet.ibcmerge" Version="[$(IbcMergePackageVersion)]" Condition="'$(IbcMergePackageVersion)'!=''" />
-  </ItemGroup>
-
   <!--                                                                       -->
   <!-- Task: DumpIbcMergePackageVersion                                       -->
   <!--                                                                       -->
@@ -16,7 +12,7 @@
   <!--                                                                       -->
   <!-- DumpIbcMergePackageVersion is used by build.sh and build.cmd to pass  -->
   <!-- the version information to cmake. The task will write a file to be    -->
-  <!-- read back by build.cmd/sh. The path for the file is:                  --> 
+  <!-- read back by build.cmd/sh. The path for the file is:                  -->
   <!-- $(IbcMergePackageVersionOutputFile)                                    -->
   <!--                                                                       -->
   <Target Name="DumpIbcMergePackageVersion">
@@ -25,14 +21,8 @@
 
     <!-- Cleanup old version file -->
     <Delete Files="$(IbcMergePackageVersionOutputFile)" Condition="Exists('$(IbcMergePackageVersionOutputFile)')" />
-    <WriteLinesToFile File="$(IbcMergePackageVersionOutputFile)" Lines="$(IbcMergePackageVersion)" Overwrite="true"/>
-    <Message Text="IbcMergePackageVersion: $(IbcMergePackageVersion) written to: $(IbcMergePackageVersionOutputFile)" Importance="High" />
+    <WriteLinesToFile File="$(IbcMergePackageVersionOutputFile)" Lines="$(MicrosoftDotNetIBCMergeVersion)" Overwrite="true"/>
+    <Message Text="MicrosoftDotNetIBCMergeVersion: $(MicrosoftDotNetIBCMergeVersion) written to: $(IbcMergePackageVersionOutputFile)" Importance="High" />
   </Target>
 
-  <PropertyGroup>
-    <RestoreSources>
-      $(RestoreSources);
-      https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
 </Project>