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

405 Commits

Author SHA1 Message Date
Ryan Brandenburg 2d2ba29bfc Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-27 15:40:11 -08:00
Ryan Brandenburg 523d82c69a Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 3cd4de8af8
 2018-11-27 15:39:43 -08:00
Ryan Brandenburg ddb5af991d Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-27 12:12:43 -08:00
Ryan Brandenburg 589db8b413 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 032768b063
 2018-11-27 12:12:19 -08:00
Ryan Brandenburg 0ea7940af5 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 617586a984
 2018-11-27 10:49:05 -08:00
Pranav K 032768b063
Merge pull request #301 from aspnet/prkrishn/merge/2.2 
Prkrishn/merge/2.2
 2018-11-06 15:38:58 -08:00
Pranav K 174e53d45c
Merge remote-tracking branch 'origin/release/2.1' into release/2.2 
# Conflicts:
#	test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs
#	test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs
 2018-11-06 15:14:43 -08:00
Pranav K 617586a984 Keep a couple of tests and remove most tests from 2.1 
Fixes https://github.com/aspnet/MvcPrecompilation/issues/293
 2018-11-06 15:10:33 -08:00
Pavel Krymets f66b074402
Remove obsolete logging API usage (#299) 2018-11-06 13:52:39 -08:00
ASP.NET CI f165f2c6d5
Update package branding for 2.2 RTM 2018-10-16 12:48:18 -07:00
ASP.NET CI 645ce09c12 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-30 12:27:07 -07:00
Nate McMaster 3cd4de8af8
automated: merge branch release/2.2 2018-09-28 17:27:34 -07:00
Nate McMaster 794567b946
automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties 2018-09-28 17:10:38 -07:00
Nate McMaster 47ae0c15cc
Fix microbuild signing configuration 2018-09-28 10:36:24 -07:00
ASP.NET CI 689e439b94 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-23 19:26:51 +00:00
ASP.NET CI 7703802661 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-16 12:23:52 -07:00
ASP.NET CI fee8961bcc Update dependencies.props 
[auto-updated: dependencies]
 2018-09-09 12:25:22 -07:00
ASP.NET CI 77c2ab8595
Update branding to 2.2.0-preview3 2018-09-05 16:35:38 -07:00
ASP.NET CI 50e71c4585 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-02 12:22:53 -07:00
Pranav K f1a257c1d1
Merge pull request #289 from aspnet/release/2.1 
Skip some flaky tests
 2018-08-28 10:52:06 -07:00
Pranav K 64b65b6991 Skip some flaky tests 2018-08-28 10:04:57 -07:00
ASP.NET CI 62ace2e217 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-26 19:25:07 +00:00
ASP.NET CI c35b2e6e8d Update package branding for 2.2.0-preview2 2018-08-21 13:33:51 -07:00
ASP.NET CI c9b2a246a4 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-19 19:25:24 +00:00
ASP.NET CI f753e1196c Update dependencies.props 
[auto-updated: dependencies]
 2018-08-12 20:10:44 +00:00
ASP.NET CI a6f9e35e1e Update dependencies.props 
[auto-updated: dependencies]
 2018-08-12 19:25:02 +00:00
Pranav K a1a1f43c36
Merge remote-tracking branch 'origin/release/2.2' 
# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
 2018-08-07 12:40:52 -07:00
Pranav K 53ad62a3fa Remove Precompilation_WorksForViewsUsingDirectoryTraversal 2018-08-07 12:39:46 -07:00
ASP.NET CI 63e17ca673 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-06 20:47:01 +00:00
ASP.NET CI ddcf4c8108 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-05 20:00:58 +00:00
ASP.NET CI 72d7fc000a Update dependencies.props 
[auto-updated: dependencies]
 2018-08-05 19:23:16 +00:00
Pranav K 30165d2094
Merge remote-tracking branch 'origin/release/2.2' 2018-07-31 11:20:42 -07:00
Pranav K e094d2579e
Suppress obsolete warnings 2018-07-31 11:06:30 -07:00
ASP.NET CI 49822c79fa Update dependencies.props 
[auto-updated: dependencies]
 2018-07-29 20:06:20 +00:00
ASP.NET CI 52d5164db8 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-29 12:22:23 -07:00
Nate McMaster 8203f631fc
Merge branch release/2.2 2018-07-24 13:32:26 -07:00
Nate McMaster 7ee381725b
Merge branch 'release/2.1' into release/2.2 2018-07-24 12:07:23 -07:00
Eilon Lipton 690b143d71
Update CONTRIBUTING.md 2018-07-24 10:54:53 -07:00
ASP.NET CI 8931dc4f5e Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 13:10:07 -07:00
ASP.NET CI 03ee3bfe49 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 12:22:54 -07:00
ASP.NET CI 1ade91b816 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-15 20:08:01 +00:00
ASP.NET CI 4c3dec4fd2 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-15 12:23:43 -07:00
Nate McMaster 72d6f6ae4a
Pin version variables to the ASP.NET Core 2.1.2 baseline 
This reverts our previous policy of cascading versions on all servicing updates.
This moves variables into the 'pinned' section, and points them to the latest
stable release (versions that were used at the time of the 2.1.2 release).
 2018-07-12 11:56:37 -07:00
Nate McMaster dcf9d38e04
Updating dependencies to 2.1.2 and adding a section for pinned variable versions 2018-07-11 18:49:32 -07:00
Nate McMaster 273f55ef60
Reverting version from 2.1.2 back to 2.1.1 
As a result of changing the way we apply servicing updates to aspnet core, this repo did not need the version bump because there are no planned product changes in this repo.
 2018-07-11 15:06:38 -07:00
ASP.NET CI e65092b711 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-08 20:05:43 +00:00
ASP.NET CI 40c00c4165 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-08 12:24:30 -07:00
ASP.NET CI 5e68c00b9e Update dependencies.props 
[auto-updated: dependencies]
 2018-07-03 16:23:33 +00:00
Nate McMaster (automated) 31f2c88b9d
[automated] Change default branch to master 2018-07-02 12:40:31 -07:00
Nate McMaster 0e54b2488b
Merge branch 'release/2.2' into dev 2018-06-28 16:53:49 -07:00