Merge 2.2 to Master #6772
Merged
Merge 2.2 to Master #6772
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The 2.0 version of the Microsoft.Extensions.DependencyModel does not
support the assembly/file version metadata. We must have at least 2.1.
Between 2.1.6 and 2.1.7, we switched the build to use MSBuild.exe
("full" MSBuild) instead of `dotnet msbuild` ("core" MSBuild). MSBuild
has different assembly loaders behaviors in core vs full. By switching
MSBuild types, we were also unintentionally switching the version of
Microsoft.Extensions.DependencyModel.dll that was being used by our build
task from 2.1 back down to 2.0.
The reason we didn't discover this in earlier 2.1.x patches is that
building on msbuild core automatically upgraded our build tasks to
Microsoft.Extensions.DependencyModel.dll, Version=2.1.0.0. This happens
because of differences in the way .NET Core and MSBuild handles
assemblies with the same ID and different versions, and differences in
the layout of MSBuild and the .NET Core CLI.
In the end, this happened because we didn't have test coverage. MSBuild
and custom tasks burned asagain, but we should have just had unit tests
all along, which would have uncovered this regression as soon as we
switched to msbuild.exe.
* Fix #6102 - Intense CPU utilization on page change The issue here was that every time a Razor Page changed, we would subscribe an additional time to the endpoint change notifications. This means that if you tweaked a page 30 times, we would update the address table 31 times when you save the file. If you were doing a lot of editing then this would grow to a really large amount of computation. The fix is to use DataSourceDependentCache, which is an existing utility type we developed for this purpose. I'm not sure why it wasn't being used for this already. We're already using DataSourceDependentCache in a bunch of other places, and it's well tested. I also tweaked the stucture of this code to be more similar to EndpointNameAddressScheme. This involved some test changes that all seemed like good cleanup. The way this was being tested was a little wonky. (cherry picked from commit a5658a8)
- do not let Templating get behind branding changes
* Put Razor.Design.Test and Razor.Language.Test in a different test group (#6725) * Move dotnet watch to a seperate test group (#6730) * Reuse root `version.props` in Templating - do not let Templating get behind branding changes * Revert "Put Razor.Design.Test and Razor.Language.Test in a different test group (#6725)" (#6753) This reverts commit 563ff7c. * Revert file watch test changes
halter73
reviewed
Jan 16, 2019
|
|
||
| Assert.Equal(originalToken, originalRegistration.Token); | ||
| } | ||
|
|
There was a problem hiding this comment.
The Kestrel part LGTM. Thanks @jkotalik 🎉
jkotalik
commented
Jan 17, 2019
| <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" /> | ||
| <Reference Include="Microsoft.AspNetCore.Mvc" /> | ||
| <Reference Include="Microsoft.AspNetCore.StaticFiles" /> | ||
| <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" /> |
There was a problem hiding this comment.
@natemcmaster these references were required in netcoreapp3.0. I remember you saying Microsoft.NET.Sdk.Web would bring it in.
There was a problem hiding this comment.
This is fine for now. We'll clean this up later. We need to cleanup a bunch of other projects in master, and we can do that in one sweep.
halter73
approved these changes
Jan 17, 2019
|
Kestrel InMemory.FunctionalTests/netcoreapp3.0 hung on the last test run. |
|
Alright, I have hit ~5 runs of test failures: I'm going to try running this one more time and if it fails again, someone with admin will have to merge it. |
jkotalik
force-pushed
the
jkotalik/masterMerge
branch
from
931c109 to
2cc1323
Compare
|
@ajaybhargavb make sure the test fixes you add to DefaultRazorProjectFileSystemTest.cs and RazorCompileIntegrationTest.cs get ported to https://github.com/aspnet/aspnetcore-tooling |
This reverts commit 0622513.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#6761
Please confirm all changes are done correctly for area owners.