cfbacd7456
Update developer documentation ( #4288 ) [ci skip]
2018-11-28 12:49:29 -08:00
1aace2b6c7
Fix DevDiv 736427
...
When a user builds a 2.1 or 2.2 project with a 3.0 they can get an error
due to invalid command line options from rzc. What happens is that the
3.0 tasks (which are a singleton) are talking to the 2.X build tool
(which is NOT a singleton).
Recently some changes were make to the 3.0 tasks which caused this bug
because it did not properly accomodate downlevel versions of rzc. We
have an integration test for this scenario for but the regression was
not detected, so obviously something is wrong with the test setup. I'll
investigate that separately.
2018-11-28 12:42:54 -08:00
321327f84b
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-28 12:28:04 -08:00
4c4cda5fc3
Make gradlew executable
2018-11-28 10:12:35 -08:00
82c2fa8e71
Merge remote-tracking branch 'origin/rybrande/MondoMaster' into rybrande/MondoMaster
2018-11-28 10:08:44 -08:00
ba1bb521bc
Add korebuild.json back to SignalR and Razor
2018-11-28 09:33:49 -08:00
53fbdb8243
Update Components readme ( #4282 )
2018-11-28 10:32:57 +00:00
62dd8f4bd9
Merge in Components from Blazor repo
2018-11-28 08:15:48 +00:00
47d6329f67
Fix Razor RootPath
2018-11-27 16:57:06 -08:00
77001e40f2
Merge remote-tracking branch 'Razor/rybrande/masterToSrc' into rybrande/MondoMaster
2018-11-27 15:47:57 -08:00
b541eca8d9
Merge remote-tracking branch 'MvcPrecompilation/rybrande/masterToSrc' into rybrande/MondoMaster
2018-11-27 15:47:49 -08:00
f31ad5f9bf
Merge remote-tracking branch 'SignalR/rybrande/masterToSrc' into rybrande/MondoMaster
2018-11-27 15:47:41 -08:00
b465db3f53
Merge remote-tracking branch 'Mvc/rybrande/masterToSrc' into rybrande/MondoMaster
2018-11-27 15:47:27 -08:00
c8e65c78d4
Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc
2018-11-27 15:43:55 -08:00
64e97a3604
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 582f3f867e
2018-11-27 15:43:05 -08:00
2d2ba29bfc
Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc
2018-11-27 15:40:11 -08:00
523d82c69a
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3cd4de8af8
2018-11-27 15:39:43 -08:00
00e0ab2011
Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc
2018-11-27 15:37:35 -08:00
a6b473dc2c
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in c9887e027a
2018-11-27 15:36:38 -08:00
5116838807
Change package path to a directory ( #4269 )
2018-11-27 15:35:59 -08:00
b9ab4d6b3d
Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc
2018-11-27 15:30:53 -08:00
c88b650c5a
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in c852bdcc33
2018-11-27 15:29:29 -08:00
fa1af0e5a5
Merge remote-tracking branch 'origin/release/2.2' into rybrande/MondoMaster
2018-11-27 15:04:40 -08:00
cef3782c3b
Components merge CR feedback
2018-11-27 22:12:24 +00:00
42c1ceb3cf
Fix package output path
2018-11-27 22:11:50 +00:00
e46623e256
Merge remote-tracking branch 'Razor/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:26:29 -08:00
9c3fee5fea
Merge remote-tracking branch 'MvcPrecompilation/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:26:22 -08:00
4d9b60d0ad
Merge remote-tracking branch 'Mvc/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:26:05 -08:00
c51e6aad29
Merge remote-tracking branch 'SignalR/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:25:27 -08:00
a031deb8c5
Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc
2018-11-27 12:17:02 -08:00
6f80eeda29
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 8ba0a89425
2018-11-27 12:16:27 -08:00
ddb5af991d
Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc
2018-11-27 12:12:43 -08:00
589db8b413
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 032768b063
2018-11-27 12:12:19 -08:00
7d84282d9e
Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc
2018-11-27 12:09:45 -08:00
b659c82df6
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in a6199bbfba
2018-11-27 12:09:17 -08:00
f199a689b0
Updating submodule(s)
...
Localization => c283dfb56c
2018-11-27 12:08:14 -08:00
b211b3c31b
Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc
2018-11-27 12:06:22 -08:00
1992701808
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d0bcdf3dd9
2018-11-27 12:06:02 -08:00
6603195a10
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-27 11:57:39 -08:00
beb142701e
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2018-11-27 11:52:30 -08:00
95d8b39e96
Revert "Target right version of ANCM nuget package ( #4194 )" ( #4262 )
2018-11-27 11:45:08 -08:00
4d856dd279
Revert "Target right version of ANCM nuget package ( #4194 )" ( #4261 )
2018-11-27 11:44:47 -08:00
89a1687bd0
Merge branch 'release/2.2'
2018-11-27 11:14:58 -08:00
b6eb6dd819
Merge remote-tracking branch 'origin/release/2.2'
2018-11-27 11:14:05 -08:00
47660a9d03
Merge branch 'halter73/1390' into release/2.2
2018-11-27 11:11:19 -08:00
d025e4e0ad
Fix submodules for Mvc MvcPrecompilation Razor and SignalR
2018-11-27 11:02:50 -08:00
b4dbbdcf35
Components merge CR feedback
2018-11-27 18:58:34 +00:00
137bf3dde7
Merge remote-tracking branch 'Razor/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:43 -08:00
54e9e55535
Merge remote-tracking branch 'MvcPrecompilation/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:37 -08:00
35d2f10a20
Merge remote-tracking branch 'Mvc/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:22 -08:00
Nate McMaster
Ryan Nowak
Ryan Brandenburg
Steve Sanderson
Pavel Krymets
ASP.NET CI
Justin Kotalik
Stephen Halter