github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-23 01:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview2' into dev

Browse Source
This commit is contained in:
Steve Sanderson
2017-06-08 10:40:05 +01:00
parent e331355c1d 0dd24068ca
commit 2acdad38cd
7 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
templates/AngularSpa/AngularSpa.csproj
View File

@@ -9,17 +9,18 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" /> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

11
templates/AureliaSpa/AureliaSpa.csproj
View File

@@ -9,13 +9,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

11
templates/KnockoutSpa/KnockoutSpa.csproj
View File

@@ -9,13 +9,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

11
templates/ReactReduxSpa/ReactReduxSpa.csproj
View File

@@ -9,13 +9,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

11
templates/ReactSpa/ReactSpa.csproj
View File

@@ -9,13 +9,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

11
templates/VueSpa/VueSpa.csproj
View File

@@ -9,13 +9,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

18
templates/package-builder/src/build/build.ts
View File

@@ -11,7 +11,7 @@ import * as targz from 'tar.gz';
const isWindows = /^win/.test(process.platform); const isWindows = /^win/.test(process.platform);
const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx'];
const yeomanGeneratorSource = './src/yeoman'; const yeomanGeneratorSource = './src/yeoman';
const localizationPackageGuid = '{296D76CB-AD6F-4B46-9072-33CC07E265F8}'; const webToolsVSPackageGuid = '{0CD94836-1526-4E85-87D3-FB5274C5AFC9}';
const dotNetPackages = { const dotNetPackages = {
builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates',
@@ -27,12 +27,12 @@ interface TemplateConfig {
} }
const templates: { [key: string]: TemplateConfig } = { const templates: { [key: string]: TemplateConfig } = {
'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 100 }, 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 1100 },
'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 200 }, 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 1200 },
'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 300 }, 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 1300 },
'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 400 }, 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 1400 },
'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 500 }, 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 1500 },
'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 600 } 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 1600 }
}; };
function isTextFile(filename: string): boolean { function isTextFile(filename: string): boolean {
@@ -258,8 +258,8 @@ function buildDotNetNewNuGetPackage(packageId: string) {
fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({
$schema: 'http://json.schemastore.org/vs-2017.3.host', $schema: 'http://json.schemastore.org/vs-2017.3.host',
name: { text: templateConfig.displayName, package: localizationPackageGuid, id: localisedNameId.toString() }, name: { text: templateConfig.displayName, package: webToolsVSPackageGuid, id: localisedNameId.toString() },
description: { text: `ASP.NET Core application with ${templateConfig.displayName}`, package: localizationPackageGuid, id: localisedDescId.toString() }, description: { text: `A project template for creating an ASP.NET Core application with ${templateConfig.displayName}`, package: webToolsVSPackageGuid, id: localisedDescId.toString() },
order: 301, order: 301,
icon: 'icon.png', icon: 'icon.png',
learnMoreLink: 'https://github.com/aspnet/JavaScriptServices', learnMoreLink: 'https://github.com/aspnet/JavaScriptServices',