Skip to content

Commit 519ec83

Browse files
author
N. Taylor Mullen
committed
Extract Analyzer and Authorization package version and use it in Components nuspec.
#8825
1 parent 84dce20 commit 519ec83

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>

src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

+13-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,25 @@
1919
<Reference Include="System.ComponentModel.Annotations" />
2020
</ItemGroup>
2121

22+
<Target Name="_GetNuspecDependencyPackageVersions">
23+
<MSBuild Targets="_GetPackageVersionInfo"
24+
BuildInParallel="$(BuildInParallel)"
25+
Projects="../../Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj;../../../Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj">
26+
<Output TaskParameter="TargetOutputs" ItemName="_ProjectPathWithVersion" />
27+
</MSBuild>
28+
<ItemGroup>
29+
<NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.AspnetCore.Components.Analyzers')->'componentAnalyzerPackageVersion=%(PackageVersion)')" />
30+
<NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.AspnetCore.Authorization')->'authorizationPackageVersion=%(PackageVersion)')" />
31+
</ItemGroup>
32+
</Target>
33+
2234
<!-- Pack settings -->
2335
<PropertyGroup>
2436
<NuspecFile>Microsoft.AspNetCore.Components.nuspec</NuspecFile>
37+
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_GetNuspecDependencyPackageVersions</GenerateNuspecDependsOn>
2538
</PropertyGroup>
2639

2740
<ItemGroup>
28-
<NuspecProperty Include="coherentPackageVersion=$(PackageVersion)" />
2941
<NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" />
3042
<NuspecProperty Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
3143
<NuspecProperty Include="outputPath=$(OutputPath)" />

src/Components/Components/src/Microsoft.AspNetCore.Components.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
$CommonMetadataElements$
55
<dependencies>
66
<group targetFramework=".NETStandard2.0">
7-
<dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$coherentPackageVersion$" />
8-
<dependency id="Microsoft.AspNetCore.Authorization" version="$coherentPackageVersion$" exclude="Build,Analyzers" />
7+
<dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$componentAnalyzerPackageVersion$" />
8+
<dependency id="Microsoft.AspNetCore.Authorization" version="$authorizationPackageVersion$" exclude="Build,Analyzers" />
99
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1010
<dependency id="System.ComponentModel.Annotations" version="$systemComponentModelAnnotationsPackageVersion$" exclude="Build,Analyzers" />
1111
</group>

0 commit comments

Comments
 (0)