Commit Graph

2396 Commits

Author SHA1 Message Date
John Luo b8db81898a Merge remote-tracking branch 'origin/master' 2018-12-17 15:16:21 -08:00
John Luo 98636fed6d Merge branch 'release/2.2' 2018-12-17 14:24:30 -08:00
Pavel Krymets bc5667ffab
Update extensions to preview.18617.1 and corefx to preview.18604.2 (#5274) 2018-12-17 13:23:12 -08:00
Ajay Bhargav Baaskaran b079041488
Convert Razor to use Reference (#4954) 2018-12-17 12:10:40 -08:00
James Newton-King 443b1449ff
Update Newtonsoft.Json to 12.0.1 and Newtonsoft.Json.Bson to 1.0.2 (#5122) 2018-12-18 08:55:37 +13:00
John Luo da72ac62ba Merge remote-tracking branch 'origin/release/2.2' into release/2.2 2018-12-14 16:52:45 -08:00
Nate McMaster 9183145474
Fix package layout for ANCM packages (#5119) 2018-12-14 16:04:15 -08:00
Nate McMaster 02780bac26
Merge branch 'release/2.2' 2018-12-14 16:03:16 -08:00
John Luo f659f0acce Merge branch 'release/2.1' into release/2.2 2018-12-14 15:48:40 -08:00
Justin Kotalik 68f0aff144 security to project ref (#4618) 2018-12-14 14:49:23 -08:00
Nate McMaster cb5458e870
Exclude ancm.mof from code signing
This file is not signable. The sign tool treats .mof as a potential signing candidate by default, even though most .mof files are not signable.
2018-12-14 12:05:30 -08:00
Nate McMaster feb641ddda
Merge branch 'release/2.1' into release/2.2 2018-12-14 09:44:15 -08:00
Nate McMaster 13ae0057fb
Replace .Sources package references with local code (#4801)
Replaces package references the following packages with local code:

Microsoft.AspNetCore.Certificates.Generation.Sources
Microsoft.Extensions.CopyOnWriteDictionary.Sources 
Microsoft.Extensions.ClosedGenericMatcher.Sources
Microsoft.Extensions.ObjectMethodExecutor.Sources
Microsoft.Extensions.PropertyActivator.Sources
Microsoft.Extensions.PropertyHelper.Sources
Microsoft.Extensions.RazorViews.Sources
Microsoft.Extensions.SecurityHelper.Sources
Microsoft.Extensions.StackTrace.Sources
Microsoft.Extensions.WebEncoders.Sources
2018-12-14 08:36:36 -08:00
Nate McMaster 206db0558e
Update buildtools and add properties to skip IIS tests 2018-12-13 23:36:42 -08:00
Nate McMaster f0990ec531
Fix build issues with IIS integration projects
Changes:
* Ensure IIS managed and pkg projects build after the native projects
* Update projects to build test
* Update CI checks to build on macOS and Linux
* Use package baselines to manage ANCM packages
2018-12-13 22:53:31 -08:00
Justin Kotalik 6adfa32402
Merge branch 'release/2.1' into release/2.2 2018-12-13 22:12:19 -08:00
Nate McMaster 96ea326664
Document custom reference resolution (#4806) 2018-12-13 14:35:02 -08:00
John Luo a026e7a4e7
Convert MetaPackages to Reference and move to DefauldBuilder folder (#4687)
* Convert ServerTests to Reference and move to Server folder

* Fix NU1105
2018-12-13 11:39:15 -08:00
Justin Kotalik 429719b91d
Make IISIntegration use Reference instead of PackageReference (and reactionary work) (#4311) 2018-12-12 16:59:44 -05:00
Ajay Bhargav Baaskaran ad3835c3e2
Removed unnecessary projects (#4586) (#4612) 2018-12-12 12:59:04 -08:00
Ajay Bhargav Baaskaran 98f2973880
Removed unnecessary projects (#4586) 2018-12-12 10:41:06 -08:00
Chris Ross 12966c63a6
Change DataProtection projects to target netcoreapp3.0 #3754 (#4473) 2018-12-12 10:04:36 -08:00
Nate McMaster d12827e609
Merge branch 'release/2.2' 2018-12-11 18:04:58 -08:00
dotnet-maestro-bot 38785d0be9 [automated] Merge branch 'release/2.1' => 'release/2.2' (#4577)
* Workaround problems when opening solution files in Visual Studio (#4569)

Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore

* Convert Session to use Reference and move to Middleware folder (#4576)

* Add RoutingSample.Web to HttpAbstractions.sln
2018-12-11 16:13:20 -08:00
John Luo 3acdfb3d26
Convert Session to use Reference and move to Middleware folder (#4576) 2018-12-11 14:56:42 -08:00
Nate McMaster 5151e7b1ed
Workaround problems when opening solution files in Visual Studio (#4569)
Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore
2018-12-11 14:05:21 -08:00
Pavel Krymets 7f1f7a5256
Change runtime site extension to ship by default (#4572) 2018-12-11 10:48:55 -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 1fd3fb764a
Update the list of shipping vs internal packages (#4552)
* Put packages back into 'ship' which were unintentionally skipped in 3.0 refactoring
   * Libuv transport for kestrel
   * Http connection abstractions shared by SignalR client and Kestrel.
   * Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson - this wasn't moved to the right category when it was added
* Make dotnet-* packages internal-only. They were only shipped to NuGet.org because we had not yet enabled source-build. We plan to implement source-build in 3.0 (#3752)
* Make Microsoft.Extensions.Identity.* packages shared-framework only (see #4523). 
* Remove unused entries for packages that moved to aspnet/AspNetCore-Tooling
* Add comments in the artifacts.props document for why each 'noship' package is in this category.
2018-12-10 15:37:54 -08:00
Nate McMaster 630b1c26c1
Disable validation which asserts all .NET assemblies are strong-named (#4524) 2018-12-10 08:37:54 -08:00
Nate McMaster c612eb8730
Merge branch 'release/2.2' 2018-12-07 14:50:17 -08:00
Justin Kotalik 5f843f223e
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref (#4484) 2018-12-07 14:30:50 -08:00
Nate McMaster 5017afa0ad
Merge branch 'release/2.1' to release/2.2 2018-12-07 12:45:42 -08:00
Nate McMaster df3e4b98a2
Backport infrastructure cleanup to share sources and project references (#4513) 2018-12-07 12:20:13 -08:00
Nate McMaster 85e2147ff0
Merge branch 'release/2.2' 2018-12-07 11:11:44 -08:00
Chris Ross f1aacdbaa8
Remove Microsoft.Owin.Security.Interop and Microsoft.AspNet.Identity.AspNetCoreCompat (#4479) 2018-12-07 09:59:36 -08:00
Nate McMaster 569a14ecb8
Merge branch 'release/2.1' into release/2.2 2018-12-06 17:09:03 -08:00
Nate McMaster 5d777b2c66
Conditionally skip patch.zip files which way not be produced in servicing builds (#4481) 2018-12-06 14:06:42 -08:00
Pavel Krymets fe557cd4d5
Update internal dependencies (#4465) 2018-12-06 10:26:41 -08:00
Ryan Nowak e3773b6383 Remove Razor tooling projects
Removes the Razor compiler/tooling projects from this repo
2018-12-06 07:47:00 -08:00
Nate McMaster 50bea05918
Refactor Routing to use ProjectReference and move into src/Http folder (#4441)
Changes:

* Stop producing Microsoft.AspNetCore.Routing.DecisionTree.Sources. I could not find any usages outside of the Microsoft.AspNetCore.Routing assembly, so I've moved this to be a subfolder of code in the Microsoft.AspNetCore.Routing project.
* Stop building src/Routing as a submodule. Use ProjectReference instead
* Move projects from src/Routing into src/Http/Routing/ and src/Http/Routing.Abstractions/
* Update package baselines and dependencies to support building routing projects and samples
2018-12-05 22:14:22 -08:00
Nate McMaster 8b3ecb412d Update dependencies
* efcore to 3.0.0-preview.18604.3
* extensions to 3.0.0-preview.18605.1
2018-12-05 18:10:53 -08:00
Nate McMaster 1b9a6b093d
Replace PackNuspec with a dummy .csproj file 2018-12-05 17:59:29 -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
Nate McMaster f0b4ac75c4
Set the default submodule path to src/ and fixup bad merge from release/2.2 2018-12-05 11:11:14 -08:00
Nate McMaster 62f9655a2f
Merge branch 'release/2.2' 2018-12-05 08:54:38 -08:00
Nate McMaster be3b66d1d1
Revert "Remove Razor tooling projects"
This reverts commit 3cfa6c0526.
2018-12-05 08:40:49 -08:00
Ryan Nowak 3cfa6c0526 Remove Razor tooling projects
Removes the Razor compiler/tooling projects from this repo
2018-12-04 19:58:37 -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 cd3f6e6283
Add Localization assemblies to sign config 2018-12-04 15:29:36 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Steve Sanderson c7d6364900 Enable src/Components to build (#4367)
Fix aspnet/AspNetCore-Internal#1443
2018-12-03 16:38:28 -08:00
Nate McMaster a6b5bb16fd
Merge source code from aspnet/Identity 2018-12-03 15:54:12 -08:00
Nate McMaster c6459614c7
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in fa3cfd08eb
2018-12-03 15:52:23 -08:00
BrennanConroy 80ae51ead8
Rename Json protocol to NewtonsoftJson (#4319) 2018-12-03 08:59:44 -08:00
Nate McMaster 197c5567f4
Update EFCore submodule (#4349)
Prepare EF Core to build in 2.2.1

Fixes aspnet/AspNetCore-Internal#1441
2018-11-30 17:53:19 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Nate McMaster 054cfac97e
Add EntityFrameworkCore to the list of submodules patching in 2.2.1 (#4341) 2018-11-30 13:39:28 -08:00
Nate McMaster 9e73c3382f
Mark Microsoft.Owin.Security.Interop as noship in 3.0 2018-11-29 12:48:27 -08:00
Nate McMaster 78c0813631
Set Microsoft.Owin.Security.Interop to 'noship' for 2.2 (#4314)[ci skip] 2018-11-29 08:44:39 -08:00
Nate McMaster 26dfce1f3c
Disable building src/Components and fix its code signing configuration (#4299) 2018-11-28 15:29:25 -08:00
Ryan Brandenburg 321327f84b Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-28 12:28:04 -08:00
Ryan Brandenburg 47d6329f67 Fix Razor RootPath 2018-11-27 16:57:06 -08:00
Ryan Brandenburg fa1af0e5a5 Merge remote-tracking branch 'origin/release/2.2' into rybrande/MondoMaster 2018-11-27 15:04:40 -08:00
Ryan Brandenburg 6603195a10 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-27 11:57:39 -08:00
Ryan Brandenburg d025e4e0ad Fix submodules for Mvc MvcPrecompilation Razor and SignalR 2018-11-27 11:02:50 -08:00
Steve Sanderson 1b7fe76382 Add missing package source for external Components packages 2018-11-27 17:57:04 +00:00
Steve Sanderson 16c11b4c87 Integrate src/Components into mondorepo build system 2018-11-27 17:17:34 +00:00
Ryan Brandenburg 291e743c9c Remove duplicate order 2018-11-26 14:48:05 -08:00
Nate McMaster f57bed87ee
Avoid build order changes
Co-Authored-By: ryanbrandenburg <rybrande@microsoft.com>
2018-11-26 14:45:22 -08:00
Ryan Brandenburg e60e74e2bb Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-26 12:32:17 -08:00
Chris Ross (ASP.NET) c88c1f96f4 KestrelHttpServer/#3101 Remove empty Microsoft.AspNetCore.Server.Kestrel.Https assembly 2018-11-26 10:03:03 -08:00
Nate McMaster d06891e045
Update dependencies
* corefx to preview.18571.3
 * core-setup to 3.0.0-preview-27122-01
 * buildtools to 3.0.0-build-20181120.4
 * extensions to 3.0.0-preview.18572.1
 * efcore to 3.0.0-preview.18572.1

Fix #4172 - remove signcheck exclusion for core-setup files
2018-11-22 15:38:41 -08:00
Nate McMaster a5d06f35b1
Remove Roslyn from the shared framework (#4225)
Reacting to aspnet/Mvc#8755
2018-11-22 12:56:34 -08:00
Nate McMaster 6c60e0260c
Merge branch 'master' from aspnet/Diagnostics 2018-11-21 16:38:27 -08:00
Ryan Brandenburg 1ee4e2b936 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-21 16:33:42 -08:00
Nate McMaster 006558c412
Merge branch 'release/2.2' 2018-11-21 16:28:33 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Ryan Brandenburg 94e1afafa6 Remove submodules for Antiforgery CORS HttpSysServer ResponseCaching Routing and Security 2018-11-21 15:26:19 -08:00
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -08:00
Ryan Brandenburg 1619454b06 PR feedback 2018-11-21 14:31:40 -08:00
Nate McMaster 6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo 2018-11-21 14:23:55 -08:00
Nate McMaster 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
Ryan Brandenburg 1182293e8b Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-21 12:03:58 -08:00
Ryan Brandenburg 498e49bc84 Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-21 11:30:50 -08:00
Artak a13e3b4813 Marked the `Microsoft.Extensions.ApiDescription.Design` package as "noship" (#4185) 2018-11-21 11:25:24 -08:00
Ryan Brandenburg bfffb3c31e Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-21 11:11:35 -08:00
Nate McMaster 0295f536ef
Stop shipping packages for assemblies which are shared-framework-only (#4178)
The removes the need to ship packages for assemblies which are part of Microsoft.AspNetCore.App. The implementation of this requires first building packages, and then modifying .nuspec's and categorizing packages as "noship". This will be cleaned up in the future as we continue to refactor the way this repository builds.
2018-11-21 10:33:07 -08:00
Ryan Brandenburg 2711049cf4 Fix submodules for ServerTests StaticFiles and Session 2018-11-21 10:08:51 -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 1d36dfeb5e Sign Browserlink 2018-11-20 16:56:56 -08:00
Ryan Brandenburg 396aa9735e PR feedback 2018-11-20 16:15:51 -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
Ryan Brandenburg 6e439f1396 Fix submodules 2018-11-20 12:57:21 -08:00
Ryan Brandenburg 48528cf69f Fix templating casing 2018-11-20 12:53:46 -08:00
Nate McMaster 73b5d6d0e5
Remove the BrowserLink submodule (#4087) 2018-11-20 11:36:26 -08:00
Nate McMaster 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