diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2019-11-01 20:27:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 20:27:23 +0300 |
| commit | 926874e00aecc1218f537736a8420b054b7defb9 (patch) | |
| tree | 438b06a785c6beffa5c23bf97a223581e9fd59c3 /eng/restore | |
| parent | f32b1c1464fd53a3b32a6805c00f5e5db2f85014 (diff) | |
Use Package suffix instead of PackageId and Version suffix instead of PackageVersion (dotnet/corefx#42289)
* Use Package suffix instead of PackageId
* Manual darc update from build '20191101.2'
Commit migrated from https://github.com/dotnet/corefx/commit/931f79e4670cb73c9347e14714fd892907be6630
Diffstat (limited to 'eng/restore')
| -rw-r--r-- | eng/restore/docs.targets | 4 | ||||
| -rw-r--r-- | eng/restore/illink.targets | 4 | ||||
| -rw-r--r-- | eng/restore/optimizationData.targets | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets index 414f1a59773..61c81ea99a6 100644 --- a/eng/restore/docs.targets +++ b/eng/restore/docs.targets @@ -1,7 +1,7 @@ <Project> <ItemGroup> - <PackageReference Include="$(MicrosoftPrivateIntellisensePackageId)" Version="$(MicrosoftPrivateIntellisensePackageVersion)" PrivateAssets="all" IsImplicitlyDefined="true" /> + <PackageReference Include="$(MicrosoftPrivateIntellisensePackage)" Version="$(MicrosoftPrivateIntellisenseVersion)" PrivateAssets="all" IsImplicitlyDefined="true" /> </ItemGroup> <!-- the intellisense package doesn't use nuget conventions so we need to select manually --> @@ -9,7 +9,7 @@ AfterTargets="Restore"> <ItemGroup> - <DocFile Include="$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackageId)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp/**/*.xml"/> + <DocFile Include="$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackage)/$(MicrosoftPrivateIntellisenseVersion)/xmldocs/netcoreapp/**/*.xml"/> <DocFile> <!-- trim off slash since it differs by platform and we need to do a string compare --> <LCID>$([System.String]::new('%(RecursiveDir)').TrimEnd('\/'))</LCID> diff --git a/eng/restore/illink.targets b/eng/restore/illink.targets index 137612c5834..aa40e2a2a4e 100644 --- a/eng/restore/illink.targets +++ b/eng/restore/illink.targets @@ -1,14 +1,14 @@ <Project> <ItemGroup> - <PackageReference Include="illink.tasks" Version="$(ILLinkTasksPackageVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" /> + <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" /> </ItemGroup> <Target Name="IncludeToolsFiles" AfterTargets="Restore"> <ItemGroup> - <_illinkSrcFiles Include="$(NuGetPackageRoot)illink.tasks\$(ILLinkTasksPackageVersion)\tools\**\*" /> + <_illinkSrcFiles Include="$(NuGetPackageRoot)illink.tasks\$(ILLinkTasksVersion)\tools\**\*" /> </ItemGroup> <Copy SourceFiles="@(_illinkSrcFiles)" diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index da5408b022d..e4bac71b81e 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,8 +1,8 @@ <Project> <ItemGroup> - <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackageId)" Version="$(optimizationwindows_ntx64IBCCoreFxPackageVersion)" /> - <IBCPackage Include="$(LinuxCoreFxOptimizationDataPackageId)" Version="$(optimizationwindows_ntx64IBCCoreFxPackageVersion)" /> + <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackage)" Version="$(optimizationwindows_ntx64IBCCoreFxVersion)" /> + <IBCPackage Include="$(LinuxCoreFxOptimizationDataPackage)" Version="$(optimizationwindows_ntx64IBCCoreFxVersion)" /> <PackageReference Include="@(IBCPackage)" PrivateAssets="all" IsImplicitlyDefined="true" /> </ItemGroup> |