Chris Ross
7fdd930f50
Change IIS projects to target netcoreapp3.0 ( #4371 )
...
* Change IIS projects to target netcoreapp3.0 #3754
2018-12-11 13:46:46 -08:00
Nate McMaster
790ae47055
Merge branch 'release/2.2'
2018-12-10 17:41:14 -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
Nate McMaster
85e2147ff0
Merge branch 'release/2.2'
2018-12-07 11:11:44 -08:00
Nate McMaster
569a14ecb8
Merge branch 'release/2.1' into release/2.2
2018-12-06 17:09:03 -08:00
Pavel Krymets
24e17eadca
Add a flag to set current directory in ANCM InProc ( #4369 )
2018-12-06 15:19:47 -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
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
Nate McMaster
62f9655a2f
Merge branch 'release/2.2'
2018-12-05 08:54:38 -08:00
Pavel Krymets
2e56f056d0
Re-enable IISIntegration tests ( #4377 )
2018-12-05 08:24:12 -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
11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln
2018-12-04 14:59:11 -08:00
Pavel Krymets
03d3e1868e
Make IISDefaults.AuthenticationScheme const ( #4342 )
2018-11-30 15:23:02 -08:00
Justin Kotalik
5a1ff478da
Add reference to M.A.Hosting ( #4237 )
2018-11-26 12:44:48 -08:00
Ryan Brandenburg
101303eceb
Fix RepositoryUrls
2018-11-21 15:55:40 -08:00
Ryan Brandenburg
1182293e8b
Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster
2018-11-21 12:03:58 -08:00
Nate McMaster
0cbfa9ce6d
Update branding to 3.0.0-preview ( #4171 )
...
Changes:
* This uses date-based versioning
* Builds are `3.0.0-preview-$(buildnumber)`, not alpha1 or preview1.
2018-11-20 19:47:12 -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
1d9b77e255
Import DotNetPackageVersionPropsPath into all sub-folder builds
2018-11-20 13:23:55 -08:00
Nate McMaster
43fa1ba365
Import DotNetPackageVersionPropsPath into the src/IISIntegration build context
2018-11-20 12:10:44 -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
Nate McMaster
23996a550a
Resolve C26496 compiler errors when building in release mode with VS 15.9 ( #4113 )
...
Updating CI machines to VS 15.9 causes the project to fail to compile with C26496 errors. This adds `const` keywords to resolve the compiler errors.
2018-11-19 23:34:01 -08:00
Pavel Krymets
e11f05863f
Enable MultiProcessorCompilation in more projects ( #4036 )
2018-11-15 12:54:10 -08:00
Nate McMaster
6cc9f6f130
Merge release/2.2 and replace submodules
...
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08: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
bd5bf34351
Merge branch 'release/2.2'
2018-11-09 07:29:37 -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
a00118ada1
Disable IIS tests due to web.config generation issue ( #3951 )
2018-11-06 13:25:50 -08:00
Nate McMaster
7f95d6af34
Remove everything from the package archive except Microsoft.AspNetCore.App
2018-11-06 09:43:51 -08:00
Justin Kotalik
c5e7bd244d
Merge branch 'release/2.2'
2018-11-05 09:10:29 -08:00
Justin Kotalik
90b11de8f1
Get IISIntegration CI working ( #3875 )
2018-11-05 08:45:11 -08:00
John Luo
faba76cfa1
Merge branch 'release/2.2'
2018-11-02 15:57:49 -07: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
Nate McMaster
50e1e60247
Merge branch 'release/2.2'
2018-11-02 10:49:11 -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
868dc32c97
Merge branch 'release/2.2'
2018-10-31 21:04:25 -07:00
Justin Kotalik
d6a5ef57af
Merge remote-tracking branch 'i/jkotalik/30Merge' into jkotalik/new30Merge
2018-10-31 20:05:44 -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
ebb0bfefb7
Reorganize source code in preparation to move into aspnet/aspnetcore
2018-10-31 16:57:49 -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