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

Version the SPA template package [release/2.1] (#11774) 

* Version the SPA template package

* Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj

* Fix templates
This commit is contained in:
Ryan Brandenburg 2019-07-12 11:45:46 -07:00 committed by Artak
parent 59d43346e6
commit c8fc054096
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/artifacts.props
View File

@ -145,7 +145,7 @@
<PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" /> <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" /> <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Category="shipoob" /> <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" /> <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Category="shipoob" />
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />

2
src/AzureIntegration/build/repo.targets
View File

@ -70,7 +70,7 @@
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(PackageVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(PackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(PackageVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(PackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(PackageVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="$(PackageVersion)" />
</ItemGroup> </ItemGroup>
<Message Text="Removing %(_CleanupFiles.Identity)" Importance="High" /> <Message Text="Removing %(_CleanupFiles.Identity)" Importance="High" />

2
src/Templating/NuGetPackageVerifier.json
View File

@ -24,7 +24,7 @@
"Template" "Template"
] ]
}, },
"Microsoft.DotNet.Web.Spa.ProjectTemplates": { "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1": {
"packageTypes": [ "packageTypes": [
"Template" "Template"
] ]

1
src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
View File

@ -4,6 +4,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<PackageId>Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</PackageId>
<Description>Single Page Application templates for ASP.NET Core</Description> <Description>Single Page Application templates for ASP.NET Core</Description>
<PackageTags>$(PackageTags);spa</PackageTags> <PackageTags>$(PackageTags);spa</PackageTags>
</PropertyGroup> </PropertyGroup>

2
src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
View File

@ -140,4 +140,4 @@
"continueOnError": true "continueOnError": true
} }
] ]
} }

2
src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
View File

@ -21,7 +21,7 @@ namespace Templates.Test.Helpers
"Microsoft.DotNet.Web.ProjectTemplates.1.x", "Microsoft.DotNet.Web.ProjectTemplates.1.x",
"Microsoft.DotNet.Web.ProjectTemplates.2.0", "Microsoft.DotNet.Web.ProjectTemplates.2.0",
"Microsoft.DotNet.Web.ProjectTemplates.2.1", "Microsoft.DotNet.Web.ProjectTemplates.2.1",
"Microsoft.DotNet.Web.Spa.ProjectTemplates", "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1",
}; };
public static string CustomHivePath { get; } = Path.Combine(AppContext.BaseDirectory, ".templateengine"); public static string CustomHivePath { get; } = Path.Combine(AppContext.BaseDirectory, ".templateengine");