Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 83f4728

Browse files
ViktorHoferViktorHofer
committed
Use Package suffix instead of PackageId
1 parent a24db0b commit 83f4728

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323
<!-- Package names if they are used in more then one location in the repo -->
2424
<PropertyGroup>
25-
<NETStandardLibraryPackageId>NETStandard.Library</NETStandardLibraryPackageId>
26-
<WindowsCoreFxOptimizationDataPackageId>optimization.windows_nt-x64.ibc.corefx</WindowsCoreFxOptimizationDataPackageId>
27-
<LinuxCoreFxOptimizationDataPackageId>optimization.linux-x64.ibc.corefx</LinuxCoreFxOptimizationDataPackageId>
28-
<MicrosoftPrivateIntellisensePackageId>microsoft.private.intellisense</MicrosoftPrivateIntellisensePackageId>
25+
<NETStandardLibraryPackage>netstandard.library</NETStandardLibraryPackage>
26+
<WindowsCoreFxOptimizationDataPackage>optimization.windows_nt-x64.ibc.corefx</WindowsCoreFxOptimizationDataPackage>
27+
<LinuxCoreFxOptimizationDataPackage>optimization.linux-x64.ibc.corefx</LinuxCoreFxOptimizationDataPackage>
28+
<MicrosoftPrivateIntellisensePackage>microsoft.private.intellisense</MicrosoftPrivateIntellisensePackage>
2929
</PropertyGroup>
3030
<PropertyGroup>
3131
<!-- Arcade dependencies -->

‎eng/codeOptimization.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
Condition="'$(IsEligibleForNgenOptimization)' == 'true'"
1111
BeforeTargets="CoreCompile">
1212
<PropertyGroup>
13-
<IbcOptimizationDataDir Condition="'$(OSGroup)' == 'Unix' or '$(OSGroup)' == 'Linux'">$(IbcOptimizationDataDir)$(LinuxCoreFxOptimizationDataPackageId)\</IbcOptimizationDataDir>
14-
<IbcOptimizationDataDir Condition="'$(OSGroup)' != 'Unix' and '$(OSGroup)' != 'Linux'">$(IbcOptimizationDataDir)$(WindowsCoreFxOptimizationDataPackageId)\</IbcOptimizationDataDir>
13+
<IbcOptimizationDataDir Condition="'$(OSGroup)' == 'Unix' or '$(OSGroup)' == 'Linux'">$(IbcOptimizationDataDir)$(LinuxCoreFxOptimizationDataPackage)\</IbcOptimizationDataDir>
14+
<IbcOptimizationDataDir Condition="'$(OSGroup)' != 'Unix' and '$(OSGroup)' != 'Linux'">$(IbcOptimizationDataDir)$(WindowsCoreFxOptimizationDataPackage)\</IbcOptimizationDataDir>
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" />

‎eng/packaging.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
1414

1515
<!-- Used by PackageLibs.targets -->
16-
<XmlDocFileRoot>$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackageId)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp</XmlDocFileRoot>
16+
<XmlDocFileRoot>$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackage)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp</XmlDocFileRoot>
1717

1818
<!-- By default the packaging targets will package desktop facades as ref,
1919
but we don't use this as we now build partial-reference-facades. -->

‎eng/restore/docs.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="$(MicrosoftPrivateIntellisensePackageId)" Version="$(MicrosoftPrivateIntellisensePackageVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
4+
<PackageReference Include="$(MicrosoftPrivateIntellisensePackage)" Version="$(MicrosoftPrivateIntellisensePackageVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
55
</ItemGroup>
66

77
<!-- the intellisense package doesn't use nuget conventions so we need to select manually -->
88
<Target Name="GetDocFiles"
99
AfterTargets="Restore">
1010

1111
<ItemGroup>
12-
<DocFile Include="$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackageId)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp/**/*.xml"/>
12+
<DocFile Include="$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackage)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp/**/*.xml"/>
1313
<DocFile>
1414
<!-- trim off slash since it differs by platform and we need to do a string compare -->
1515
<LCID>$([System.String]::new('%(RecursiveDir)').TrimEnd('\/'))</LCID>

‎eng/restore/optimizationData.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22

