Commit Graph

524 Commits

Author SHA1 Message Date
Ryan Brandenburg 7356b9634b Merge branch 'merge/release/2.2-to-master' 2018-09-17 11:58:51 -07:00
Ryan Brandenburg 1168369759 Merge branch 'master' of github.com:aspnet/templating 2018-09-17 11:57:01 -07:00
ASP.NET CI 6672ff701b Update dependencies.props
[auto-updated: dependencies]
2018-09-16 19:33:38 +00:00
ASP.NET CI 3db9c1e488 Update dependencies.props
[auto-updated: dependencies]
2018-09-16 12:31:05 -07:00
Ryan Brandenburg 5fa3d642a8 Merge branch 'merge/release/2.2-to-master' 2018-09-13 14:47:59 -07:00
Ryan Brandenburg b8f7f967ce Normalize FSharp templates and don't check in site.min.js 2018-09-13 14:41:32 -07:00
Ryan Brandenburg 704a77b8a4 Fix template run script 2018-09-13 12:38:27 -07:00
Ryan Brandenburg c5f1d5a3eb Merge branch 'merge/release/2.2-to-master' 2018-09-10 15:14:41 -07:00
Ryan Brandenburg 14b1432481 Fix min.css files 2018-09-10 12:25:27 -07:00
ASP.NET CI 6d25b826a2 Update dependencies.props
[auto-updated: dependencies]
2018-09-09 19:34:06 +00:00
ASP.NET CI 7308a9311f Update dependencies.props
[auto-updated: dependencies]
2018-09-09 12:32:34 -07:00
Ryan Brandenburg 1d04294bab Merge branch 'merge/release/2.2-to-master' 2018-09-06 10:02:12 -07:00
Ryan Brandenburg c92432a8d4 Merge branch 'master' of github.com:aspnet/templating 2018-09-06 10:00:15 -07:00
ASP.NET CI b8d09f4cea Update dependencies.props
[auto-updated: dependencies]
2018-09-06 00:04:31 +00:00
ASP.NET CI ed65af8e87
Update branding to 2.2.0-preview3 2018-09-05 16:36:37 -07:00
ASP.NET CI 629502e3ce Update dependencies.props
[auto-updated: dependencies]
2018-09-02 19:31:49 +00:00
ASP.NET CI cb3791ec99 Update dependencies.props
[auto-updated: dependencies]
2018-09-02 12:29:52 -07:00
Ryan Brandenburg 5f5524a477 Merge branch 'merge/release/2.2-to-master' 2018-08-30 15:23:14 -07:00
Pranav K 9f05870f1f
Merge pull request #719 from aspnet/prkrishn/remove-viewcompilation
Remove references to MvcPrecompilation package
2018-08-30 11:23:33 -07:00
Pranav K 47d61ff5b3
Remove references to MvcPrecompilation package 2018-08-30 10:53:25 -07:00
Ryan Brandenburg afccb085a2 Fix links and formating 2018-08-29 16:22:42 -07:00
Pavel Krymets 26710080fe
Set AspNetCoreHostingModel in templates (#716) 2018-08-29 16:08:58 -07:00
Ryan Brandenburg 75fa0cd6e8 Remove SpaServices where they're un-needed 2018-08-29 15:24:12 -07:00
Ryan Brandenburg ccb2c006aa Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 2018-08-29 15:21:15 -07:00
Patrick Westerhoff 208f6ff568 Fix #574: Set NoDefaultLaunchSettingsFile
When a project is created with ExcludeLaunchSettings enabled, set the
NoDefaultLaunchSettingsFile property to prevent Visual Studio from
creating a launchSettings.json.
2018-08-29 11:35:16 -07:00
Nate McMaster afa93f1852
Merge branch 'release/2.1' into release/2.2 2018-08-28 10:14:24 -07:00
Ryan Brandenburg 9c28f95b12 Add Microsoft.AspNetCore.Razor.Design to templates (#674) 2018-08-28 09:41:15 -07:00
Matt Ward 9652fbd2b4 Fix default None items not being removed from ClientApp directory
Content MSBuild items from the ClientApp directory are removed from
the project using an MSBuild and then all files are added as None
items. None items that were added by the .NET Core SDK default MSBuild
items were not being removed from the ClientApp directory. This
resulted in duplicate files shown in Visual Studio for Mac. This
affected all the SPA project templates.

Fixes #559
2018-08-27 09:59:00 -07:00
Ryan Brandenburg a3b20c57ea Add appsettings.json to EmptyWeb 2018-08-27 09:52:47 -07:00
ASP.NET CI 00faa0ca2e Update dependencies.props
[auto-updated: dependencies]
2018-08-26 19:32:27 +00:00
Ryan Brandenburg 3570f1a2b1 Merge branch 'merge/release/2.2-to-master' 2018-08-23 10:32:20 -07:00
Javier Calvarro Nelson ed19e34256 Upgrade deps 2018-08-22 14:29:38 -07:00
Javier Calvarro Nelson de0932961b Default Identity UI to Bootstrap4 2018-08-22 13:40:38 -07:00
Javier Calvarro Nelson 110d835434 Fix layout and login partial issues 2018-08-22 13:33:01 -07:00
Javier Calvarro Nelson 3ed89516ba Update precedence for 2.2 templates 2018-08-22 13:31:59 -07:00
Ryan Brandenburg 11c6ebea2e Add comments regarding HSTS max age 2018-08-22 11:45:56 -07:00
Ryan Brandenburg d9e71527e8 Fix copyright year 2018-08-22 11:44:46 -07:00
ASP.NET CI 2476481464 Update package branding for 2.2.0-preview2 2018-08-21 13:33:52 -07:00
Ryan Brandenburg e28e851ed8 Make a VSTS builds use a template 2018-08-20 10:31:29 -07:00
Ryan Brandenburg 2d33543117 Skip test broken by lack of 30 SDK 2018-08-20 10:28:31 -07:00
Nate McMaster 8a553a7826
Bumping version from 2.1.4 to 2.1.5 2018-08-20 09:43:01 -07:00
ASP.NET CI 7a0967e5c6 Update dependencies.props
[auto-updated: dependencies]
2018-08-19 19:33:01 +00:00
Ryan Brandenburg 07b97e2f89 Merge branch 'merge/release/2.2-to-master' 2018-08-14 09:50:10 -07:00
Ryan Brandenburg a431f8efa1
Don't publish too much of ClientApp (#672)
* Don't publish too much of ClientApp

* Fix scripts and remove extra publish items
2018-08-13 16:21:50 -07:00
Ryan Brandenburg 9618a59485 Add .gitattributes file 2018-08-13 11:12:31 -07:00
ASP.NET CI d7b897ad75 Update dependencies.props
[auto-updated: dependencies]
2018-08-12 20:18:24 +00:00
ASP.NET CI 25661213f2 Update dependencies.props
[auto-updated: dependencies]
2018-08-12 19:33:25 +00:00
Ryan Brandenburg b029f79b4d
Import styles in correct order (#668)
In the `angular-cli.json` file, the styles.css file should be imported last in the styles section, so the developer can override styles from third party libraries (bootstrap, in this case).
2018-08-10 14:45:12 -07:00
Nate McMaster 7d91d659ff
Merge branch 'release/2.2' 2018-08-10 11:06:49 -07:00
Nate McMaster af616d9b99
Remove KoreBuild-isms from project templates (#667)
Removing MSBuild properties and items are for our build infrastructure, not for customers.
2018-08-10 11:01:56 -07:00