Commit Graph

142 Commits

Author SHA1 Message Date
Nate McMaster 654debe8fb
Merge branch 'master' into merge/release/2.2-to-master 2018-10-24 17:51:56 -07:00
Nate McMaster 7bde7399e9
2.2: remove Microsoft.VisualStudio.Web.CodeGeneration.Design from templates (#802)
This package does not need to be in the project until someone uses Visual Studio code generation. Visual Studio will automatically add this package when scaffolding is used for the first time, so it's unnecessary to put this in our templates.
2018-10-24 17:42:02 -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
Ryan Brandenburg 7356b9634b Merge branch 'merge/release/2.2-to-master' 2018-09-17 11:58:51 -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 5f5524a477 Merge branch 'merge/release/2.2-to-master' 2018-08-30 15:23:14 -07:00
Ryan Brandenburg a3b20c57ea Add appsettings.json to EmptyWeb 2018-08-27 09:52:47 -07:00
Ryan Brandenburg 2d33543117 Skip test broken by lack of 30 SDK 2018-08-20 10:28:31 -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
Ryan Brandenburg c33044c555 Merge branch 'merge/release/2.2-to-master' 2018-08-08 15:42:36 -07:00
Ryan Brandenburg e47a08612b JQuery-validate-unobtrusive version 3.2.10 2018-08-06 15:21:46 -07:00
Ryan Brandenburg f82461b4b0 Merge branch 'merge/release/2.2-to-master' 2018-08-06 13:01:08 -07:00
Ryan Brandenburg 71c15fb76a Use bootstrap4 for templates 2018-08-06 10:16:35 -07:00
Ryan Brandenburg d95f971693 Fix broken tests 2018-08-06 07:22:55 -07:00
Nate McMaster ba02ab85c1
Merge branch 'release/2.2' 2018-07-24 13:00:07 -07:00
Nate McMaster 0435add47a
Merge branch 'release/2.1' into release/2.2 2018-07-24 11:59:30 -07:00
Nate McMaster 55b697ab05
Revert "Add package version to Microsoft.AspNetCore.App in project templates"
This reverts commit 727bd52b64.
2018-07-18 13:11:01 -07:00
Nate McMaster 4ca00f6b1b
Merge branch 'release/2.2' 2018-07-03 17:55:29 -07:00
Nate McMaster 263e369b2e
Merge branch 'release/2.1' into release/2.2 2018-07-03 17:21:16 -07:00
Nate McMaster 727bd52b64
Add package version to Microsoft.AspNetCore.App in project templates
As discussed in aspnet/Home#3292, we're reversing course on the implicit package version feature. This adds a package version for Microsoft.AspNetCore.App to the `dotnet new` and VS templates.
2018-07-03 16:53:46 -07:00
Nate McMaster 6296f4fdab
Resolve build warnings about missing template properties 2018-07-02 16:13:17 -07:00
Nate McMaster 1f2e966454
Update templating to use netcoreapp3.0 2018-06-29 16:32:30 -07:00
Ryan Brandenburg 19f1bbb813 Adding VSTS file 2018-06-19 10:58:27 -07:00
Nate McMaster 006d111e3b
Merge branch 'release/2.1' into dev 2018-06-07 08:41:25 -07:00
Nate McMaster a5bb91c2cb
Prevent 2.1 template tests from corrupting machine state 2018-06-05 10:13:33 -07:00
Nate McMaster ef67a7fae6
Merge branch 'release/2.1' into dev 2018-05-31 21:06:26 -07:00
Nate McMaster 9ab4013baa
Merge branch 'release/2.1' into johluo/ci-update-implicit-implementation 2018-05-31 15:20:16 -07:00
John Luo d2025d516c Update implementation 2018-05-30 17:15:48 -07:00
Kiran Challa 4f5b358ba8 Added tests to verify fallback source content is same as the CDN content
# Conflicts:
#	build/dependencies.props
2018-05-30 15:58:40 -07:00
John Luo 48782f9718 Remove testing prop 2018-05-30 12:09:05 -07:00
John Luo f953d70d75 Update to 2.1.1 2018-05-30 12:09:05 -07:00
John Luo cc22ea1ed3 Test updated implicit version implementation 2018-05-30 12:09:05 -07:00
Ryan Brandenburg cd516b328e Handle process stdout 2018-05-18 14:56:34 -07:00
Ryan Brandenburg 15ca3dcdaa Move templates to netcoreapp2.2 2018-05-18 09:28:12 -07:00
Kiran Challa ac595c0c51 Added tests to verify fallback source content is same as the CDN content 2018-05-16 17:29:52 -07:00
Nate McMaster f2df6763aa
Merge branch 'release/2.1' into dev 2018-05-16 12:44:04 -07:00
Nate McMaster ef9fa1868a
Fix SRI hash values for jquery (#521) 2018-05-16 11:49:40 -07:00
Ryan Brandenburg 2a81103a41 Upgrade to netcoreapp22 2018-05-09 12:11:28 -07:00
Jass Bagga 4b50481915 Respond to dotnet-ef target framework update 2018-05-01 11:42:06 -07:00
Jass Bagga f4e7771c0c
Respond to dotnet-ef target framework upgrade (#503)
Fixes broken tests
2018-04-27 20:26:34 -07:00
= 1ba0832277 Add workaround for mismatch between TFM and AspNetCore TargetFrameworkVersions
This is a point in time problem
2018-04-23 15:59:40 -07:00
John Luo a8c3615df4 React to implicit Microsoft.AspNetCore.App reference 2018-04-19 16:49:13 -07:00
Jass Bagga 13e746c289
Update THIRD-PARTY-NOTICES link and remove Package Management panel from carousel (#474)
Addresses #330 and #469
2018-04-18 09:42:27 -07:00
Jass Bagga 3732d8c718
Revert "Revert "Update jquery-validation-unobtrusive (#421)"" (#447)
This reverts commit a76d51c46b.
2018-04-04 16:57:15 -07:00
Jass Bagga b8c1288432
Merge pull request #439 from aspnet/release/2.1
Fix path to tool for CI (#438)
2018-04-03 13:02:07 -07:00
Jass Bagga ed55571572
Fix path to tool for CI (#438) 2018-04-03 12:46:28 -07:00
Jass Bagga cec6363c5a Merge branch 'release/2.1' into dev 2018-04-03 10:46:36 -07:00
Jass Bagga 0a5a963bb0
Use dotnet-ef package (#433)
Addresses  #429 and #378
2018-04-03 10:36:06 -07:00