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
db7b28d475
Merge remote-tracking branch 'Security/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:40 -08:00
ff3891fa7a
Merge remote-tracking branch 'Routing/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:30 -08:00
c8e271e8ac
Merge remote-tracking branch 'ResponseCaching/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:21 -08:00
5c0097bf69
Merge remote-tracking branch 'HttpSysServer/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:11 -08:00
af2f57386e
Merge remote-tracking branch 'CORS/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:00 -08:00
3e59973378
Merge remote-tracking branch 'Antiforgery/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:16:52 -08:00
f7b51eedda
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 930ed239e4
2018-11-21 15:12:11 -08:00
3840ca4451
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 58b66f7cbb
2018-11-21 15:09:05 -08:00
ce2f7908e4
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 777b2fbf7e
2018-11-21 15:06:37 -08:00
03db4faa68
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d8d1f36f28
2018-11-21 15:05:23 -08:00
2374a67d55
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in ec429447bf
2018-11-21 15:03:35 -08:00
42a93c8153
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 93b496090e
2018-11-21 15:01:46 -08:00
9fc5a5b841
Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster
2018-11-21 14:57:58 -08:00
71b1bb8887
Merge branch 'release/2.1' into release/2.2
2018-11-21 14:57:45 -08:00
c80604a7da
Fix directory structure ( #4201 )
...
Fix directory structure
2018-11-21 14:55:25 -08:00
6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo
2018-11-21 14:23:55 -08:00
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
2dfe427c33
Fix RepositoryUrl
2018-11-21 12:14:50 -08:00
4e93ff7835
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster
2018-11-21 12:13:13 -08:00
4075c10733
Merge remote-tracking branch 'Session/rybrande/masterToSrc' into rybrande/Mondo22ToMaster
2018-11-21 12:05:57 -08:00
b519951572
Merge remote-tracking branch 'StaticFiles/rybrande/masterToSrc' into rybrande/Mondo22ToMaster
2018-11-21 12:05:51 -08:00
dac9378e31
Merge remote-tracking branch 'ServerTests/rybrande/masterToSrc' into rybrande/Mondo22ToMaster
2018-11-21 12:05:41 -08:00
1182293e8b
Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster
2018-11-21 12:03:58 -08:00
5e8e24ec88
Set RepositoryUrl to aspnet/AspNetCore
2018-11-21 11:32:49 -08:00
c0fb3d2278
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 67aa19aea7
2018-11-21 11:27:50 -08:00
7b891fc3d1
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in b732ef662e
2018-11-21 11:25:55 -08:00
b5894e6b5b
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in e3c711f538
2018-11-21 11:23:53 -08:00
1ac92426ab
Merge remote-tracking branch 'Session/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 11:15:09 -08:00
7b708c291c
Merge remote-tracking branch 'StaticFiles/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 11:15:02 -08:00
7a9e1f9ec9
Merge remote-tracking branch 'ServerTests/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 11:14:50 -08:00
bfffb3c31e
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-21 11:11:35 -08:00
feb5e3ac9b
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 774079d60d
2018-11-21 11:02:38 -08:00
c391301dce
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in a5fcd9dd87
2018-11-21 10:59:42 -08:00
04096c9225
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 04c6c6bab8
2018-11-21 10:58:10 -08:00
e6b3a5b79b
Merge remote-tracking branch 'Session/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 10:05:41 -08:00
93238389a7
Merge remote-tracking branch 'StaticFiles/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 10:05:32 -08:00
c75177033a
Merge remote-tracking branch 'ServerTests/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 10:05:22 -08:00
95928c0c64
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d20c2c8f04
2018-11-21 10:02:17 -08:00
98bbdf6e34
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 2b285667a8
2018-11-21 10:00:40 -08:00
9ba11244f2
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 019ba1722e
2018-11-21 09:58:26 -08:00
e808301e38
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster
2018-11-21 09:54:05 -08:00
40ef11cf54
Fix UserSecretsIdAttribute generation when using FrameworkReference to Microsoft.AspNetCore.App ( #4177 )
...
When only Microsoft.AspNetCore.App is referenced, the project will no longer have MSBuild imports from the Microsoft.Extensions.Configuration.UserSecrets package, which takes care of generating the UserSecretsIdAttribute. This ensures the attribute is still generated in default project templates without needing a new package ref to Config.UserSecrets.
2018-11-21 09:12:06 -08:00
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
c8dddaaafc
Merge remote-tracking branch 'Metapackages/rybrande/masterToSrc' into rybrande/Mondo22ToMaster
2018-11-20 16:43:26 -08:00
4ab02a9ad9
Merge remote-tracking branch 'JavaScriptServices/rybrande/masterToSrc' into rybrande/Mondo22ToMaster
2018-11-20 16:43:12 -08:00
9ecf86fe65
Merge remote-tracking branch 'AADIntegration/rybrande/masterToSrc' into rybrande/Mondo22ToMaster
2018-11-20 16:42:54 -08:00
73dbfdbee1
Merge branch 'release/2.2' into rybrande/Mondo22ToMaster
2018-11-20 16:42:11 -08:00
27eed7e904
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d417aacd7c
2018-11-20 16:32:23 -08:00
cdc621d428
Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc
2018-11-20 16:26:40 -08:00
00b0bcc665
Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc
2018-11-20 16:23:13 -08:00
564f5a45ba
Fix about
2018-11-20 16:09:50 -08:00
d0c73c16d5
Fix tests
2018-11-20 16:08:17 -08:00
70260923ef
Remove extras
2018-11-20 16:06:40 -08:00
0f2ae895e3
Remove bower files
2018-11-20 16:02:55 -08:00
dd914d9430
Revert back to 2.2
2018-11-20 16:00:48 -08:00
d5587f3c54
Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge
2018-11-20 15:42:00 -08:00
5a446ecc53
Merge pull request #4165 from aspnet/joeloff/SharedInstall
...
#3697 - override default install location
2018-11-20 13:41:08 -08:00
1d9b77e255
Import DotNetPackageVersionPropsPath into all sub-folder builds
2018-11-20 13:23:55 -08:00
48528cf69f
Fix templating casing
2018-11-20 12:53:46 -08:00
0f904c518e
React to breaking changes in Microsoft.Extensions.Logging.Abstractions
2018-11-20 12:52:15 -08:00
43fa1ba365
Import DotNetPackageVersionPropsPath into the src/IISIntegration build context
2018-11-20 12:10:44 -08:00
bd54395fe5
Remove duplicate keys
2018-11-20 12:07:14 -08:00
07c3931758
#3697 - override default install location
2018-11-20 12:02:03 -08:00
71ca1faa6b
React to MSBuild breaking changes and remove ProdCon v1 variables ( #4161 )
...
This should unblock the consumption of the latest .NET Core SDK, which includes breaking changes in MSBuild. We don't _really_ need the MSBuild APIs which were broken because ProdCon v1 is dead. This removes the unused ProdCon v1 tasks and targets.
2018-11-20 11:34:53 -08:00
5e36c334e1
Merge remote-tracking branch 'MetaPackages/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-20 11:10:34 -08:00
2b146e5266
Merge remote-tracking branch 'JavaScriptServices/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-20 11:10:19 -08:00
65ceeb6560
Merge remote-tracking branch 'AADIntegration/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-20 11:09:14 -08:00
a6acf47e79
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 27efce1042
2018-11-20 11:06:50 -08:00
964498a69d
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 7819c2f950
2018-11-20 11:04:10 -08:00
7ffbb6ed3b
Continue to produce .Sources packages from src/Shared/
...
This is temporary until we finish replacing internal PackageReference with project ref
2018-11-20 11:01:36 -08:00
33b736b4a7
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 0efa96de73
2018-11-20 10:57:52 -08:00
0af21077c3
Update .NET Core 3.0 dependencies ( #4091 )
...
* Update Extensions to 3.0.0-preview.18569.14
* Update EFCore to 3.0.0-preview.18569.2
* Update corefx to preview.18566.8
* Update core-setup to preview-27117-01
2018-11-20 10:37:13 -08:00
b335283ab1
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2018-11-20 10:24:50 -08:00
550435373b
Fix casing in MetaPackages
2018-11-20 10:24:34 -08:00
6fc3eb3bfc
Fix MetaPackage casing
2018-11-20 10:21:21 -08:00
f45dacf924
Fix folder casing ( #4144 )
...
Fix folder casing
2018-11-20 10:02:51 -08:00
d17392bc45
Port Resolve C26496 compiler errors when building in release mode with VS 15.9 ( #4141 )
2018-11-20 10:00:37 -08:00
425c196cba
Merge the master branch of aspnet/Hosting
2018-11-20 09:59:15 -08:00
b6de45ee72
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 241d2c13df
2018-11-20 09:51:45 -08:00
ee1e2d6173
Merge the master branch of aspnet/HttpAbstractions
2018-11-20 09:49:01 -08:00
294b5f2928
Merge branch 'release/2.2'
2018-11-20 09:47:59 -08:00
5539b0f6e7
Change Google scope in external providers sample ( #4138 )
2018-11-20 09:38:05 -08:00
bfba741326
Merge aspnet/Hosting release/2.2
2018-11-20 09:35:34 -08:00
0f64aa5c01
Merge aspnet/HttpAbstractions release/2.2
2018-11-20 09:15:59 -08:00
feb68c1382
Merge branch 'release/2.1' into release/2.2
2018-11-20 09:13:55 -08:00
9b1cfd59b5
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 0724e6cde1
2018-11-20 09:03:14 -08:00
c199b7a658
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in bc7092a32b
2018-11-20 08:45:03 -08:00
0063d5a031
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 91db78cf92
2018-11-20 08:37:32 -08:00
3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency
2018-11-19 23:38:13 -08:00
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
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -08:00
dc4c18e9ac
Merge source code from aspnet/Hosting into this repo
2018-11-19 22:02:46 -08:00
87ab2744ce
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3f7ee338d4
2018-11-19 22:00:32 -08:00
4fcc8b9902
Update targets to build HttpAbstractions projects
2018-11-19 21:34:26 -08:00
98190bdaf9
Merge source code from aspnet/HttpAbstractions into this repo
2018-11-19 21:13:15 -08:00
0ef9993f46
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d142d58eb4
2018-11-19 21:12:01 -08:00
7c6bf7f75d
Merge branch 'release/2.2'
2018-11-19 21:00:19 -08:00
838cafcc4f
Fix the casing
2018-11-19 17:01:30 -08:00
a11f4c2409
Fix the casing
2018-11-19 17:00:44 -08:00
Nate McMaster
Ryan Brandenburg
Nate McMaster
Jacques Eloff
Jacques Eloff
Pavel Krymets
Luke Latham