Commit Graph

7938 Commits

Author SHA1 Message Date
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
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
Justin Kotalik b7b324dc52 Merge branch 'jkotalik/21Merge' into jkotalik/22Merge 2018-10-31 16:51:58 -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
Nate McMaster f2c1eb73a6
Remove the Microsoft.Data.Sqlite submodule 2018-10-31 16:24:18 -07:00
Justin Kotalik 040fb6f18a Move IISIntegration into subfolder 2018-10-31 15:51:17 -07:00
BrennanConroy 18664f4e63
Remove old redis packages (#3779) 2018-10-31 15:43:07 -07:00
Nate McMaster 51c32dc4dc
Merge branch 'release/2.2' 2018-10-31 14:39:34 -07:00
Nate McMaster 954362f344
Update the sign config entry for API-MS-Win-core-xstate-l2-1-0.dll to match case exactly 2018-10-31 14:09:40 -07:00
Nate McMaster 4c51201f58
Include win-arm assets in the signing configuration 2018-10-31 13:27:25 -07:00
ASP.NET CI 50952529be Updating BuildTools from 2.1.3-rtm-15835 to 2.1.3-rtm-15836
[auto-updated: buildtools]
2018-10-31 20:22:16 +00:00
Nate McMaster b262521969
Include x86 assets in the signing configuration 2018-10-31 13:03:53 -07:00
Ryan Nowak d193e66566 Update to Dev16 Roslyn 2018-10-31 12:34:48 -07:00
Nate McMaster ba87c3fbd1
Remove Microsoft.AspNetCore.All (#3761)
This shared framework and metapackage are obsolete. The recommended replacement is Microsoft.AspNetCore.App.
2018-10-31 12:13:05 -07:00
Nate McMaster 569016c2c5
Code sign all packages in a single batch (#3778)
Changes:
* Sign shared fx zips
* Sign metapackages
* Disable signing on inner repo builds and instead sign all packages at the end
* Add a list of files from other Microsoft teams which can be excluded from signing
* Add a list of 3rd party assemblies which are bundled in the shared frameworks.
2018-10-31 12:12:15 -07:00
Brice Lambson 4a5d7cf930 Merge branch 'release/2.2' 2018-10-31 11:35:26 -07:00
Brice Lambson 1f896dc61b ⬆️ Update NetTopologySuite.IO.SqlServerBytes to 1.15.0 2018-10-31 11:30:17 -07:00
ASP.NET CI 973508d1c5 Updating submodule(s)
EntityFrameworkCore => 02c9355b90096762400aa0ab9943725a4cfd8d43
Identity => da9318f431
KestrelHttpServer => e958d82584
Mvc => c74a945dda
Razor => 41fa3ff3eb
SignalR => 865de16086

[auto-updated: submodules]
2018-10-31 10:09:06 -07:00
Nate McMaster c2e9ca24d3
Update build tools to 2.2.0-preview2-20181031.2 2018-10-31 10:04:25 -07:00
ASP.NET CI 828191adbd Updating BuildTools from 2.1.3-rtm-15834 to 2.1.3-rtm-15835
[auto-updated: buildtools]
2018-10-31 09:23:16 -07:00
Nate McMaster c629400a73
Fix syntax error caused by bad merge on build/dependencies.props 2018-10-30 17:28:41 -07:00
Nate McMaster 908a8b3013
Merge branch 'release/2.2' 2018-10-30 17:18:22 -07:00
Nate McMaster eb79d8f75e
Remove the EventNotification submodule 2018-10-30 17:10:11 -07:00
Nate McMaster 973edeb29f
List linux-arm64 as a supported RID (#3769) 2018-10-30 17:08:33 -07:00
Nate McMaster 9b98b5679a
Merge branch 'release/2.2' 2018-10-30 15:43:15 -07:00
Justin Kotalik 370490d2a3
Fix master package verison (#1565) 2018-10-30 15:31:03 -07:00
Nate McMaster a705aae147
Merge branch 'release/2.1' into release/2.2 2018-10-30 15:07:46 -07:00
Pranav K 3dcf5a04b8 Remove Microsoft.AspNetCore.Razor.Design 2018-10-30 14:30:23 -07:00
ASP.NET CI a0fdca9a78 Updating BuildTools from 2.1.3-rtm-15833 to 2.1.3-rtm-15834
[auto-updated: buildtools]
2018-10-30 14:14:50 -07:00
ASP.NET CI 6b894d9c28 Updating submodule(s)
EntityFrameworkCore => 69e54addd48783e2219a239b2c03933b48e83071

[auto-updated: submodules]
2018-10-30 12:04:26 -07:00
ASP.NET CI dec1ef91b4 Updating submodule(s)
Diagnostics => 3e6b3a0067
EntityFrameworkCore => 19f7304271b8586629afba2edde16c25eaef4589
Hosting => d7b9fd4807
Logging => b1e18f01e94a06414c610312b01d5a5f8f5d6220
Mvc => 4015c9863e
Razor => 6c1bee1940
ServerTests => 3fb2949b51
SignalR => e0f547e211

[auto-updated: submodules]
2018-10-30 12:04:14 -07:00
Nate McMaster 969fb9bf48
Update projects in src/Framework/ to netcoreapp3.0 2018-10-30 10:41:24 -07:00