Skip to content

Merge 2.2 to Master #6772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jan 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e751db0
Make Auth Samples Project Ref (#6557)
jkotalik Jan 15, 2019
fe20f92
Fix #3503 - update buildtools dependency on DependencyModel to 2.1.0
Jan 11, 2019
180f735
Fix non-parameter route constraints not called with endpoint routing …
JamesNK Jan 15, 2019
0622513
Wait to dispose RequestAborted CTS (#4447)
halter73 Jan 15, 2019
92680b3
Change consumes behavior to ignore requests with no content type (#6645)
JamesNK Jan 15, 2019
cd308e7
Fix HttpContext not being passed to constraints in link generation (#…
JamesNK Jan 15, 2019
563ff7c
Put Razor.Design.Test and Razor.Language.Test in a different test gro…
ajaybhargavb Jan 15, 2019
eacffd5
Merge branch 'release/2.1' into release/2.2
jkotalik Jan 16, 2019
4a2a894
Cleanup
jkotalik Jan 16, 2019
3e5b37f
Fix #6102 - Intense CPU utilization on page change (#6542)
rynowak Jan 14, 2019
12a479d
Move dotnet watch to a seperate test group (#6730)
pakrym Jan 16, 2019
959445b
Target netcoreapp2.2
jkotalik Jan 16, 2019
dce7a3a
Merge pull request #6723 from dotnet-maestro-bot/merge/release/2.1-to…
jkotalik Jan 16, 2019
f44c175
Enable logging branch SiteExtension (#6715)
pakrym Jan 16, 2019
99eba69
Reuse root `version.props` in Templating
dougbu Jan 16, 2019
9831238
Revert "Put Razor.Design.Test and Razor.Language.Test in a different …
ajaybhargavb Jan 16, 2019
5b56de9
Allow disabling shared configuration check from hosting bundle. (#6498)
jkotalik Jan 16, 2019
e6d547a
Merge branch 'jkotalik/22temp' into jkotalik/masterMerge
jkotalik Jan 16, 2019
18425ed
Merge branch release/2.1 to release/2.2 (#6754)
ajaybhargavb Jan 16, 2019
ad31f94
Fix failing Razor file comparison tests (#6757)
ajaybhargavb Jan 16, 2019
dabd346
few extra conflicts
jkotalik Jan 16, 2019
4c1a375
Merge branch 'release/2.1' into release/2.2
ajaybhargavb Jan 16, 2019
f9051db
bad local var name
jkotalik Jan 16, 2019
1962146
Add Microsoft.NET.Sdk.Razor
jkotalik Jan 17, 2019
9d63bd7
Undo sharedfxtests changes
jkotalik Jan 17, 2019
2cc1323
Separate test group
jkotalik Jan 17, 2019
9b8146f
Merge commit 'f44c175' into jkotalik/masterMerge
jkotalik Jan 17, 2019
42d3289
Merge branch 'release/2.2' into jkotalik/masterMerge
jkotalik Jan 17, 2019
29b7c5c
Revert "Wait to dispose RequestAborted CTS (#4447)"
jkotalik Jan 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion build/buildorder.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
</ItemDefinitionGroup>

<ItemGroup>
<RepositoryBuildOrder Include="AuthSamples" Order="16" />
<RepositoryBuildOrder Include="Templating" Order="18" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions build/submodules.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,5 @@

<ItemGroup>
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />

<!-- Test-only repos -->
<Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions eng/PatchConfig.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.AspNetCoreModuleV2;
Microsoft.AspNetCore.Authentication.Google;
Microsoft.AspNetCore.Http;
Microsoft.AspNetCore.Mvc.Core;
Microsoft.AspNetCore.Routing;
Microsoft.AspNetCore.Server.IIS;
java:signalr;
</PackagesInPatch>
Expand Down
38 changes: 0 additions & 38 deletions src/AuthSamples/.gitignore

This file was deleted.

146 changes: 0 additions & 146 deletions src/AuthSamples/AuthSamples.sln

This file was deleted.

18 changes: 0 additions & 18 deletions src/AuthSamples/Directory.Build.props

This file was deleted.

5 changes: 0 additions & 5 deletions src/AuthSamples/Directory.Build.targets

This file was deleted.

7 changes: 0 additions & 7 deletions src/AuthSamples/NuGetPackageVerifier.json

This file was deleted.

15 changes: 0 additions & 15 deletions src/AuthSamples/README.md

This file was deleted.

52 changes: 0 additions & 52 deletions src/AuthSamples/build/dependencies.props

This file was deleted.

17 changes: 0 additions & 17 deletions src/AuthSamples/build/sources.props

This file was deleted.

Loading