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

2017 Commits

Author SHA1 Message Date
Ajay Bhargav Baaskaran 3f429d02ab
Merge pull request #2521 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-31 13:01:44 -07:00
Ajay Bhargav Baaskaran a4b91d6dce Flatten AggregateExceptions in rzc 2018-07-31 11:11:43 -07:00
N. Taylor Mullen 94a1314146 Add IVT to strong name shim for investigative purposes. 2018-07-30 18:07:54 -07:00
Pranav K 3e436a53a1
Merge pull request #2518 from aspnet/release/2.2 
Lock when reading \ writing process output
 2018-07-30 16:36:06 -07:00
Pranav K 3ff064cea3 Lock when reading \ writing process output 
Fixes #2516
 2018-07-30 16:21:42 -07:00
N. Taylor Mullen fd170c1cea Merge branch 'release/2.2' 2018-07-30 10:47:41 -07:00
N. Taylor Mullen cb557cf771 Changed `GetDesiredIndentation` to be resilient to our SyntaxTree which occasionally has gaps. 
- Added a test to cover the scenario.

#2489
 2018-07-30 10:45:18 -07:00
ASP.NET CI 9e73caa4ad Update dependencies.props 
[auto-updated: dependencies]
 2018-07-29 20:07:24 +00:00
ASP.NET CI fa02d34590 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-29 12:23:23 -07:00
N. Taylor Mullen 8d29a02e39 Merge branch 'release/2.2' 2018-07-27 14:52:37 -07:00
N. Taylor Mullen 38e145389e Fix BackgroundDocumentGenerator flaky tests. 
- Some time spans were too aggressive for parsing a Razor file on a slow environment.
- Fixed an obvious race where we'd expect 0 pending notifications when it was possible to be in the process of clearing notifications.

#2506
 2018-07-27 14:49:12 -07:00
Pranav K 46974a0b8b
Merge pull request #2511 from aspnet/release/2.2 
Skip BuildIncremental_SimpleMvc_PersistsTargetInputFile on xplat
 2018-07-27 14:39:21 -07:00
Pranav K 676543b8c9 Skip BuildIncremental_SimpleMvc_PersistsTargetInputFile on xplat 
For some inexplicable reason timestamps returned as part of the test often show up
as being different resulting in test flakiness. We've manually verified that this
is not a product issue and builds are correctly incremental on xplat. See #2219
for past discussions.

Fixes https://github.com/aspnet/Razor/issues/2503
 2018-07-27 14:22:23 -07:00
