Commit Graph

35 Commits

Author SHA1 Message Date
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
Nate McMaster 4998ad8622
Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 (#4619) 2018-12-13 22:24:21 -08:00
Justin Kotalik 6adfa32402
Merge branch 'release/2.1' into release/2.2 2018-12-13 22:12:19 -08:00
Mikael Mengistu 9e76bec6e1
Fix CORS Functional Tests (#4610) 2018-12-12 14:36:14 -08:00
dotnet-maestro-bot 38785d0be9 [automated] Merge branch 'release/2.1' => 'release/2.2' (#4577)
* Workaround problems when opening solution files in Visual Studio (#4569)

Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore

* Convert Session to use Reference and move to Middleware folder (#4576)

* Add RoutingSample.Web to HttpAbstractions.sln
2018-12-11 16:13:20 -08:00
John Luo 3acdfb3d26
Convert Session to use Reference and move to Middleware folder (#4576) 2018-12-11 14:56:42 -08:00
Nate McMaster 5151e7b1ed
Workaround problems when opening solution files in Visual Studio (#4569)
Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore
2018-12-11 14:05:21 -08: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
Mikael Mengistu 4c5debd6ea
Skip Autobahn test (#4488) 2018-12-07 15:44:59 -08:00
Justin Kotalik 5f843f223e
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref (#4484) 2018-12-07 14:30:50 -08:00
Nate McMaster 11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln 2018-12-04 14:59:11 -08:00
Nate McMaster e261ca5426
Merge release/2.2 from aspnet/Localization 2018-12-04 14:25:25 -08:00
Nate McMaster 7e823a05ec
Merge release/2.2 from aspnet/BasicMiddleware 2018-12-04 14:24:42 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Nate McMaster 44ec52ebfe
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 2d3ad1cb0f
2018-12-04 14:10:25 -08:00
Nate McMaster d8c434febe
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in de1579bdda
2018-12-04 13:57:22 -08:00
Nate McMaster 61e9b3eae9
Merge Identity, Localization and BasicMiddleware 2018-12-04 09:02:03 -08:00
Javier Calvarro Nelson f6b4d65218
[Diagnostics] Fix Diagnostics middleware errors (#4271)
Removes setting two forbidden headers.
2018-12-04 01:18:31 +01:00
Chris R d73e3b20b8 Merge remote-tracking branch 'origin/release/2.1' into tratcher/testhost/2.2
# Conflicts:
#	eng/targets/Packaging.targets
#	src/Hosting/TestHost/test/ClientHandlerTests.cs
#	src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
2018-12-03 09:26:57 -08:00
Mikael Mengistu d9a953dfeb
Autobahn test suite fix(#4302) 2018-11-30 16:42:23 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 7e0f561425
Merge source code from aspnet/Localization 2018-11-30 15:11:31 -08:00
Nate McMaster d93796fdef
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 0bcac31dd7
2018-11-30 14:58:51 -08:00
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Nate McMaster 0843320e3e
Merge source code from aspnet/BasicMiddleware 2018-11-30 14:42:07 -08:00
Nate McMaster 2f2cec4ace
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 1de636cd18
2018-11-30 14:21:50 -08:00
Nate McMaster c8da5ed085
Remove conditional target frameworks on HealthChecks sample (#4235) 2018-11-26 11:50:19 -08:00
Nate McMaster 8ce7bb7f16
Add HealthChecks to Middleware.sln 2018-11-21 15:39:10 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Nate McMaster 16212ae6df
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in c802d5ef5f
2018-11-21 15:22:25 -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
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster 27a47d07c5
Reorganize the src/WebSockets/ folder to follow new source code organization conventions 2018-11-09 13:06:13 -08:00