diff options
| author | Eric StJohn <ericstj@microsoft.com> | 2020-10-26 18:02:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 18:02:17 +0300 |
| commit | 7a0aca3d46f5a8de62e6a040010296d9b2a71e17 (patch) | |
| tree | f7debcb861546a4e2ea39c0631f826e38bd78425 /eng/restore | |
| parent | 6c1d8a85a908db5410aa765bbfb2cf4dd331a14e (diff) | |
Ensure IBC data is copied to the expected location (#43644)
Diffstat (limited to 'eng/restore')
| -rw-r--r-- | eng/restore/optimizationData.targets | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index a4bbe9645b6..a8466b7cd0c 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,11 +1,11 @@ <Project> <ItemGroup> - <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackage)" Version="[$(optimizationwindows_ntx64IBCCoreFxVersion)]" /> - <IBCPackage Include="$(LinuxCoreFxOptimizationDataPackage)" Version="[$(optimizationlinuxx64IBCCoreFxVersion)]" /> - <IBCPackage Include="$(WindowsOptimizationIBCCoreCLRPackage)" Version="[$(optimizationwindows_ntx64IBCCoreCLRVersion)]" /> - <IBCPackage Include="$(LinuxOptimizationIBCCoreCLRPackage)" Version="[$(optimizationlinuxx64IBCCoreCLRVersion)]" /> - <PackageDownload Include="@(IBCPackage)" /> + <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackage)" Version="$(optimizationwindows_ntx64IBCCoreFxVersion)" /> + <IBCPackage Include="$(LinuxCoreFxOptimizationDataPackage)" Version="$(optimizationlinuxx64IBCCoreFxVersion)" /> + <IBCPackage Include="$(WindowsOptimizationIBCCoreCLRPackage)" Version="$(optimizationwindows_ntx64IBCCoreCLRVersion)" /> + <IBCPackage Include="$(LinuxOptimizationIBCCoreCLRPackage)" Version="$(optimizationlinuxx64IBCCoreCLRVersion)" /> + <PackageDownload Include="@(IBCPackage)" Version="[%(Version)]" /> </ItemGroup> <!-- IBC data packages don't follow NuGet conventions. --> @@ -25,6 +25,8 @@ <_optimizationDataSourceFile Include="%(IBCPackage.PackagePath)\**\*.dll;%(IBCPackage.PackagePath)\**\*.ibc" SubdirectoryName="%(IBCPackage.SubdirectoryName)" /> </ItemGroup> + <Error Condition="'@(_optimizationDataSourceFile)' == ''" Text="Failed to restore optimization data" /> + <Copy SourceFiles="@(_optimizationDataSourceFile)" DestinationFiles="@(_optimizationDataSourceFile->'$(IbcOptimizationDataDir)%(SubdirectoryName)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" |