huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extract Analyzer and Authorization package version and use it in Components nuspec. 

#8825
This commit is contained in:
N. Taylor Mullen 2019-07-12 12:09:18 -07:00
parent 84dce20789
commit 519ec839af
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>

14
src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
View File

@ -19,13 +19,25 @@
<Reference Include="System.ComponentModel.Annotations" /> <Reference Include="System.ComponentModel.Annotations" />
</ItemGroup> </ItemGroup>
<Target Name="_GetNuspecDependencyPackageVersions">
<MSBuild Targets="_GetPackageVersionInfo"
BuildInParallel="$(BuildInParallel)"
Projects="../../Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj;../../../Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj">
<Output TaskParameter="TargetOutputs" ItemName="_ProjectPathWithVersion" />
</MSBuild>
<ItemGroup>
<NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.AspnetCore.Components.Analyzers')->'componentAnalyzerPackageVersion=%(PackageVersion)')" />
<NuspecProperty Include="@(_ProjectPathWithVersion->WithMetadataValue('PackageId', 'Microsoft.AspnetCore.Authorization')->'authorizationPackageVersion=%(PackageVersion)')" />
</ItemGroup>
</Target>
<!-- Pack settings --> <!-- Pack settings -->
<PropertyGroup> <PropertyGroup>
<NuspecFile>Microsoft.AspNetCore.Components.nuspec</NuspecFile> <NuspecFile>Microsoft.AspNetCore.Components.nuspec</NuspecFile>
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_GetNuspecDependencyPackageVersions</GenerateNuspecDependsOn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<NuspecProperty Include="coherentPackageVersion=$(PackageVersion)" />
<NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" /> <NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" />
<NuspecProperty Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" /> <NuspecProperty Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
<NuspecProperty Include="outputPath=$(OutputPath)" /> <NuspecProperty Include="outputPath=$(OutputPath)" />

4
src/Components/Components/src/Microsoft.AspNetCore.Components.nuspec
View File

@ -4,8 +4,8 @@
$CommonMetadataElements$ $CommonMetadataElements$
<dependencies> <dependencies>
<group targetFramework=".NETStandard2.0"> <group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$coherentPackageVersion$" /> <dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$componentAnalyzerPackageVersion$" />
<dependency id="Microsoft.AspNetCore.Authorization" version="$coherentPackageVersion$" exclude="Build,Analyzers" /> <dependency id="Microsoft.AspNetCore.Authorization" version="$authorizationPackageVersion$" exclude="Build,Analyzers" />
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" /> <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.ComponentModel.Annotations" version="$systemComponentModelAnnotationsPackageVersion$" exclude="Build,Analyzers" /> <dependency id="System.ComponentModel.Annotations" version="$systemComponentModelAnnotationsPackageVersion$" exclude="Build,Analyzers" />
</group> </group>