33
<ItemGroup>
4-
<IBCPackage Include="$(WindowsCoreFxOptimizationDataPackageId)" Version="$(optimizationwindows_ntx64IBCCoreFxPackageVersion)" />
5-
<IBCPackage Include="$(LinuxCoreFxOptimizationDataPackageId)" Version="$(optimizationwindows_ntx64IBCCoreFxPackageVersion)" />
4+
<IBCPackage Include="$(WindowsCoreFxOptimizationDataPackage)" Version="$(optimizationwindows_ntx64IBCCoreFxPackageVersion)" />
5+
<IBCPackage Include="$(LinuxCoreFxOptimizationDataPackage)" Version="$(optimizationwindows_ntx64IBCCoreFxPackageVersion)" />
66
<PackageReference Include="@(IBCPackage)" PrivateAssets="all" IsImplicitlyDefined="true" />
77
</ItemGroup>
88

‎src/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
<FrameworkLayout Include="$(NETCoreAppPackageRefPath)">
2828
<TargetFramework>netcoreapp2.0</TargetFramework>
2929
</FrameworkLayout>
30-
<FrameworkLayout Include="$(NuGetPackageRoot)$(NETStandardLibraryPackageId)\$(NETStandardLibraryPackageVersion)\build\netstandard2.0\ref">
30+
<FrameworkLayout Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\build\netstandard2.0\ref">
3131
<TargetFramework>netstandard2.0</TargetFramework>
3232
</FrameworkLayout>
33-
<FrameworkLayout Include="$(NuGetPackageRoot)$(NETStandardLibraryPackageId)\$(NETStandardLibraryPackageVersion)\build\net461\ref">
33+
<FrameworkLayout Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\build\net461\ref">
3434
<TargetFramework>net461</TargetFramework>
3535
</FrameworkLayout>
3636
</ItemGroup>

‎src/pkg/frameworkPackage.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
66

77
<NETStandardVersion Condition="'$(NETStandardVersion)' == ''">2.0</NETStandardVersion>
8-
<NETStandardPackageRefPath Condition="'$(NETStandardPackageRefPath)' == ''">$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\netstandard$(NETStandardVersion)\ref</NETStandardPackageRefPath>
8+
<NETStandardPackageRefPath Condition="'$(NETStandardPackageRefPath)' == ''">$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\build\netstandard$(NETStandardVersion)\ref</NETStandardPackageRefPath>
99

1010
<IncludeReferenceFiles Condition="'$(IncludeReferenceFiles)' == '' AND '$(PackageTargetRuntime)' == ''">true</IncludeReferenceFiles>
1111
<IncludeLibFiles Condition="'$(IncludeLibFiles)' == '' AND '$(PackageTargetRuntime)' != ''">true</IncludeLibFiles>
@@ -162,8 +162,8 @@
162162
<Error Condition="'@(_NETStandardFile)' == ''"
163163
Text="Could not locate NETStandard package content at '$(NETStandardPackageRefPath)'" />
164164

165-
<Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardLibraryPackageId)' but missing from this package's $(_fileSet) files. This error has been suppressed." />
166-
<Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardLibraryPackageId)' but missing from this package's $(_fileSet) files." />
165+
<Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardLibraryPackage)' but missing from this package's $(_fileSet) files. This error has been suppressed." />
166+
<Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardLibraryPackage)' but missing from this package's $(_fileSet) files." />
167167
</Target>
168168

169169
<Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">

‎src/restore/netstandard/netstandard.depproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
<Target Name="AddNETStandard21Refs" AfterTargets="ResolveReferences">
7979
<PropertyGroup>
80-
<_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\netstandard2.1\ref</_NETStandard21RefFolder>
80+
<_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\build\netstandard2.1\ref</_NETStandard21RefFolder>
8181
</PropertyGroup>
8282

8383
<ItemGroup>
@@ -102,7 +102,7 @@
102102
<Target Name="AddNETStandard20Refs" AfterTargets="ResolveReferences"
103103
Condition="'$(_NETStandardTFMFolder)' != ''">
104104
<PropertyGroup>
105-
<_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
105+
<_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
106106
</PropertyGroup>
107107

108108
<ItemGroup>
@@ -117,7 +117,7 @@
117117
<ItemGroup>
118118
<Reference Include="@(NetStandardRefs)">
119119
<Private>False</Private>
120-
<NuGetPackageId>$(NETStandardLibraryPackageId)</NuGetPackageId>
120+
<NuGetPackageId>$(NETStandardLibraryPackage)</NuGetPackageId>
121121
<NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion>
122122
</Reference>
123123
</ItemGroup>

0 commit comments

Comments
 (0)