Commit Graph

552 Commits

Author SHA1 Message Date
Justin Kotalik 4437c72e30 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/Templating into merge/release/2.2-to-master 2018-10-24 12:05:12 -07:00
Justin Kotalik 70a786adcd
Make AspNetCoreHostingModel element not be insert when targeting net461 and inprocess => InProcess (#797) 2018-10-24 11:36:07 -07:00
Ryan Brandenburg 707b1bbf3b Fix link 2018-10-22 12:48:30 -07:00
Nate McMaster 1dfe06323f
Merge branch release/2.2 2018-10-17 11:52:06 -07:00
Nate McMaster 80d3bbfcc9
Update code signing config to exclude .js files in template packages 2018-10-17 11:13:02 -07:00
Ryan Brandenburg a4a9dbca1c
Merge pull request #778 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-16 13:56:04 -07:00
ASP.NET CI b1363c88ef
Update package branding for 2.2 RTM 2018-10-16 12:48:21 -07:00
Ryan Brandenburg 73f161cc60 Set crossorigin anonymous for integrity 2018-10-15 15:51:46 -07:00
Ryan Brandenburg bd375fc9ee Fix audit failure 2018-10-15 10:49:40 -07:00
Ryan Brandenburg bcc6a17c3d
Merge pull request #771 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-12 15:56:42 -07:00
Peter Blazejewicz 98162cb7df Remove `launchsettings.json` entry from `.gitignore`. Closes #760 (#761)
Do not ignore launchsettings.json. Closes #760

As discussed in:
https://github.com/github/gitignore/pull/2705
https://github.com/github/VisualStudio/issues/1405
2018-10-12 12:58:50 -07:00
Ryan Brandenburg 8bffcc8f69 Include Razor.Design dep that was missing in master 2018-10-12 09:46:50 -07:00
Ryan Brandenburg df394051d0 JQuery Unobtrusive to 3.2.11 2018-10-11 12:29:32 -07:00
Ryan Brandenburg 7c817289ff
Merge branch 'master' into merge/release/2.2-to-master 2018-10-10 16:29:10 -07:00
Ryan Brandenburg 7d09ec6ccc
Low hanging fruit (#763)
Clean up low hanging fruit
2018-10-10 12:12:11 -07:00
ASP.NET CI c6a371abe1 Update dependencies.props
[auto-updated: dependencies]
2018-09-30 12:34:35 -07:00
ASP.NET CI 6abfd75b0f Update dependencies.props
[auto-updated: dependencies]
2018-09-30 12:31:06 -07:00
Nate McMaster 00e2b6201e
automated: merge branch release/2.2 2018-09-28 17:28:07 -07:00
Nate McMaster 9bda3a60a6
automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties 2018-09-28 17:10:41 -07:00
Eilon Lipton 7813cf0c71
Update LICENSE.txt 2018-09-27 15:25:42 -07:00
Ryan Brandenburg b07338b618
Don't use depricated methods (#751)
Don't use depricated methods
2018-09-26 12:50:24 -07:00
Ryan Brandenburg c6347f035f Conditionally include RootNamespace 2018-09-25 15:48:08 -07:00
Ryan Brandenburg 0745266c17 Razor->WebApp 2018-09-25 15:47:23 -07:00
Ryan Brandenburg afbf3f1e04 Merge branch 'merge/release/2.2-to-master' 2018-09-24 15:05:43 -07:00
ASP.NET CI 5a22e20bfc Update dependencies.props
[auto-updated: dependencies]
2018-09-23 19:34:32 +00:00
ASP.NET CI 80b1132c64 Update dependencies.props
[auto-updated: dependencies]
2018-09-23 12:31:33 -07:00
Ryan Brandenburg a140f38810 Enhancments 2018-09-20 14:52:16 -07:00
Ryan Brandenburg f63412f1bb Update package verions 2018-09-18 14:34:39 -07:00
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