3787fbf3a3
Merge branch 'release/2.2'
2018-12-21 18:29:32 -08:00
13253dab22
Merge in 'release/2.1' changes
2018-12-21 23:30:46 +00:00
edcee859f0
Convert Identity to Reference ( #6086 )
...
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
2018-12-21 15:29:35 -08:00
0bf06d8cf2
Merge in 'release/2.2' changes
2018-12-21 22:15:53 +00:00
f111a2d73a
Merge release/2.2 into master
2018-12-21 14:14:10 -08:00
f4bb260444
Merge branch release/2.1 into release/2.2
2018-12-21 13:24:33 -08:00
68bd2329e1
Merge in 'release/2.2' changes
2018-12-21 21:19:09 +00:00
d13dd578f8
Merge in 'release/2.1' changes
2018-12-21 19:44:18 +00:00
3641761d18
Convert AADIntegration projects to ProjectRef ( #6082 )
2018-12-21 11:43:09 -08:00
af2461d524
Merge branch 'release/2.1' into release/2.2
2018-12-21 11:38:25 -08:00
f94a5f6fd0
Merge in 'release/2.1' changes
2018-12-21 07:52:15 +00:00
ce481c6c79
Make JavaScriptServices use ProjectReference ( #5953 )
2018-12-20 23:50:53 -08:00
2af766db49
Stop producing unused package archives ( #6073 )
...
The following package archives which are no longer used by partner teams. It is expected that these will be replaced by targeting packs.
* LZMA (was used by dotnet-cli)
* Package zips (ended up not getting used by anyone)
* Compat package zips (was used by Azure Web Apps)
2018-12-20 20:07:40 -08:00
594e4c4c35
Merge in 'release/2.2' changes
2018-12-21 01:28:47 +00:00
c3beb1f9b1
build.cmd/sh changes ( #5958 )
...
Update the build scripts to support building subfolders or subgroups of projects
* Add build scripts for ci
* Remove obsolete scripts
* Add flags like --test and --pack to control running just test or packaging
* Add flags like --managed and --native to control building sub-types of projects
* Remove KoreBuild bootstrapper flags
* Update to extensions 3.0.0-preview.18619.1 (needed to get a fix for aspnet/Extensions#815 to make this change work on MSBuild.exe)
2018-12-20 16:52:15 -08:00
d9cf76f63d
Merge release/2.1 into 2.2
2018-12-20 16:51:06 -08:00
108fa3f911
Merge in 'release/2.1' changes
2018-12-21 00:28:36 +00:00
7f17d095d8
Convert Mvc to use Reference ( #6047 )
...
* Convert Mvc to use Reference
* Use ProjectReference for test assets
2018-12-20 16:27:32 -08:00
94a236e196
Merge in 'release/2.1' changes
2018-12-20 18:55:13 +00:00
686ce02cc8
Remove code for building an analyzers package that never shipped ( #6053 )
...
Microsoft.AspNetCore.Analyzers didn't ship in 2.1, and we don't have plans to every ship it in a 2.1.x release.
2018-12-20 10:53:42 -08:00
5f311fe859
Update to Microsoft.NETCore.App 3.0.0-preview-27219-3 ( #6054 )
2018-12-20 10:32:00 -08:00
19c8980deb
Move SiteExtension sdk into AspNetCore ( #6041 )
2018-12-20 10:25:35 -08:00
163350e968
Remove Microsoft.Extensions.DiagnosticAdapter from the shared framework ( #6042 )
2018-12-19 16:39:50 -08:00
11cce747b3
Use the right itemgroup name in Publish.targets
2018-12-19 15:34:19 -08:00
c5a6284aa8
Remove JwtBearer and OIDC authentication from the shared framework
...
These are being pulled out of the shared framework and will ship as NuGet packages. These assemblies have a dependency on the IdentityModel APIs which do no yet fit the guidelines the shared framework.
cref aspnet/AspNetCore#3755
2018-12-19 14:53:12 -08:00
d585469b05
Set BuildInParallel=false for sharedfx packing ( #6017 )
2018-12-19 13:56:35 -08:00
691ab4b37d
Allow disabling the site extension projects ( #6010 )
2018-12-19 13:23:40 -08:00
e21fe567b2
Fix invalid blob paths when pushing the build to Azure blob storage ( #5968 )
2018-12-19 09:41:08 -08:00
55b8818540
Move logging site extension ( #4005 )
2018-12-19 09:35:06 -08:00
7b77332441
[automated] Merge branch 'release/2.2' => 'master' ( #5892 )
2018-12-18 22:43:32 -05:00
66d35bd153
Merge in 'release/2.2' changes
2018-12-18 23:48:35 +00:00
de954ce702
Fixing IIS Tests ( #5682 )
2018-12-18 18:46:56 -05:00
eeabafa68f
Merge branch 'temp' into ajbaaska/merge-master
2018-12-18 14:44:25 -08:00
2a696f6a1c
Merge branch 'release/2.2'
2018-12-18 12:50:01 -08:00
fe0d8ca083
Merge in 'release/2.1' changes
2018-12-18 20:01:33 +00:00
0cbc52ca15
Convert ServerTests to Reference and move to Server folder ( #4686 )
2018-12-18 14:59:47 -05:00
335c9be7b4
Update the artifacts directory organization and simplify publishing targets ( #5701 )
...
This simplifies the way that we publish files to our network drop share.
Changes:
* Instead of explicitly listing every file that needs to publish, use directories to classify packages and artifacts into different categories.
* Add documentation for the expected layout of artifacts/
* Remove the need for static analysis to determine which packages go to which project
* Add the MSBuild property "IsProductPackage" to .csproj files which ship as a package to NuGet.org.
2018-12-18 11:40:13 -08:00
9dda9a3e2a
Merge in 'release/2.2' changes
2018-12-18 18:58:34 +00:00
ceb1c8e562
Refactor Components.Browser package ( #5166 )
...
* Add empty Microsoft.AspNetCore.Blazor project
* Reorganize Blazor-specific parts of .Components.Browser into Microsoft.AspNetCore.Blazor. Delete redundant Components-CSharp template (it now ships from Templating).
* Fix unit test
* Add missing assembly description
* Move WebAssemblyBlazorApplicationBuilder
* Rename BrowserHttpMessageHandler -> WebAssemblyHttpMessageHandler
* Delete obsolete BrowserServiceProvider. Rename BrowserRenderer -> WebAssemblyRenderer.
* Rename BrowserUriHelper -> WebAssemblyUriHelper
* Remove redundant ActivateMonoJSRuntime helper
* Fix namespace
* Remove redundant MicrosoftNETCoreAppPackageVersion override
* Update test namespaces
2018-12-18 12:32:57 +00:00
647fbbac7b
Merge branch 'release/2.1' into ajbaaska/merge-22
2018-12-17 18:40:08 -08:00
0cd79cc4c1
Remove unused VS dependencies and old versions of .NET Core from dependencies ( #5317 )
...
As a result of removing Razor's VS projects and upgrading all projects to netcoreapp3.0, we no longer need dependency variable for .NET Core 1.x and 2.x and Visual Studio packages.
Changes:
* Remove 'StandardTestTfm'
* Remove variables for .NET Core 1.0, 1.1, 2.0, 2.1, and 2.2
* Remove VSIX variables
* Stop generating 'branding.props' - this hasn't been used in a while and is no longer needed
2018-12-17 16:28:33 -08:00
b8db81898a
Merge remote-tracking branch 'origin/master'
2018-12-17 15:16:21 -08:00
98636fed6d
Merge branch 'release/2.2'
2018-12-17 14:24:30 -08:00
bc5667ffab
Update extensions to preview.18617.1 and corefx to preview.18604.2 ( #5274 )
2018-12-17 13:23:12 -08:00
ff4db87283
Merge in 'release/2.1' changes
2018-12-17 20:11:45 +00:00
b079041488
Convert Razor to use Reference ( #4954 )
2018-12-17 12:10:40 -08:00
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
c3a269adc3
Merge in 'release/2.2' changes
2018-12-15 01:29:18 +00:00
da72ac62ba
Merge remote-tracking branch 'origin/release/2.2' into release/2.2
2018-12-14 16:52:45 -08:00
a6112bf0dd
Merge in 'release/2.2' changes
2018-12-15 00:05:19 +00:00
9183145474
Fix package layout for ANCM packages ( #5119 )
2018-12-14 16:04:15 -08:00
02780bac26
Merge branch 'release/2.2'
2018-12-14 16:03:16 -08:00
f659f0acce
Merge branch 'release/2.1' into release/2.2
2018-12-14 15:48:40 -08:00
97ee5cbcac
Merge in 'release/2.1' changes
2018-12-14 22:50:26 +00:00
68f0aff144
security to project ref ( #4618 )
2018-12-14 14:49:23 -08:00
a6ff4436ae
Merge in 'release/2.2' changes
2018-12-14 20:06:55 +00:00
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
8b682dfe85
Merge in 'release/2.2' changes
2018-12-14 19:01:05 +00:00
feb641ddda
Merge branch 'release/2.1' into release/2.2
2018-12-14 09:44:15 -08:00
6133fa4dd6
Merge in 'release/2.1' changes
2018-12-14 16:37:44 +00:00
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
3b0d1253e1
Merge in 'release/2.2' changes
2018-12-14 08:57:43 +00:00
206db0558e
Update buildtools and add properties to skip IIS tests
2018-12-13 23:36:42 -08:00
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
6adfa32402
Merge branch 'release/2.1' into release/2.2
2018-12-13 22:12:19 -08:00
e1d8a986c1
Merge in 'release/2.1' changes
2018-12-13 22:36:04 +00:00
96ea326664
Document custom reference resolution ( #4806 )
2018-12-13 14:35:02 -08:00
345fee0149
Merge in 'release/2.1' changes
2018-12-13 19:40:20 +00:00
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
e8c63f6cf9
Merge in 'release/2.1' changes
2018-12-12 22:00:56 +00:00
429719b91d
Make IISIntegration use Reference instead of PackageReference (and reactionary work) ( #4311 )
2018-12-12 16:59:44 -05:00
6de24d6d2c
Merge in 'release/2.2' changes
2018-12-12 21:00:13 +00:00
ad3835c3e2
Removed unnecessary projects ( #4586 ) ( #4612 )
2018-12-12 12:59:04 -08:00
3a21d78ce6
Merge in 'release/2.1' changes
2018-12-12 18:42:13 +00:00
98f2973880
Removed unnecessary projects ( #4586 )
2018-12-12 10:41:06 -08:00
12966c63a6
Change DataProtection projects to target netcoreapp3.0 #3754 ( #4473 )
2018-12-12 10:04:36 -08:00
d12827e609
Merge branch 'release/2.2'
2018-12-11 18:04:58 -08:00
d11a6c823f
Merge in 'release/2.2' changes
2018-12-12 00:14:21 +00:00
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
8876e90846
Merge in 'release/2.1' changes
2018-12-11 22:57:48 +00:00
3acdfb3d26
Convert Session to use Reference and move to Middleware folder ( #4576 )
2018-12-11 14:56:42 -08:00
8825a726c1
Merge in 'release/2.1' changes
2018-12-11 22:06:26 +00:00
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
7f1f7a5256
Change runtime site extension to ship by default ( #4572 )
2018-12-11 10:48:55 -08:00
790ae47055
Merge branch 'release/2.2'
2018-12-10 17:41:14 -08:00
985d49c566
Merge in 'release/2.2' changes
2018-12-11 00:44:52 +00:00
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
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
630b1c26c1
Disable validation which asserts all .NET assemblies are strong-named ( #4524 )
2018-12-10 08:37:54 -08:00
c612eb8730
Merge branch 'release/2.2'
2018-12-07 14:50:17 -08:00
4b9a884a35
Merge in 'release/2.1' changes
2018-12-07 22:31:49 +00:00
5f843f223e
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref ( #4484 )
2018-12-07 14:30:50 -08:00
5e9b60a573
Merge in 'release/2.2' changes
2018-12-07 21:49:04 +00:00
5017afa0ad
Merge branch 'release/2.1' to release/2.2
2018-12-07 12:45:42 -08:00
ab8039e2dc
Merge in 'release/2.1' changes
2018-12-07 20:21:15 +00:00
df3e4b98a2
Backport infrastructure cleanup to share sources and project references ( #4513 )
2018-12-07 12:20:13 -08:00
85e2147ff0
Merge branch 'release/2.2'
2018-12-07 11:11:44 -08:00
f1aacdbaa8
Remove Microsoft.Owin.Security.Interop and Microsoft.AspNet.Identity.AspNetCoreCompat ( #4479 )
2018-12-07 09:59:36 -08:00
44f04c8b4d
Merge in 'release/2.2' changes
2018-12-07 01:43:13 +00:00
569a14ecb8
Merge branch 'release/2.1' into release/2.2
2018-12-06 17:09:03 -08:00
28cf04843f
Merge in 'release/2.1' changes
2018-12-06 22:08:33 +00:00
5d777b2c66
Conditionally skip patch.zip files which way not be produced in servicing builds ( #4481 )
2018-12-06 14:06:42 -08:00
fe557cd4d5
Update internal dependencies ( #4465 )
2018-12-06 10:26:41 -08:00
e3773b6383
Remove Razor tooling projects
...
Removes the Razor compiler/tooling projects from this repo
2018-12-06 07:47:00 -08:00
dfb6f0941d
Merge in 'release/2.1' changes
2018-12-06 06:15:42 +00:00
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
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
72098a172f
Merge in 'release/2.1' changes
2018-12-06 02:02:05 +00:00
1b9a6b093d
Replace PackNuspec with a dummy .csproj file
2018-12-05 17:59:29 -08:00
5fbec5fbb3
Merge in 'release/2.1' changes
2018-12-06 01:02:05 +00:00
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
f0b4ac75c4
Set the default submodule path to src/ and fixup bad merge from release/2.2
2018-12-05 11:11:14 -08:00
62f9655a2f
Merge branch 'release/2.2'
2018-12-05 08:54:38 -08:00
be3b66d1d1
Revert "Remove Razor tooling projects"
...
This reverts commit 3cfa6c0526
2018-12-05 08:40:49 -08:00
3cfa6c0526
Remove Razor tooling projects
...
Removes the Razor compiler/tooling projects from this repo
2018-12-04 19:58:37 -08:00
9915395424
Merge in 'release/2.1' changes
2018-12-05 00:45:13 +00:00
736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder ( #4335 )
2018-12-04 16:44:07 -08:00
495e4fe4f7
Merge branch 'release/2.2'
2018-12-04 16:03:47 -08:00
b0826ab179
Merge in 'release/2.1' changes
2018-12-04 23:31:58 +00:00
cd3f6e6283
Add Localization assemblies to sign config
2018-12-04 15:29:36 -08:00
1be2b427de
Merge branch 'release/2.1' into release/2.2
2018-12-04 14:23:24 -08:00
c7d6364900
Enable src/Components to build ( #4367 )
...
Fix aspnet/AspNetCore-Internal#1443
2018-12-03 16:38:28 -08:00
a6b5bb16fd
Merge source code from aspnet/Identity
2018-12-03 15:54:12 -08:00
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
80ae51ead8
Rename Json protocol to NewtonsoftJson ( #4319 )
2018-12-03 08:59:44 -08:00
36c482af6f
Merge in 'release/2.2' changes
2018-12-01 01:54:37 +00:00
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
7078102961
Update targets and projects to build Localization projects
2018-11-30 15:13:05 -08:00
04fc8ae493
Update targets and projects to build BasicMiddleware projects
2018-11-30 14:44:17 -08:00
6faf720363
Merge in 'release/2.2' changes
2018-11-30 21:40:30 +00:00
054cfac97e
Add EntityFrameworkCore to the list of submodules patching in 2.2.1 ( #4341 )
2018-11-30 13:39:28 -08:00
9e73c3382f
Mark Microsoft.Owin.Security.Interop as noship in 3.0
2018-11-29 12:48:27 -08:00
cdb9d0bc68
Prepare to patch WebSockets
2018-11-29 10:55:57 -08:00
2720c28047
Prepare to patch WebSockets
2018-11-29 10:39:29 -08:00
78c0813631
Set Microsoft.Owin.Security.Interop to 'noship' for 2.2 ( #4314 )[ci skip]
2018-11-29 08:44:39 -08:00
26dfce1f3c
Disable building src/Components and fix its code signing configuration ( #4299 )
2018-11-28 15:29:25 -08:00
321327f84b
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-28 12:28:04 -08:00
47d6329f67
Fix Razor RootPath
2018-11-27 16:57:06 -08:00
fa1af0e5a5
Merge remote-tracking branch 'origin/release/2.2' into rybrande/MondoMaster
2018-11-27 15:04:40 -08:00
6603195a10
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-27 11:57:39 -08:00
d025e4e0ad
Fix submodules for Mvc MvcPrecompilation Razor and SignalR
2018-11-27 11:02:50 -08:00
1b7fe76382
Add missing package source for external Components packages
2018-11-27 17:57:04 +00:00
16c11b4c87
Integrate src/Components into mondorepo build system
2018-11-27 17:17:34 +00:00
291e743c9c
Remove duplicate order
2018-11-26 14:48:05 -08:00
f57bed87ee
Avoid build order changes
...
Co-Authored-By: ryanbrandenburg <rybrande@microsoft.com>
2018-11-26 14:45:22 -08:00
e60e74e2bb
Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster
2018-11-26 12:32:17 -08:00
c88c1f96f4
KestrelHttpServer/#3101 Remove empty Microsoft.AspNetCore.Server.Kestrel.Https assembly
2018-11-26 10:03:03 -08:00
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
a5d06f35b1
Remove Roslyn from the shared framework ( #4225 )
...
Reacting to aspnet/Mvc#8755
2018-11-22 12:56:34 -08:00
6c60e0260c
Merge branch 'master' from aspnet/Diagnostics
2018-11-21 16:38:27 -08:00
Ajay Bhargav Baaskaran
dotnet-bot
John Luo
Justin Kotalik
Nate McMaster
Nate McMaster
Ajay Bhargav Baaskaran
Pavel Krymets
dotnet-maestro-bot
Steve Sanderson
John Luo
James Newton-King
Nate McMaster
Chris Ross
Ryan Nowak
BrennanConroy
Ryan Brandenburg
Chris Ross (ASP.NET)