summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElinor Fung <47805090+elinor-fung@users.noreply.github.com>2019-08-12 12:47:01 -0700
committerAaron Robinson <arobins@microsoft.com>2019-08-12 12:47:01 -0700
commite8bff5bf42417f26bbd12a0f2cd2bafea99be3dd (patch)
tree6d177a5f9a0e4d38aae8b9bf36f7231b2995cd16 /src
parent4f2a05550dcd98515e6f32b83197ab6707d9d4a6 (diff)
downloadcoreclr-e8bff5bf42417f26bbd12a0f2cd2bafea99be3dd.tar.gz
coreclr-e8bff5bf42417f26bbd12a0f2cd2bafea99be3dd.tar.bz2
coreclr-e8bff5bf42417f26bbd12a0f2cd2bafea99be3dd.zip
Use Arcade's internal tool restore project for restoring IBCMerge (#26133)
Diffstat (limited to 'src')
-rw-r--r--src/.nuget/optdata/ibcmerge.csproj16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/.nuget/optdata/ibcmerge.csproj b/src/.nuget/optdata/ibcmerge.csproj
index 71f9e4ef07..fd22730b85 100644
--- 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>