Commit Graph

2123 Commits

Author SHA1 Message Date
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
Nate McMaster 4c8db32b1c
Don't restore npmproj files in parallel (#6560)
NPM does not handle this well, so only run one NPM command at a time
2019-01-10 08:21:26 -08:00
Nate McMaster 22f3166fa6
Merge branch 'release/2.1' into release/2.2 2019-01-10 01:22:10 -08:00
John Luo e5d943a7e3
Convert MvcPrecomp to Reference (#6472)
* Convert MvcPrecomp to use Reference and move to MVC
2019-01-09 18:48:01 -08:00
Nate McMaster a3f9b74bb9
Merge branch 'release/2.1' into release/2.2 2019-01-09 14:52:53 -08:00
Nate McMaster d3838620d6
Convert SignalR projects to build with ProjectReference (#6457)
Part of #4246 

Changes:
* Update source code layout to follow the new conventions for this repo
* Update project files to use `<Reference>`
* Update targets to build NPM packages
* Update BuildTools to support custom 'restore' and 'test' targets
2019-01-09 13:12:35 -08:00
Nate McMaster 5d16f97965
Remove netcoreapp2.0 test TFMs (#6461)
.NET Core 2.0 reached EOL last year. This removes multi-targeting our test projects and test assets to only use .NET Core 2.1 and .NET Framework 4.6.1.
2019-01-08 11:20:09 -08:00
dotnet-bot c06eec1e8f Merge in 'release/2.2' changes 2019-01-07 21:31:03 +00:00
Justin Kotalik 2e67864995 Merge branch 'release/2.1' into release/2.2 2019-01-07 10:27:41 -08:00
dotnet-bot 973b4b2fbf Merge in 'release/2.1' changes 2019-01-07 17:35:10 +00:00
Justin Kotalik 375e9d2cbd
Make music store project ref (#6313) 2019-01-07 09:34:05 -08:00
dotnet-bot 590fe38284 Merge in 'release/2.2' changes 2019-01-04 22:20:08 +00:00
Nate McMaster 9556cc133d
Merge branch 'release/2.1' into release/2.2 2019-01-04 14:17:28 -08:00
dotnet-bot da77274259 Merge in 'release/2.1' changes 2019-01-04 18:01:45 +00:00
Nate McMaster 436076fd55
Fix broken tests and VS solutions caused by source code reorganization and other build infra cleanup
Changes:
* Fix broken tests and VS solutions caused by source code reorganization
* Add a check to validate generated code and solutions on PRs
* backport some source code reorg to src/Identity
* Fix startvs.cmd if you've already run build.ps1
* Add PR checks for tests on Linux/macOS
* Skip broken Nginx tests
* Add conditions to skip IIS tests on non-Windows platforms
2019-01-04 10:00:26 -08:00
dotnet-bot 291b346201 Merge in 'release/2.2' changes 2019-01-03 00:55:40 +00:00
Nate McMaster 65ff6e951a
Merge branch release/2.1 into release/2.2 2019-01-02 14:34:45 -08:00
dotnet-bot df29851149 Merge in 'release/2.2' changes 2019-01-02 19:20:51 +00:00
Nate McMaster 7e38b563bd
Merge branch 'release/2.1' to release/2.2 2019-01-02 10:29:38 -08:00
dotnet-bot e3f86f3631 Merge in 'release/2.2' changes 2019-01-02 17:58:35 +00:00
dotnet-bot 47d2a6722c Merge in 'release/2.1' changes 2019-01-02 17:57:44 +00:00
Nate McMaster d66537c7d1
Convert Azure hosting startup and integration projects to use ProjectRef (#6207) 2019-01-02 09:56:39 -08:00