02780bac26
Merge branch 'release/2.2'
2018-12-14 16:03:16 -08:00
feb641ddda
Merge branch 'release/2.1' into release/2.2
2018-12-14 09:44:15 -08: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
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
569a14ecb8
Merge branch 'release/2.1' into release/2.2
2018-12-06 17:09:03 -08: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
62f9655a2f
Merge branch 'release/2.2'
2018-12-05 08:54:38 -08:00
736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder ( #4335 )
2018-12-04 16:44:07 -08:00
1be2b427de
Merge branch 'release/2.1' into release/2.2
2018-12-04 14:23:24 -08:00
7078102961
Update targets and projects to build Localization projects
2018-11-30 15:13:05 -08:00
006558c412
Merge branch 'release/2.2'
2018-11-21 16:28:33 -08:00
71b1bb8887
Merge branch 'release/2.1' into release/2.2
2018-11-21 14:57:45 -08:00
d5587f3c54
Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge
2018-11-20 15:42:00 -08:00
73b5d6d0e5
Remove the BrowserLink submodule ( #4087 )
2018-11-20 11:36:26 -08:00
294b5f2928
Merge branch 'release/2.2'
2018-11-20 09:47:59 -08:00
bfba741326
Merge aspnet/Hosting release/2.2
2018-11-20 09:35:34 -08:00
feb68c1382
Merge branch 'release/2.1' into release/2.2
2018-11-20 09:13:55 -08:00
3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency
2018-11-19 23:38:13 -08:00
7ccb8dbfe1
Account for the relocation of Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources
2018-11-19 22:50:46 -08:00
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -08:00
7c6bf7f75d
Merge branch 'release/2.2'
2018-11-19 21:00:19 -08:00
21b142b65d
Merge branch 'release/2.1' into release/2.2
2018-11-19 17:04:13 -08:00
4173f23e3e
Remove the HttpClientFactory submodule ( #4085 )
2018-11-19 12:05:39 -08:00
fd1a5b43f1
Generate PlatformManifest and package conflict overrides for Microsoft.AspNetCore.App ( #4072 )
...
This generates additional metadata for the .NET Core SDK to resolve conflicts between Microsoft.AspNetCore.App and PackageReferences which contain the same assemblies.
2018-11-16 16:36:14 -08:00
68cc5e7846
Merge release/2.2 and aspnet/KestrelHttpServer
...
* Merges latest changes from the master branch of aspnet/KestrelHttpServer
* Merges changes on release/2.2
2018-11-15 08:41:55 -08:00
6cc9f6f130
Merge release/2.2 and replace submodules
...
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08:00
0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1
2018-11-14 21:33:33 -08:00
51c9b7355d
Create Kestrel.sln, update documentation and README, and ensure all Kestrel test projects have the test logger installed
2018-11-14 13:14:47 -08:00
c1c7d711b6
Merge branch 'release/2.1' into release/2.2
2018-11-14 09:27:23 -08:00
bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo
2018-11-13 09:29:27 -08:00
a3baf40c74
Set dependency version on Microsoft.Extensions.DiagnosticAdapter to 2.1.0 and prune unused logging analyzers dependency
...
There was never a 2.1.1
2018-11-09 09:12:52 -08:00
34999a804e
Remove submodules for repos that merged to aspnet/Extensions ( #3671 )
...
Builds of the packages in aspnet/Extensions repo go through ProdCon instead of building as a submodule of this repo.
2018-11-09 08:48:42 -08:00
b75fa54ad2
Remove the EntityFrameworkCore submodule ( #3964 )
...
This removes EntityFrameworkCore as a git submodule. The EFCore repo will build on its own, and the AspNetCore repo will consume EFCore via PackageReference.
2018-11-07 14:00:19 -08:00
0e3260f2b4
Merge branch 'release/2.2'
2018-11-06 21:47:30 -08:00
302d8d59dd
Remove the aspnet/Caching submodule
2018-11-06 21:20:06 -08:00
011cf21a5c
Merge branch 'release/2.2'
2018-11-06 17:42:44 -08:00
3cf8a41e4a
Remove the aspnet/Logging submodule
2018-11-06 17:30:26 -08:00
e8aab7ae34
Merge branch 'release/2.2'
2018-11-06 12:36:51 -08:00
355c6d3a83
Remove the aspnet/Options submodule
2018-11-06 12:28:45 -08:00
df46dfee73
Merge branch 'release/2.2'
2018-11-06 12:13:05 -08:00
67c3a099ec
Remove the aspnet/Configuration submodule ( #3948 )
2018-11-06 12:04:36 -08:00
f8a1e14921
Merge branch 'release/2.2'
2018-11-05 16:35:20 -08:00
62b24f930e
Remove the aspnet/FileSystem submodule ( #3884 )
2018-11-05 14:19:19 -08:00
cb85ffa8f6
Merge branch 'release/2.2'
2018-11-02 10:10:49 -07:00
c92536a21a
Remove the DependencyInjection submodule
2018-11-02 09:58:20 -07:00
5abb3f1f57
Merge branch 'release/2.2'
2018-11-01 14:15:50 -07:00
57d52d392d
Add Microsoft.NETFramework.ReferenceAssemblies to list of external dependencies
2018-11-01 00:25:05 -07:00
18664f4e63
Remove old redis packages ( #3779 )
2018-10-31 15:43:07 -07:00
908a8b3013
Merge branch 'release/2.2'
2018-10-30 17:18:22 -07:00
eb79d8f75e
Remove the EventNotification submodule
2018-10-30 17:10:11 -07:00
Nate McMaster
Nate McMaster
Nate McMaster
Justin Kotalik
Ryan Brandenburg
BrennanConroy