diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-04-11 22:45:41 +0300 |
|---|---|---|
| committer | Eric Mellino <erme@microsoft.com> | 2017-04-11 23:21:37 +0300 |
| commit | 56cf99544675ee8497373d940715c17f12638058 (patch) | |
| tree | 4417f0575b6904a3f8bbac6c19c1088ace79c507 /Tools-Override | |
| parent | 6df998b048bf34496c4fcaa9f0c18d2cb9e79fad (diff) | |
Make codeOptimization.targets compatible with .NET Core 2.0 tooling
Diffstat (limited to 'Tools-Override')
| -rw-r--r-- | Tools-Override/codeOptimization.targets | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Tools-Override/codeOptimization.targets b/Tools-Override/codeOptimization.targets index d480cb221a..df36ae404a 100644 --- a/Tools-Override/codeOptimization.targets +++ b/Tools-Override/codeOptimization.targets @@ -44,27 +44,22 @@ <!-- We need the OptimizationData package in order to be able to optimize the assembly --> <Target Name="RestoreOptimizationDataPackage" BeforeTargets="CoreCompile" - Condition="'$(EnableProfileGuidedOptimization)'=='true' and !Exists('$(OptimizationDataDir)project.json')"> - + Condition="'$(EnableProfileGuidedOptimization)'=='true' and !Exists('$(OptimizationDataDir)project.csproj')"> <!-- Dynamically create a project.json file used to restore the optimization data--> - <Message Text="Generating project.json for optimization data" Importance="low" /> - <ItemGroup> - <_OptimizationDataJsonLine Include="{"dependencies": {" /> - <_OptimizationDataJsonLine Include=""$(OptimizationDataPackageName)" : "$(OptimizationDataVersion)" " /> - <_OptimizationDataJsonLine Include="},"frameworks": {"netcoreapp1.0": {},"net46": {}}}"/> - </ItemGroup> + <PropertyGroup> + <OptimizationDataSourceProject>$(MSBuildThisFileDirectory)OptimizationData.msbuild</OptimizationDataSourceProject> + </PropertyGroup> <PropertyGroup> - <OptimizationDataProjectJson>$(OptimizationDataDir)project.json</OptimizationDataProjectJson> + <OptimizationDataRestoreTarget>$(OptimizationDataDir)project.csproj</OptimizationDataRestoreTarget> <OptimizationDataNuGetFeed Condition="'$(OptimizationDataNuGetFeed)'==''">https:%2F%2Fdotnet.myget.org/F/roslyn/api/v3/index.json</OptimizationDataNuGetFeed> </PropertyGroup> <MakeDir Directories="$(OptimizationDataDir)" ContinueOnError="true" /> - <WriteLinesToFile File="$(OptimizationDataProjectJson)" Lines="@(_OptimizationDataJsonLine)" Overwrite="true" /> + <Copy SourceFiles="$(OptimizationDataSourceProject)" DestinationFiles="$(OptimizationDataRestoreTarget)" /> <!-- Restore the OptimizationData package --> - <Exec Command="$(DnuRestoreCommand) $(OptimizationDataProjectJson) --source $(OptimizationDataNuGetFeed)" - StandardOutputImportance="Low"/> + <Exec Command="$(DnuRestoreCommand) $(OptimizationDataRestoreTarget) --source $(OptimizationDataNuGetFeed) /p:OptimizationDataPackageName=$(OptimizationDataPackageName) /p:OptimizationDataVersion=$(OptimizationDataVersion)" StandardOutputImportance="Low"/> <!-- Copy the restored files into a more accessible location --> <ItemGroup> |