Граф коммитов

1239 Коммитов

Автор SHA1 Сообщение Дата
Hao Kung bcb8b9736a Cleanup 2018-10-30 16:27:11 -07:00
Hao Kung 483ad9da67 Strip logging from a few tests 2018-10-30 16:23:07 -07:00
Nate McMaster 4c9c4a5cc8
Merge branch 'release/2.2' 2018-10-30 15:22:50 -07:00
Nate McMaster 9405d058fa
Merge branch 'release/2.1' into release/2.2 2018-10-30 14:54:51 -07:00
Hao Kung 93799664bb
Merge pull request #2031 from dotnet-maestro-bot/merge/release/2.2-to-master 2018-10-30 12:57:29 -07:00
Hao Kung 6c45bfc0dc
Merge 2.1 -> 2.2 (#2030) 2018-10-26 14:52:03 -07:00
Nate McMaster fa3cfd08eb
Remove IdentityService (#2028)
As a part of preparing this repo for merging into aspnet/AspNetCore, this code is being removed as it is currently not in a "shipping" state for 2.1.
2018-10-26 14:05:44 -07:00
Nate McMaster ba67b04d9d
Ensure IsTestProject=false in Microsoft.AspNetCore.Identity.Specification.Tests.csproj
This isn't really a test project. It's a class library which contains testing compontents. Because 'xunit' is referenced, IsTestProject=true, which
messes up some of the build logic we have for handling code signing and test runners
2018-10-26 12:26:16 -07:00
Javier Calvarro Nelson 2ab58c47f7 Merge branch 'release/2.2' 2018-10-26 10:55:39 -07:00
Javier Calvarro Nelson 95bc251848 Avoid file descriptor exhaustion caused by Razor Pages on functional tests 2018-10-26 10:54:46 -07:00
Javier Calvarro Nelson 08074b6714
Merge pull request #2025 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 15:47:18 -07:00
Wouter Huysentruit 168be7b561 Use the correct logging category inside RegisterModel 2018-10-25 15:44:59 -07:00
Javier Calvarro Nelson 51de582c83
[Fixes #2002] UI package has path error (#2024) 2018-10-25 15:33:49 -07:00
Barry Dorrans 3486b97f59
Merge pull request #2018 from FelschR/patch-1
add DocumentDB provider to community provider list
2018-10-25 11:27:38 -07:00
Javier Calvarro Nelson 2c9e194020 Merge branch 'dotnet-maestro-bot-merge/release/2.2-to-master' 2018-10-19 11:12:31 -07:00
Felix Schröter efb66fe8e9
add DocumentDB provider to community provider list 2018-10-17 12:56:54 +02:00
Javier Calvarro Nelson a6aa152b0c
Merge branch 'master' into merge/release/2.2-to-master 2018-10-16 13:43:46 -07:00
ASP.NET CI daff2f3037
Update package branding for 2.2 RTM 2018-10-16 12:48:15 -07:00
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
Hao Kung 44f00013cd
Merge 2.1 -> 2.2 (#2009)
* Fix login.cshtml
2018-10-12 11:34:54 -07:00
Hao Kung ee8e882d17
Merge pull request #2007 from aspnet/haok/login
Fix login.cshtml
2018-10-12 10:52:13 -07:00
Ryan Brandenburg c71818eae2
Merge branch 'master' into merge/release/2.2-to-master 2018-10-11 14:54:19 -07:00
Javier Calvarro Nelson f5b5018d66 [Fixes #1958] Add and generate docs for the default UI 2018-10-11 14:46:57 -07:00
Ryan Brandenburg 04552f4005
Update Jquery.validation.Unobtrusive (#1999)
Update Jquery.validation.Unobtrusive
2018-10-11 12:29:52 -07:00
Hao Kung 5c174a3d7d Fix login.cshtml 2018-10-10 14:49:57 -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