Justin Kotalik
880dd2b706
Fix malformed korebuild lock file
2018-11-01 14:45:15 -07:00
ASP.NET CI
7842a73986
Updating submodule(s)
...
ServerTests => 019ba1722e
[auto-updated: submodules]
2018-11-01 14:42:59 -07:00
Justin Kotalik
b7162e23ca
Merge branch 'release/2.2'
2018-11-01 14:42:53 -07:00
Justin Kotalik
04c6c6bab8
Merge branch 'release/2.1' into release/2.2
2018-11-01 14:39:40 -07:00
Justin Kotalik
019ba1722e
Remove unused M.A.Server.IIS package ( #150 )
2018-11-01 14:38:46 -07:00
ASP.NET CI
7388b64ed9
Updating BuildTools from 2.2.0-preview2-20181031.7 to 2.2.0-preview2-20181101.2
...
[auto-updated: buildtools]
2018-11-01 14:18:04 -07:00
ASP.NET CI
878542e3fc
Updating submodule(s)
...
DotNetTools => d745b8c161
Identity => b56dc070fb
[auto-updated: submodules]
2018-11-01 14:17:56 -07:00
Nate McMaster
5abb3f1f57
Merge branch 'release/2.2'
2018-11-01 14:15:50 -07:00
Nate McMaster
95205d9994
Merge branch 'release/2.2'
2018-11-01 14:02:07 -07:00
Nate McMaster
b56dc070fb
Ensure ApiAuthorization.IdentityServer doesn't build a 2.2.0 package with the rest of RTM ( #2049 )
2018-11-01 13:32:23 -07:00
Mike Lorbetske
d745b8c161
Fix #485
2018-11-01 13:00:20 -07:00
Mike Lorbetske
22a32500ac
Fix several issues
...
Fix #502
Fix #492
Fix #491
Fix #486
Improves #489
2018-11-01 13:00:20 -07:00
ASP.NET CI
4fc16c87e9
Updating submodule(s)
...
DotNetTools => fbca8be404
SignalR => 4496366794
[auto-updated: submodules]
2018-11-01 12:04:14 -07:00
Javier Calvarro Nelson
e367b82794
Merge pull request #3862 from aspnet/javiercn/auth-server
...
Add auth server package
2018-11-01 11:58:37 -07:00
Javier Calvarro Nelson
f56df64f7a
Merge pull request #2047 from aspnet/javiercn/merge-22-master
...
Merge branch 'release/2.2' => 'master'
2018-11-01 11:56:56 -07:00
Javier Calvarro Nelson
405adf3ddd
Merge remote-tracking branch 'origin/release/2.2'
2018-11-01 11:50:52 -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
Javier Calvarro Nelson
f170981fec
Add auth server package
2018-11-01 11:24:41 -07:00
Andrew Stanton-Nurse
4496366794
Remove Jenkins PR build config files
2018-11-01 11:03:47 -07:00
Javier Calvarro Nelson
5e10eb1d1a
Support for ApiAuth using Identity Server
2018-11-01 11:03:28 -07:00
Nate McMaster
a771af3698
Merge pull request #509 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-11-01 10:14:03 -07:00
Nate McMaster
fbca8be404
Disable building the VSIX in 2.2 by default ( #508 )
...
We don't release the UserSecrets VSIX from this branch
2018-11-01 10:01:42 -07:00
ASP.NET CI
193cf8f8c1
Updating submodule(s)
...
EntityFrameworkCore => d5745f8b895de2c9f7636ecded35d387e2ff4d7b
[auto-updated: submodules]
2018-11-01 09:27:36 -07:00
Pranav K
1fde1cc061
React to Razor.Design package removal
2018-11-01 07:37:47 -07:00
Pranav K
90b5a51ac4
React to Razor.Design removal
...
* Update to feature branch versions of Razor.Sdk and Mvc
* Do not target MVC 3.0 in a netcoreapp2.x targeting project
2018-11-01 07:37:11 -07:00
ASP.NET CI
ec8573f3ab
Updating submodule(s)
...
Diagnostics => c802d5ef5f
HttpSysServer => 3e08bf8833
JsonPatch => 3b485909eb
KestrelHttpServer => d50c0c13b9
Logging => d39ac3492dc075a13580419b698960fe084a7c00
MetaPackages => 27efce1042
Mvc => a6199bbfba
SignalR => 83139d36f4
[auto-updated: submodules]
2018-11-01 00:29:58 -07:00
Nate McMaster
57d52d392d
Add Microsoft.NETFramework.ReferenceAssemblies to list of external dependencies
2018-11-01 00:25:05 -07:00
Nate McMaster
4c63404bf5
Update build tools to 2.2.0-preview2-20181031.7
2018-11-01 00:21:55 -07:00
Nate McMaster
cd36ae4f16
Delete mv_to_src.sh
2018-10-31 23:53:13 -07:00
Ryan Nowak
6c3ae2ff9e
fix RazorRendering build
2018-10-31 21:43:11 -07:00
Justin Kotalik
868dc32c97
Merge branch 'release/2.2'
2018-10-31 21:04:25 -07:00
Justin Kotalik
f3dbb1654e
Merge branch 'release/2.1' into release/2.2
2018-10-31 21:01:20 -07:00
Justin Kotalik
4d57528704
Merge pull request #3787 from aspnet/jkotalik/new30Merge
...
Merge IISIntegration into master
2018-10-31 20:42:35 -07:00
Justin Kotalik
6d2e8a5c92
Merge pull request #3786 from aspnet/jkotalik/21Merge
2018-10-31 20:31:35 -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
7df2f61874
Merge pull request #3784 from aspnet/jkotalik/22Merge
...
Merge IISIntegration into release/2.2
2018-10-31 19:43:30 -07:00
Justin Kotalik
69b7b427fc
Merge pull request #3781 from aspnet/jkotalik/21Merge
2018-10-31 19:40:28 -07:00
Ryan Nowak
c0fb1a84cf
Fix NuGetPackageVerifier.json
...
Different Version = Different supressions
2018-10-31 19:04:23 -07:00
Justin Kotalik
3f04c928f4
Merge branch 'jkotalik/21Merge' into jkotalik/22Merge
2018-10-31 18:38:00 -07:00
Justin Kotalik
fc17530148
Merge remote-tracking branch 'i/jkotalik/22Merge' into jkotalik/22Merge
2018-10-31 18:25:22 -07:00
Justin Kotalik
ce68c8e5be
remove submodule
2018-10-31 18:14:34 -07:00
Nate McMaster
329d88e334
Remove signing configuration for files that were in Microsoft.AspNetCore.All
2018-10-31 18:04:23 -07:00
Nate McMaster
178d4e63a8
Merge branch 'release/2.2'
2018-10-31 18:03:26 -07:00
Nate McMaster
ee0a11d048
Update code signing configuration to account for crossgen-ed assemblies ( #3783 )
...
* Update code signing configuration to automatically skip files in Microsoft.NETCore.App
* Update code signing configuration to account for crossgen-ed assemblies
2018-10-31 18:01:32 -07:00
Nate McMaster
4b1ce19689
Merge branch 'release/2.2'
2018-10-31 17:32:12 -07:00
Nate McMaster
4b99a85a5f
Merge branch 'release/2.1' into release/2.2
2018-10-31 17:25:20 -07:00
Ryan Nowak
48f4e6390f
Rolling back the version of Roslyn for analyzers
...
Rolling back the version used by analyzers. This isn't something that I
need for the Razor tooling work, so I'm going for a less impactful
change for now.
2018-10-31 17:21:38 -07:00
Justin Kotalik
04d1f6813c
Merge remote-tracking branch 'i/jkotalik/21Merge' into jkotalik/21Merge
2018-10-31 17:18:48 -07:00
Justin Kotalik
69cc119ba4
Merge branch 'jkotalik/22Merge' into jkotalik/30Merge
2018-10-31 16:59:05 -07:00
Justin Kotalik
ebb0bfefb7
Reorganize source code in preparation to move into aspnet/aspnetcore
2018-10-31 16:57:49 -07:00