huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,217 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

1217 Commits

Author SHA1 Message Date
Ryan Brandenburg 81928f6c31
Merge pull request #2005 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-12 12:47:00 -07:00
Ryan Brandenburg c71818eae2
Merge branch 'master' into merge/release/2.2-to-master 2018-10-11 14:54:19 -07:00
Ryan Brandenburg 04552f4005
Update Jquery.validation.Unobtrusive (#1999) 
Update Jquery.validation.Unobtrusive
 2018-10-11 12:29:52 -07:00
ASP.NET CI a125959ffb Update dependencies.props 
[auto-updated: dependencies]
 2018-10-07 19:16:42 +00:00
ASP.NET CI 3940adad96 Update dependencies.props 
[auto-updated: dependencies]
 2018-10-07 12:15:42 -07:00
Nate McMaster 3a9e62d29e
Merge branch 'release/2.2' 2018-10-05 12:23:39 -07:00
Nate McMaster dd9873b9d0
Merge branch 'release/2.1' into release/2.2 2018-10-05 12:22:49 -07:00
Nate McMaster 2327d6ae44
Update branding to 2.1.6-servicing (#1994) 
Per discussion with our team, we want to make the following changes to versioning during servicing updates:

* The versioning on packages with ship with ASP.NET Core should be consistent
* (No change) on packages with changes in them ship during servicing updates
* Version gaps are okay. For example, this repo is producing a patch for 2.1.6, so packages will be 2.1.6. It did not patch for 2.1.4 or 2.1.3 so those versions will be skipped.

This also includes another minor change: for consistency with the rest of the .NET Core teams, pre-release servicing builds will be 2.1.x-servicing-buildnumber.
 2018-10-05 12:09:40 -07:00
Nate McMaster 042b6ecaf2
Fix version suffix in version.props 2018-10-04 09:31:16 -07:00
ASP.NET CI 4ce1928a4c Update dependencies.props 
[auto-updated: dependencies]
 2018-09-30 12:16:14 -07:00
ASP.NET CI c54525f459 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-30 12:15:13 -07:00
Nate McMaster b9793cfb1a
automated: merge branch release/2.2 2018-09-28 17:27:31 -07:00
Nate McMaster f2652e94bb
automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties 2018-09-28 17:10:35 -07:00
Nate McMaster 3825c24959
Merge branch 'release/2.2' 2018-09-28 11:50:15 -07:00
Nate McMaster 646e65cb1d
Bumping version from 2.1.3 to 2.1.4 2018-09-28 09:51:26 -07:00
Nate McMaster 73062c89f6
Change spec test packages to depend on xunit.execution.core, not the xunit metapackage (#1979) 2018-09-27 16:40:38 -07:00
Nate McMaster 594b5fafe4
Enable MicroBuild code signing 2018-09-27 16:11:54 -07:00
Eilon Lipton d55bd557e0
Update LICENSE.txt 2018-09-27 15:32:43 -07:00
Pranav K 9b385180a9
Merge remote-tracking branch 'origin/release/2.2' into prkrishn/update-master 2018-09-24 10:04:06 -07:00
ASP.NET CI 0324313144 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-23 19:16:00 +00:00
ASP.NET CI 299ca4096c Update dependencies.props 
[auto-updated: dependencies]
 2018-09-23 12:14:33 -07:00
Pranav K 4e0c9f4038
Reference Microsoft.NET.Sdk.Razor in projects with Razor files 2018-09-20 15:17:20 -07:00
Ryan Brandenburg 44c3e5d4ac
Titles in h1 (#1966) 
Titles in h1
 2018-09-20 14:51:41 -07:00
ASP.NET CI ed28df1236 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-16 19:15:13 +00:00
ASP.NET CI 415a6cb53a Update dependencies.props 
[auto-updated: dependencies]
 2018-09-16 12:13:46 -07:00
Rick Anderson b9452868db Update IdentityServiceCollectionExtensions.cs docs (#1962) 2018-09-12 12:04:28 -07:00
ASP.NET CI 1438a1be5f Update dependencies.props 
[auto-updated: dependencies]
 2018-09-09 19:16:12 +00:00
ASP.NET CI 01f8f366f7 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-09 12:15:07 -07:00
ASP.NET CI a7abf7ec64 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-05 23:47:37 +00:00
ASP.NET CI fae6cb0b51
Update branding to 2.2.0-preview3 2018-09-05 16:34:54 -07:00
ASP.NET CI 216f9ff00d Update dependencies.props 
[auto-updated: dependencies]
 2018-09-02 19:15:30 +00:00
ASP.NET CI 8304283fb1 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-02 12:14:10 -07:00
Javier Calvarro Nelson f8181ef522 Merge branch 'release/2.2' 2018-08-30 15:24:32 -07:00
Javier Calvarro Nelson bb1cd5ec09 Stop building dependent projects 2018-08-30 15:23:55 -07:00
Pranav K de3e6e08b4
Remove references to MvcPrecompilation package 2018-08-30 11:07:37 -07:00
Hao Kung fcc02103aa
Merge pull request #1947 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-08-29 15:39:43 -07:00
Hao Kung e38a307307
Allow cookie validation when stores don't support security stamp (#1941) 2018-08-29 14:41:51 -07:00
Hao Kung ab72b8260a
Merge pull request #1945 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-08-27 15:15:59 -07:00
Hao Kung 64af0228d6
Disable parallelization (#1944) 2018-08-27 13:39:56 -07:00
ASP.NET CI 543e05df37 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-26 19:15:27 +00:00
Javier Calvarro Nelson e03129e3ba Merge branch 'release/2.2' 2018-08-24 17:20:58 -07:00
Javier Calvarro Nelson b3a6bda45a Sync Identity UI default layout with the templates layout 2018-08-23 15:15:54 -07:00
Javier Calvarro Nelson f2e4a63747 Fix msbuild 2018-08-23 10:46:36 -07:00
Javier Calvarro Nelson ac744d8adb Support Bootstrap 3 and Bootstrap 4 on idenity UI 2018-08-21 17:46:13 -07:00
ASP.NET CI 51dac741db Update package branding for 2.2.0-preview2 2018-08-21 13:33:50 -07:00
ASP.NET CI a255edc9f3 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-19 19:15:58 +00:00
Hao Kung cfa1bb3803
Merge pull request #1928 from aspnet/haok/mg22 
Merge release/2.2 -> master
 2018-08-17 16:13:31 -07:00
Hao Kung 309911abb7 Merge branch 'release/2.2' 2018-08-17 16:11:45 -07:00
Hao Kung 1b8b581aae Revert "[automated] Change default branch to master" 
This reverts commit 32a08fea5d.
 2018-08-17 16:09:36 -07:00
Hao Kung ee0a25e618 Revert "Bumping version from 2.2.0 to 3.0.0" 
This reverts commit b005ef7831.
 2018-08-17 16:09:31 -07:00