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

Commit f050264

Browse files
author
William Lee
authored
Rename to BundledNETCorePlatformsPackageVersion (#8538)
1 parent 5fa558a commit f050264

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

build/DependencyVersions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
1515
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
1616
<MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion>
17-
<MicrosoftNETSdkPackageVersion>2.1.300-preview2-62530-05</MicrosoftNETSdkPackageVersion>
17+
<MicrosoftNETSdkPackageVersion>2.1.300-preview2-62607-04</MicrosoftNETSdkPackageVersion>
1818
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
1919
<MicrosoftNETSdkRazorPackageVersion>2.1.0-preview2-30028</MicrosoftNETSdkRazorPackageVersion>
2020
<MicrosoftNETSdkWebPackageVersion>2.1.0-release21-20180126-1326543</MicrosoftNETSdkWebPackageVersion>

build/MSBuildExtensions.targets

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,25 @@
9797
of our build against Microsoft.NETCore.App to find the correct NETStandard.Library version
9898
-->
9999
<ItemGroup>
100-
<_NETStandardLibraryVersions Include="@(PackageDefinitions->'%(Version)')"
100+
<_NETStandardLibraryPackageVersions Include="@(PackageDefinitions->'%(Version)')"
101101
Condition="%(PackageDefinitions.Name) == 'NetStandard.Library'" />
102-
<_NETCorePlatformsImplicitPackageVersion Include="@(PackageDefinitions->'%(Version)')"
102+
<_NETCorePlatformsPackageVersions Include="@(PackageDefinitions->'%(Version)')"
103103
Condition="%(PackageDefinitions.Name) == 'Microsoft.NETCore.Platforms'" />
104104
</ItemGroup>
105105

106-
<Error Condition="@(_NETStandardLibraryVersions->Distinct()->Count()) != 1"
106+
<Error Condition="@(_NETStandardLibraryPackageVersions->Distinct()->Count()) != 1"
107107
Text="Failed to determine the NETStandard.Library version pulled in Microsoft.NETCore.App" />
108+
<Error Condition="@(_NETCorePlatformsPackageVersions->Distinct()->Count()) != 1"
109+
Text="Failed to determine the Microsoft.NETCore.Platforms version pulled in Microsoft.NETCore.App" />
108110

109111
<PropertyGroup>
110112
<_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</_NETCoreAppPackageVersion>
111-
<_NETStandardPackageVersion>@(_NETStandardLibraryVersions->Distinct())</_NETStandardPackageVersion>
112-
<_NETCorePlatformsImplicitPackageVersion>@(_NETCorePlatformsImplicitPackageVersion->Distinct())</_NETCorePlatformsImplicitPackageVersion>
113+
<_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct())</_NETStandardLibraryPackageVersion>
114+
<_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct())</_NETCorePlatformsPackageVersion>
113115

114116
<!-- Use only major and minor in target framework version -->
115117
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
116-
<_NETStandardTargetFrameworkVersion>$(_NETStandardPackageVersion.Split('.')[0]).$(_NETStandardPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
118+
<_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
117119

118120
<BundledVersionsPropsContent>
119121
<![CDATA[
@@ -133,8 +135,8 @@ Copyright (c) .NET Foundation. All rights reserved.
133135
<BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
134136
<BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>
135137
<BundledNETStandardTargetFrameworkVersion>$(_NETStandardTargetFrameworkVersion)</BundledNETStandardTargetFrameworkVersion>
136-
<BundledNETStandardPackageVersion>$(_NETStandardPackageVersion)</BundledNETStandardPackageVersion>
137-
<NETCorePlatformsImplicitPackageVersion>$(_NETCorePlatformsImplicitPackageVersion)</NETCorePlatformsImplicitPackageVersion>
138+
<BundledNETStandardPackageVersion>$(_NETStandardLibraryPackageVersion)</BundledNETStandardPackageVersion>
139+
<BundledNETCorePlatformsPackageVersion>$(_NETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
138140
</PropertyGroup>
139141
</Project>
140142
]]>

0 commit comments

Comments
 (0)