huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,899 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

2144 Commits

Author SHA1 Message Date
dotnet-bot 1435be9c02 Merge in 'release/2.2' changes 2019-05-07 08:18:32 +00:00
John Luo 6e691e9f20
Use nuget release of netfx ref package (#10024) 2019-05-07 01:17:14 -07:00
dotnet-bot 33c2d01092 Merge in 'release/2.2' changes 2019-04-19 22:58:25 +00:00
Doug Bunting e22a7d1b97 Unpin the Microsoft.Extensions.Diagnostics.HealthChecks package version 
- aspnet/AspNetCore-Internal#2337
 2019-04-19 15:57:11 -07:00
dotnet-bot a88706c89a Merge in 'release/2.2' changes 2019-04-16 21:49:02 +00:00
Nate McMaster dd655bcc9a
Merge branch 'release/2.1' into release/2.2 2019-04-16 14:13:01 -07:00
Nate McMaster 2a99b8608d
Merge changes from 'release/2.2' 2019-04-16 11:57:15 -07:00
Matt Mitchell 860071e31c Pin System.Net.WinHttpHandler (#9427) 2019-04-16 11:54:06 -07:00
Matt Mitchell 180554e732 Unpin System.Memory (#9425) 2019-04-16 10:12:10 -07:00
BrennanConroy d93b207485 Add Site Extension to patch (#9336) 
- make build.cmd work
- update build/repo.props

Co-Authored-By: BrennanConroy <brecon@microsoft.com>
 2019-04-15 22:21:27 -07:00
Nate McMaster d004cf0f14
Merge branch 'release/2.1' into release/2.2 2019-04-15 16:42:07 -07:00
Brice Lambson dad3703d1b [2.1] Include EntityFrameworkCore in the 2.1.11 patch (#9397) 2019-04-15 16:08:43 -07:00
dotnet-bot 05f07e2df2 Merge in 'release/2.2' changes 2019-04-15 22:20:57 +00:00
Nate McMaster 79e98dd169
Update dependency version of Extensions.Binder to avoid downgrading sharedfx versions from 2.1.10 (#9393) 2019-04-15 15:19:40 -07:00
Nate McMaster 5b65cbfadc
Fix aspnet/AspNetCore-Internal#2269 - fix for missing dependency metadata on a few Extensions packages when building in ProdCon (#9387) 2019-04-15 15:19:27 -07:00
dotnet-bot 5cc0e7f69c Merge in 'release/2.2' changes 2019-04-15 16:22:05 +00:00
Matt Mitchell bfcbc4fd26 Unpin 2 packages (#9380) 
- Microsoft.Extensions.Logging.Azure.AppServices
- System.Data.SqlClient
 2019-04-15 09:20:34 -07:00
Brennan Conroy 4332a25c43 Update Redis dependency 2019-04-15 15:49:37 +00:00
Brennan Conroy 6ecdff7c68 Merged PR 898: Update MessagePack dependency 
Update MessagePack dependency
 2019-04-12 22:25:38 +00:00
Pranav K 5424045dac Ensure PackageArchive contains the right build of Razor.Design package (#6992) 
* Ensure PackageArchive contains the right build of Razor.Design package

* Re-order values in build\dependencies.props to ensure Razor.Design's package version is
  overwritten.
* Convert additional package refs to project refs

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/1708

* Update CodeCheck.ps1
 2019-04-11 17:14:11 -07:00
Doug Bunting c53bd798c4 Update branding to 2.1.11 
- no ArchiveBaseline.*.txt additions necessary
 2019-04-10 08:59:44 -07:00
Doug Bunting 46fac99de5 Update branding to 2.2.5 
- no ArchiveBaseline.*.txt additions necessary
 2019-04-10 08:59:29 -07:00
John Luo de5310e886 Update build tools (#8528) 
* update build tools' aka KoreBuild aka Internal SDK versions
* update EF submodule
* fix submodule builds with trimming
  - path must not contain trailing slashes apparently
* bump Microsoft.NETFramework.ReferenceAssemblies package version to align with KoreBuild
 2019-03-18 14:49:15 -07:00
Doug Bunting 909d951caf Unpin 3 Microsoft.Extensions.Configuration packages 
- shipping in this release
 2019-03-15 17:31:59 -07:00
Doug Bunting 73f288bcb6
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-03-15 14:25:55 -07:00
Doug Bunting 2a2809afe4 Unpin Microsoft.Extensions.Configuration.Binder package 
- included in this release
 2019-03-15 13:28:14 -07:00
Matt Mitchell 7c732d55f6 Pin System.Net.Http package version 2019-03-15 08:11:22 -07:00
Doug Bunting 4941c7b90d Unpin the System.Net.Http.WinHttpHandler package version 
- CoreFx shipping a new version
 2019-03-14 11:57:12 -07:00
Doug Bunting e7c5e09ad2 Unpin our System.Net.Http package version 
- shipped in the past patch
 2019-03-08 10:19:17 -08:00
Doug Bunting 4cbc33da74 Update branding to 2.2.4 2019-03-07 11:53:17 -08:00
Doug Bunting e497f4101f
Update branding to 2.1.10 (#8265) 2019-03-06 19:45:46 -08:00
Doug Bunting 2764ac66b0
Undo "Restore Microsoft.VisualStudio.Web.CodeGeneration.Design references in templates" 
- not intended for `release/2.1` without a PR!

This reverts commit 4ed02ebc5c
 2019-02-22 11:00:26 -08:00
Doug Bunting 4ed02ebc5c
Restore Microsoft.VisualStudio.Web.CodeGeneration.Design references in templates 
- revert part of "Remove aspnet/Scaffolding submodule (#7166)"
- that was commit bb8c6fcd46
 2019-02-22 10:58:53 -08:00
Pavel Krymets 55bedc1cf9 Don't build site extensions 2019-02-13 23:15:58 -08:00
Doug Bunting d102d10a81 Update branding to 2.2.3 
- new version
- update baselines
- grab latest released Microsoft.NetCore.App and Microsoft.NETCore.DotNetAppHost

nit:
- updated ZipManifestGenerator's README.md to use 2.2 examples
 2019-02-13 23:15:58 -08:00
Doug Bunting 5bb5bafbed Update branding to 2.1.9 2019-02-12 19:12:20 -08:00
BrennanConroy 2365dced43
Fix flaky process output reading for dotnet-watch tests (#7173) 2019-02-08 14:37:53 -08:00
Doug Bunting 2ff4dd5b7e
Merge branch 'release/2.1' into merge 2019-02-01 14:49:05 -08:00
Doug Bunting bb8c6fcd46
Remove aspnet/Scaffolding submodule (#7166) 
- aspnet/AspNetCore-Internal#1341
- remove Scaffolding references from `build/artifacts.props`, `build/buildorder.props`, `build/submodules.props`, and our templates
- add versions for these packages in `build/dependencies.props` to enable their inclusion in the package archives
 2019-02-01 10:15:49 -08:00
Pavel Krymets 829cd7271e
Fix signing for 2.2 site extensions (#6777) 2019-01-17 10:42:58 -08:00
Pavel Krymets f44c175ec6
Enable logging branch SiteExtension (#6715) 2019-01-16 08:56:12 -08:00
Justin Kotalik eacffd56b7 Merge branch 'release/2.1' into release/2.2 2019-01-15 16:37:34 -08:00
Nate McMaster fe20f9240d Fix #3503 - update buildtools dependency on DependencyModel to 2.1.0 
The 2.0 version of the Microsoft.Extensions.DependencyModel does not
support the assembly/file version metadata. We must have at least 2.1.

Between 2.1.6 and 2.1.7, we switched the build to use MSBuild.exe
("full" MSBuild) instead of `dotnet msbuild` ("core" MSBuild). MSBuild
has different assembly loaders behaviors in core vs full. By switching
MSBuild types, we were also unintentionally switching the version of
Microsoft.Extensions.DependencyModel.dll that was being used by our build
 task from 2.1 back down to 2.0.

The reason we didn't discover this in earlier 2.1.x patches is that
building on msbuild core automatically upgraded our build tasks to
Microsoft.Extensions.DependencyModel.dll, Version=2.1.0.0. This happens
because of differences in the way .NET Core and MSBuild handles
assemblies with the same ID and different versions, and differences in
the layout of MSBuild and the .NET Core CLI.

In the end, this happened because we didn't have test coverage. MSBuild
and custom tasks burned asagain, but we should have just had unit tests
all along, which would have uncovered this regression as soon as we
switched to msbuild.exe.
 2019-01-15 13:39:01 -08:00
Justin Kotalik e751db0739
Make Auth Samples Project Ref (#6557) 2019-01-15 13:12:54 -08:00
John Luo 8f1eedf5a9 Merge branch 'release/2.1' into release/2.2 2019-01-14 19:04:39 -08:00
John Luo 90a9fa7aac Merge branch 'release/2.1' into release/2.2 2019-01-14 12:57:34 -08:00
Mikael Mengistu 5e825f4fd8
Update the package baseline (#6614) 2019-01-14 12:21:45 -08:00
Doug Bunting 970bced25c
Update branding to 2.2.2 (#6608) 
- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
 2019-01-14 11:40:01 -08:00
Pavel Krymets 8aa8c6b2b0
Build branch logging SE in main build (#6312) 2019-01-14 08:42:53 -08:00
Mikael Mengistu abfdb433f2
Update submodules.props (#6586) 
* Update submodules.props

* Update EF submodule
 2019-01-11 09:59:03 -08:00