Nate McMaster 42f8f3eab4
Merge branch 'release/2.2' 2018-07-26 17:12:42 -07:00
Ryan Brandenburg afc671724f Adding VSTS configuration (#2395) 2018-07-26 17:10:56 -07:00
Ajay Bhargav Baaskaran f9a5bd7e0c
Merge pull request #2505 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-26 15:06:50 -07:00
Ajay Bhargav Baaskaran 8e23eb38b4 Honor NoBuild flag during publish 2018-07-26 11:40:38 -07:00
Nate McMaster 27320fc76f
Merge branch 'release/2.2' 2018-07-24 13:37:40 -07:00
Nate McMaster b3eecf0d46
Merge branch 'release/2.1' into release/2.2 2018-07-24 12:07:24 -07:00
Eilon Lipton 1de182b6b8
Update CONTRIBUTING.md 2018-07-24 10:55:13 -07:00
Doug Bunting aedb05e5b6
Merge branch 'release/2.2' 2018-07-23 15:38:40 -07:00
Doug Bunting 684e7855a6
Handle `null` entries correctly for `IsEmptyOrWhiteSpace` 
- #2497

nits:
- take VS suggestions
- un-scramble `IsEmptyOrWhiteSpaceCore(...)` for readability
 2018-07-23 15:25:41 -07:00
ASP.NET CI 52304f76a9 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 13:11:16 -07:00
ASP.NET CI 8502dd1ebe Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 12:23:58 -07:00
Ajay Bhargav Baaskaran 7bdad8fdd3 Merge branch 'release/2.2' 2018-07-19 16:03:16 -07:00
Ajay Bhargav Baaskaran eb6faf1754 Redo baselines 2018-07-19 15:29:30 -07:00
Ajay Bhargav Baaskaran 8e667ba730 Rename parser tests to have shorter names 2018-07-19 15:22:30 -07:00
Ryan Nowak a5bcb5fdc2 Make master build a 16.0 VSIX 
This change updates the master branch of Razor to start producing a VS16
branded VSIX.

I haven't updated any package dependencies at this time, just changed the
version number and make our version range dependencies more flexible.
 2018-07-18 09:14:11 -07:00
Ajay Bhargav Baaskaran bcbc760dd5 Merge branch 'release/2.2' 2018-07-17 14:15:19 -07:00
Ajay Bhargav Baaskaran 7f6b05149d Generate deterministic unique ids for tag helpers 2018-07-17 14:01:42 -07:00
Ajay Bhargav Baaskaran 8bc462cd1b Merge branch 'release/2.2' 2018-07-17 11:09:04 -07:00
Ajay Bhargav Baaskaran 21f2edce16 Generate and verify baselines for ClassifiedSpans and TagHelperSpans 
- Moved GetClassifiedSpans and GetTagHelperSpans logic to Razor.Language
 2018-07-17 10:54:42 -07:00
N. Taylor Mullen 4c0639b4d8
Merge pull request #2483 from aspnet/nimullen/mastermerge 
Nimullen/mastermerge
 2018-07-17 10:49:22 -07:00
N. Taylor Mullen 654430b324 Merge branch 'merge/release/2.2-to-master' 2018-07-16 11:26:31 -07:00
ASP.NET CI a06c2b243f Update dependencies.props 
[auto-updated: dependencies]
 2018-07-15 20:09:12 +00:00
ASP.NET CI cb92169860 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-15 12:24:46 -07:00
N. Taylor Mullen cfd63e1e2e Change HTML splitting logic to not split on surrogate pairs. 
- When a surrogate pair is about to be split down the middle we reduce the size of our split by 1 character. This way we split right before a surrogate pair. In the case of zero width joiners, if we split on a zero width joiner we still render valid bytes because the zero width joiner by itself can stand alone.
- Added tests for the various split cases.

#2470
 2018-07-13 17:18:56 -07:00
Nate McMaster 056940710a
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 14:03:41 -07:00
Nate McMaster 10f68863ec
Updating dependencies to 2.1.2 and adding a section for pinned variable versions 2018-07-12 14:03:41 -07:00
Pranav K accea6edbd
Merge remote-tracking branch 'origin/release/2.1' into release/2.2 2018-07-12 13:06:25 -07:00
Pranav K 74667eda9c
Don't specify MainEntryPoint when compiling Razor assembly 2018-07-12 13:05:10 -07:00
ASP.NET CI 61aeae1023 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-08 20:06:52 +00:00
ASP.NET CI bbddd29ab8 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-08 12:25:33 -07:00
Ajay Bhargav Baaskaran 8901549095 Merge branch 'release/2.2' 2018-07-06 17:04:26 -07:00
Ajay Bhargav Baaskaran ce4780a830 Renamed symbol to token everywhere 
- Updated Resources
- Updated test code
- Regenerated baselines
- Added exclusions for apicheck (See https://github.com/aspnet/BuildTools/issues/704)
 2018-07-06 16:29:36 -07:00
Ajay Bhargav Baaskaran c8cc82c735 Merge branch 'release/2.2' 2018-07-06 16:27:36 -07:00
Ajay Bhargav Baaskaran ed7c4e8f5c Parser tests clean up 2018-07-06 16:24:39 -07:00
Ajay Bhargav Baaskaran e7db3f840b Handle pipe name with whitespace properly 2018-07-03 16:55:55 -07:00
ASP.NET CI d4c652a7d5 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-03 16:24:43 +00:00
Nate McMaster (automated) 57fbd1c499
[automated] Change default branch to master 2018-07-02 12:40:33 -07:00