Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit d2eaa36

Browse files
Merge branch 'rel/2.0.0-templates' into dev
2 parents 895a611 + 169ef12 commit d2eaa36

File tree

9 files changed

+58
-48
lines changed

9 files changed

+58
-48
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ install:
44
- ps: Install-Product node 6.9.2 x64
55
# .NET Core SDK binaries
66
# Download .NET Core 2.0 Preview 3 SDK and add to PATH
7-
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006729/dotnet-sdk-2.0.0-preview3-006729-win-x64.zip"
7+
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006857/dotnet-sdk-2.0.0-preview3-006857-win-x64.zip"
88
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
99
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
1010
- ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName())

templates/AngularSpa/AngularSpa.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26380" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26380" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26380" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26380" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26380" />
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26380" />
22+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

templates/AureliaSpa/AureliaSpa.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26380" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26380" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26380" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26380" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26380" />
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26380" />
22+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2323
</ItemGroup>
2424

2525
<!--/-:cnd:noEmit -->

templates/KnockoutSpa/KnockoutSpa.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26380" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26380" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26380" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26380" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26380" />
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26380" />
22+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2323
</ItemGroup>
2424

2525
<!--/-:cnd:noEmit -->

templates/ReactReduxSpa/ReactReduxSpa.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26380" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26380" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26380" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26380" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26380" />
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26380" />
22+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

templates/ReactSpa/ReactSpa.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26380" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26380" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26380" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26380" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26380" />
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26380" />
22+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2323
</ItemGroup>
2424

2525
<!--/-:cnd:noEmit -->

templates/VueSpa/VueSpa.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-rtm-26380" />
12+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-rtm-26380" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-rtm-26380" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-rtm-26380" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-rtm-26380" />
15+
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-rtm-26380" />
22+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2323
</ItemGroup>
2424

2525
<!--/-:cnd:noEmit -->

templates/package-builder/src/build/build.ts

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,13 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string)
9191
});
9292
}
9393

94-
function leftPad(str: string, minLength: number, padChar: string) {
95-
while (str.length < minLength) {
96-
str = padChar + str;
97-
}
98-
return str;
99-
}
100-
10194
function getBuildNumber(): string {
10295
if (process.env.APPVEYOR_BUILD_NUMBER) {
103-
return leftPad(process.env.APPVEYOR_BUILD_NUMBER, 6, '0');
96+
return process.env.APPVEYOR_BUILD_NUMBER;
10497
}
10598

10699
// For local builds, use timestamp
107-
return 't-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000));
100+
return Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)) + '-local';
108101
}
109102

110103
function buildYeomanNpmPackage(outputRoot: string) {
@@ -206,10 +199,23 @@ function buildDotNetNewNuGetPackage(packageId: string) {
206199
HostIdentifier: {
207200
type: 'bind',
208201
binding: 'HostIdentifier'
202+
},
203+
skipRestore: {
204+
type: 'parameter',
205+
datatype: 'bool',
206+
description: 'If specified, skips the automatic restore of the project on create.',
207+
defaultValue: 'false'
209208
}
210209
},
211210
tags: { language: 'C#', type: 'project' },
212211
postActions: [
212+
{
213+
condition: '(!skipRestore)',
214+
description: 'Restore NuGet packages required by this project.',
215+
manualInstructions: [{ text: 'Run \'dotnet restore\'' }],
216+
actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025',
217+
continueOnError: true
218+
},
213219
/*
214220
// Currently it doesn't appear to be possible to run `npm install` from a
215221
// postAction, due to https://github.com/dotnet/templating/issues/849
@@ -245,7 +251,11 @@ function buildDotNetNewNuGetPackage(packageId: string) {
245251
},
246252
Framework: {
247253
longName: 'framework'
248-
}
254+
},
255+
skipRestore: {
256+
longName: 'no-restore',
257+
shortName: ''
258+
},
249259
}
250260
}, null, 2));
251261

templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Microsoft.DotNet.Web.Spa.ProjectTemplates</id>
5-
<version>1.0.0-preview-{buildnumber}</version>
5+
<version>1.0.{buildnumber}</version>
66
<description>Single Page Application templates for ASP.NET Core</description>
77
<authors>Microsoft</authors>
88
<language>en-US</language>

0 commit comments

Comments
 (0)