Commit Graph

777 Commits

Author SHA1 Message Date
Doug Bunting d102d10a81 Update branding to 2.2.3
- new version
- update baselines
- grab latest released Microsoft.NetCore.App and Microsoft.NETCore.DotNetAppHost

nit:
- updated ZipManifestGenerator's README.md to use 2.2 examples
2019-02-13 23:15:58 -08:00
Justin Kotalik eacffd56b7 Merge branch 'release/2.1' into release/2.2 2019-01-15 16:37:34 -08:00
Nate McMaster fe20f9240d Fix #3503 - update buildtools dependency on DependencyModel to 2.1.0
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.
2019-01-15 13:39:01 -08:00
Mikael Mengistu 5e825f4fd8
Update the package baseline (#6614) 2019-01-14 12:21:45 -08:00
Doug Bunting 970bced25c
Update branding to 2.2.2 (#6608)
- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
2019-01-14 11:40:01 -08:00
Nate McMaster 4c8db32b1c
Don't restore npmproj files in parallel (#6560)
NPM does not handle this well, so only run one NPM command at a time
2019-01-10 08:21:26 -08:00
Nate McMaster 22f3166fa6
Merge branch 'release/2.1' into release/2.2 2019-01-10 01:22:10 -08:00
Nate McMaster d3838620d6
Convert SignalR projects to build with ProjectReference (#6457)
Part of #4246 

Changes:
* Update source code layout to follow the new conventions for this repo
* Update project files to use `<Reference>`
* Update targets to build NPM packages
* Update BuildTools to support custom 'restore' and 'test' targets
2019-01-09 13:12:35 -08:00
dotnet-bot c06eec1e8f Merge in 'release/2.2' changes 2019-01-07 21:31:03 +00:00
Justin Kotalik 2e67864995 Merge branch 'release/2.1' into release/2.2 2019-01-07 10:27:41 -08:00
dotnet-bot 973b4b2fbf Merge in 'release/2.1' changes 2019-01-07 17:35:10 +00:00
Justin Kotalik 375e9d2cbd
Make music store project ref (#6313) 2019-01-07 09:34:05 -08:00
dotnet-bot 291b346201 Merge in 'release/2.2' changes 2019-01-03 00:55:40 +00:00
Nate McMaster 65ff6e951a
Merge branch release/2.1 into release/2.2 2019-01-02 14:34:45 -08:00
dotnet-bot 13253dab22 Merge in 'release/2.1' changes 2018-12-21 23:30:46 +00:00
John Luo edcee859f0
Convert Identity to Reference (#6086)
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
2018-12-21 15:29:35 -08:00
dotnet-bot 68bd2329e1 Merge in 'release/2.2' changes 2018-12-21 21:19:09 +00:00
Ajay Bhargav Baaskaran af2461d524 Merge branch 'release/2.1' into release/2.2 2018-12-21 11:38:25 -08:00
dotnet-bot 594e4c4c35 Merge in 'release/2.2' changes 2018-12-21 01:28:47 +00:00
Justin Kotalik d9cf76f63d Merge release/2.1 into 2.2 2018-12-20 16:51:06 -08:00
dotnet-bot 108fa3f911 Merge in 'release/2.1' changes 2018-12-21 00:28:36 +00:00
Ajay Bhargav Baaskaran 7f17d095d8
Convert Mvc to use Reference (#6047)
* Convert Mvc to use Reference

* Use ProjectReference for test assets
2018-12-20 16:27:32 -08:00
dotnet-bot 66d35bd153 Merge in 'release/2.2' changes 2018-12-18 23:48:35 +00:00
Justin Kotalik de954ce702
Fixing IIS Tests (#5682) 2018-12-18 18:46:56 -05:00
dotnet-bot fe0d8ca083 Merge in 'release/2.1' changes 2018-12-18 20:01:33 +00:00
John Luo 0cbc52ca15 Convert ServerTests to Reference and move to Server folder (#4686) 2018-12-18 14:59:47 -05:00
dotnet-bot 8b682dfe85 Merge in 'release/2.2' changes 2018-12-14 19:01:05 +00:00
Nate McMaster feb641ddda
Merge branch 'release/2.1' into release/2.2 2018-12-14 09:44:15 -08:00
dotnet-bot 6133fa4dd6 Merge in 'release/2.1' changes 2018-12-14 16:37:44 +00:00
Nate McMaster 13ae0057fb
Replace .Sources package references with local code (#4801)
Replaces package references the following packages with local code:

Microsoft.AspNetCore.Certificates.Generation.Sources
Microsoft.Extensions.CopyOnWriteDictionary.Sources 
Microsoft.Extensions.ClosedGenericMatcher.Sources
Microsoft.Extensions.ObjectMethodExecutor.Sources
Microsoft.Extensions.PropertyActivator.Sources
Microsoft.Extensions.PropertyHelper.Sources
Microsoft.Extensions.RazorViews.Sources
Microsoft.Extensions.SecurityHelper.Sources
Microsoft.Extensions.StackTrace.Sources
Microsoft.Extensions.WebEncoders.Sources
2018-12-14 08:36:36 -08:00
dotnet-bot 3b0d1253e1 Merge in 'release/2.2' changes 2018-12-14 08:57:43 +00:00
Nate McMaster 206db0558e
Update buildtools and add properties to skip IIS tests 2018-12-13 23:36:42 -08:00
Nate McMaster f0990ec531
Fix build issues with IIS integration projects
Changes:
* Ensure IIS managed and pkg projects build after the native projects
* Update projects to build test
* Update CI checks to build on macOS and Linux
* Use package baselines to manage ANCM packages
2018-12-13 22:53:31 -08:00
Justin Kotalik 6adfa32402
Merge branch 'release/2.1' into release/2.2 2018-12-13 22:12:19 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
dotnet-bot b0826ab179 Merge in 'release/2.1' changes 2018-12-04 23:31:58 +00:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
dotnet-bot 36c482af6f Merge in 'release/2.2' changes 2018-12-01 01:54:37 +00:00
Nate McMaster 197c5567f4
Update EFCore submodule (#4349)
Prepare EF Core to build in 2.2.1

Fixes aspnet/AspNetCore-Internal#1441
2018-11-30 17:53:19 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Chris R cdb9d0bc68 Prepare to patch WebSockets 2018-11-29 10:55:57 -08:00
Chris R 2720c28047 Prepare to patch WebSockets 2018-11-29 10:39:29 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -08:00
Nate McMaster 6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo 2018-11-21 14:23:55 -08:00
Nate McMaster ed0b421695
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 8893337fb0
2018-11-21 13:54:33 -08:00
Ryan Brandenburg 396aa9735e PR feedback 2018-11-20 16:15:51 -08:00
Ryan Brandenburg d5587f3c54 Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge 2018-11-20 15:42:00 -08:00
Nate McMaster 73b5d6d0e5
Remove the BrowserLink submodule (#4087) 2018-11-20 11:36:26 -08:00
Nate McMaster bfba741326
Merge aspnet/Hosting release/2.2 2018-11-20 09:35:34 -08:00