* Fix #1874

The tools and tasks were missing from the package.

Also added some hardening to the targets so we can detect regressions.
This commit is contained in:
Ryan Nowak 2017-12-27 16:49:01 -08:00 committed by GitHub
parent 34fe4099c2
commit 54c8bc82db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions

View File

@ -8,6 +8,14 @@
"RazorPageGenerator": {} "RazorPageGenerator": {}
} }
}, },
"razor-design": { // this is a 'fat' package that contains some assets we don't own
"rules": [
// Don't run any rules (temporary, tracked by #1887)
],
"packages": {
"Microsoft.AspNetCore.Razor.Design": {}
}
},
"Default": { // Rules to run for packages not listed in any other set. "Default": { // Rules to run for packages not listed in any other set.
"rules": [ "rules": [
"DefaultCompositeRule" "DefaultCompositeRule"

View File

@ -49,7 +49,7 @@
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup> <PropertyGroup>
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_BuildDependencyProjects</GenerateNuspecDependsOn> <GenerateNuspecDependsOn>_BuildDependencyProjects;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
<BuildDependsOn>_BuildDependencyProjects;$(BuildDependsOn)</BuildDependsOn> <BuildDependsOn>_BuildDependencyProjects;$(BuildDependsOn)</BuildDependsOn>
</PropertyGroup> </PropertyGroup>
@ -91,6 +91,9 @@
<None Include="@(TaskAssemblyNetStandard)" PackagePath="tasks\netstandard2.0\" Pack="true"/> <None Include="@(TaskAssemblyNetStandard)" PackagePath="tasks\netstandard2.0\" Pack="true"/>
</ItemGroup> </ItemGroup>
<Error Text="TaskAssemblyNet46 is empty. This is a bug" Condition="'@(TaskAssemblyNet46)'==''"/>
<Error Text="TaskAssemblyNetStandard is empty. This is a bug" Condition="'@(TaskAssemblyNetStandard)'==''"/>
<!-- <!--
Next we need to build the netcoreapp2.0 tools. In this case we need to do a publish, because we need Next we need to build the netcoreapp2.0 tools. In this case we need to do a publish, because we need
all of the output to put in the package. all of the output to put in the package.
@ -103,7 +106,13 @@
Targets="Publish"/> Targets="Publish"/>
<ItemGroup> <ItemGroup>
<None Include="$(OutputPath)tools\**\*" Exclude="$(OutputPath)tools\**\*.xml;$(OutputPath)tools\**\*.pdb" PackagePath="tools\" Pack="true"/> <_RazorTool Include="$(OutputPath)tools\**\*" Exclude="$(OutputPath)tools\**\*.xml;$(OutputPath)tools\**\*.pdb" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="@(_RazorTool)" PackagePath="tools\" Pack="true"/>
</ItemGroup>
<Error Text="_RazorTool is empty. This is a bug" Condition="'@(_RazorTool)'==''"/>
</Target> </Target>
</Project> </Project>