Commit Graph

33 Commits

Author SHA1 Message Date
dotnet-bot 985d49c566 Merge in 'release/2.2' changes 2018-12-11 00:44:52 +00:00
Nate McMaster 2c4d586809
Merge 'release/2.1' into release/2.2
Co-authored-by: Justin Kotalik <jukotali@microsoft.com>
2018-12-10 15:56:42 -08:00
dotnet-bot 44f04c8b4d Merge in 'release/2.2' changes 2018-12-07 01:43:13 +00:00
Nate McMaster 569a14ecb8
Merge branch 'release/2.1' into release/2.2 2018-12-06 17:09:03 -08:00
Justin Kotalik 0588b13f5b Fix 2.1 build issues and remove obsolete build code (#4443)
- Stop producing the 'Universe' lineup package
- Removes all PackageLineup code
- Use full msbuild on Windows
- Fix invalid reference to internal.aspnetcore.sdk in 2.1.x
- Fix shared folder references for PackageArchive task.
2018-12-05 17:01:02 -08:00
dotnet-bot b19997eff8 Merge in 'release/2.2' changes 2018-12-05 18:12:44 +00:00
Justin Kotalik 0646bb98b0
Call Flush With fMoreData=false when response isn't allowed to have body (#4403) 2018-12-05 10:11:36 -08:00
Justin Kotalik 736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder (#4335) 2018-12-04 16:44:07 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
Nate McMaster 11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln 2018-12-04 14:59:11 -08:00
dotnet-bot a382a8eb03 Merge in 'release/2.2' changes 2018-11-26 21:45:57 +00:00
Ryan Brandenburg 101303eceb Fix RepositoryUrls 2018-11-21 15:55:40 -08:00
Ryan Brandenburg d5587f3c54 Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge 2018-11-20 15:42:00 -08:00
Ryan Brandenburg bd54395fe5 Remove duplicate keys 2018-11-20 12:07:14 -08:00
Pavel Krymets d17392bc45
Port Resolve C26496 compiler errors when building in release mode with VS 15.9 (#4141) 2018-11-20 10:00:37 -08:00
Justin Kotalik 4fae8b9838 Fix websocket disconnect issue 2018-11-15 23:27:48 +00:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster a8ec75aac4
Prepare for the 2.2.1 patch
* Generate 2.2.0 package baselines
* Update dependencies to 2.2.0
* Update branding to 2.2.1-servicing
2018-11-13 18:21:09 -08:00
Justin Kotalik 4b4bd68fc7
Downgrade stable package versions and remove duplicate test project (#3991) 2018-11-09 11:27:08 -08:00
Nate McMaster db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects (#3987) 2018-11-08 23:40:14 -08:00
Nate McMaster bc44d9d4e0
Remove artifact info for StressTestWebSite.zip 2018-11-08 17:50:34 -08:00
Nate McMaster 0c6e4bebab
Prepare to build the 2.1.7 patch (#3970)
* Prepare 2.1.7 patch
* Add documentation for how we prepare servicing updates
2018-11-08 17:07:18 -08:00
Nate McMaster ba70991d7c
Stop publishing runtime-extension-internal.zip and don't produce StressTestWebsite.zip by default in CI builds (#3984) 2018-11-08 17:01:31 -08:00
Justin Kotalik 90b11de8f1
Get IISIntegration CI working (#3875) 2018-11-05 08:45:11 -08:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07:00
Nate McMaster 0e24161d42
Ensure Microsoft.AspNetCore.Server.IntegrationTesting.IIS doesn't produce a finalized version 2018-11-02 11:07:45 -07:00
Justin Kotalik afab1a5be6
Remove IISIntegration submodule, add CI [2.2] (#3865) 2018-11-02 10:22:04 -07:00
Justin Kotalik 83fe4c089b
Remove M.A.Server.IIS package from 2.1. Fix signing issues (#3859) 2018-11-01 11:30:31 -07:00
Justin Kotalik 3f04c928f4 Merge branch 'jkotalik/21Merge' into jkotalik/22Merge 2018-10-31 18:38:00 -07:00
Justin Kotalik ce68c8e5be remove submodule 2018-10-31 18:14:34 -07:00
Justin Kotalik 7fbedc602c Move 22 into subfolder 2018-10-31 16:40:21 -07:00
Justin Kotalik 55e809c5dc Move more files 2018-10-31 16:38:30 -07:00
Justin Kotalik 040fb6f18a Move IISIntegration into subfolder 2018-10-31 15:51:17 -07:00