Commit Graph

52 Commits

Author SHA1 Message Date
Nate McMaster def3dc0f2b
Merge branch 'release/2.2' 2018-11-30 11:15:26 -08:00
Nate McMaster 8b48191120
Ensure static analysis gets the right package versions when patching a package 2018-11-28 16:46:05 -08:00
Nate McMaster b38f936f31
Ensure Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets is included in 2.2.1 (#4308) 2018-11-28 16:04:59 -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 6c60e0260c
Merge branch 'master' from aspnet/Diagnostics 2018-11-21 16:38:27 -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
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -08:00
Nate McMaster 6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo 2018-11-21 14:23:55 -08:00
Nate McMaster 3318d0c7f9
Temporarily add a signcheck exclusion to unblock aspnet builds (#4170)
Workaround dotnet/core-setup#4797
2018-11-20 15:08:46 -08:00
Nate McMaster 425c196cba
Merge the master branch of aspnet/Hosting 2018-11-20 09:59:15 -08:00
Nate McMaster 294b5f2928
Merge branch 'release/2.2' 2018-11-20 09:47:59 -08:00
Nate McMaster bfba741326
Merge aspnet/Hosting release/2.2 2018-11-20 09:35:34 -08:00
Nate McMaster 0f64aa5c01
Merge aspnet/HttpAbstractions release/2.2 2018-11-20 09:15:59 -08:00
Nate McMaster feb68c1382
Merge branch 'release/2.1' into release/2.2 2018-11-20 09:13:55 -08:00
Nate McMaster 05b8745172
Remove aspnet/Hosting submodule and update targets and projects 2018-11-19 22:25:43 -08:00
Nate McMaster 4fcc8b9902
Update targets to build HttpAbstractions projects 2018-11-19 21:34:26 -08:00
Nate McMaster 0e12274a8e
Flatten the dependency graph of Microsoft.AspNetCore.App (#4061)
This changes the way Microsoft.AspNetCore.App works to follow patterns set by Microsoft.NETCore.App. Instead of being a metapackage with dozens of dependencies, this package has no dependencies. It uses RID-splitting to deliver standalone assets for self-contained deployments.

Changes:
* Implements RID-split packages for Microsoft.AspNetCore.App.
* Update shared fx deps.json generation to only include entries for the RID-specific metapackages
* Include platform-specific packages in publish output
* Remove all nuspec dependencies of Microsoft.AspNetCore.App and collect all references into the package.
2018-11-16 15:16:15 -08:00
Nate McMaster 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
Nate McMaster 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
Nate McMaster 3346efc471
Include shfxproj symbols packages in artifact info metadata 2018-11-14 22:55:09 -08:00
Nate McMaster b7a24492b0
Implement a custom GetArtifactInfo target for shfxproj files 2018-11-14 22:46:53 -08:00
Nate McMaster 0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1 2018-11-14 21:33:33 -08:00
Nate McMaster f1e60a8083
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in a24b4ee459
2018-11-14 18:16:17 -08:00
Nate McMaster 0782a9dfa9
Merge aspnet/DotNetTools release/2.2 2018-11-14 14:12:52 -08:00
Nate McMaster 401fd68985
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d745b8c161
2018-11-14 14:10:28 -08:00
Nate McMaster 27acef3d46
Merge branch 'release/2.1' into release/2.2 2018-11-14 14:01:43 -08:00
Nate McMaster 0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages 2018-11-14 11:21:15 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster 87092a2590
Update targets and infrastructure for dotnet-watch et. al. 2018-11-13 15:58:22 -08:00
Nate McMaster b3ad3aa989
Merge source code from aspnet/DotNetTools into this repo 2018-11-13 15:37:55 -08:00
Nate McMaster a2d855406b
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in eba014d534
2018-11-13 15:36:38 -08:00
Nate McMaster ccd098ecad
Update DataProtection to use custom reference resolution
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
Nate McMaster bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo 2018-11-13 09:29:27 -08:00
Nate McMaster 0a44f1c068
Merge branch 'release/2.1' into namc/mondo 2018-11-09 13:11:09 -08:00
Nate McMaster 59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds 2018-11-09 13:05:31 -08:00
Justin Kotalik 8356baf7a6
Port ANCM installer changes to 2.1 (#3874) 2018-11-09 11:10:33 -08:00
Nate McMaster bd5bf34351
Merge branch 'release/2.2' 2018-11-09 07:29:37 -08:00
Nate McMaster 7f4d10775c
Add signcheck exclusions (#3985) 2018-11-08 16:57:07 -08:00
Pavel Krymets 89a3526769
Move runtime site extension to installers (#3954) 2018-11-08 14:13:07 -08:00
Nate McMaster cb85ffa8f6
Merge branch 'release/2.2' 2018-11-02 10:10:49 -07:00
Nate McMaster 27deb6f6f8
Remove dependency on Docker from MSBuild targets (#3866)
Changes:
* This removes MSBuild targets which invoke `docker` commands to build
   deb and rpm installers
* Remove installer targets from the KoreBuild context. Put them into
   separate project files
* Simplify the targets used to build installers by reducing duplicate
   variable names and deeply nested MSBuild contexts
* Remove unused dependencies from the Docker build context
2018-11-01 15:02:29 -07:00
Nate McMaster 0ba800841b
Ensure build output is still present when crossgen is disabled
* Split targets for copying outputs and preparing the crossgen tool
* Fix version override check by only looking at the 'pinned' section
2018-10-26 16:00:48 -07:00
Nate McMaster 77a3089c8d
Workaround quirks in NuGet
* Disable package analysis because it incorrectly issues NU5109 on macOS, but not windows
* Normalize file paths because if you mix slashes, NuGet will just skip the entire folder
* Normalize the project path given to restore. If it not normalized, restore skips the project and issues a warning
2018-10-25 14:27:46 -07:00
Nate McMaster 968df9578b
Refactor shared framework projects targets and project layout (#3703)
This refactors the targets used to build the shared framework and its .zip files. There are lots of reasons motivating this: Arcade convergence, migration to VSTS, making it easier to build this locally, etc.

Changes:
* Moves move content of build/Sharedfx.{props/targets} into eng/targets/SharedFx.Common.{props/targets}
* Update the build to produce a `runtime.$rid.Microsoft.AspNetCore.App` package (not just the one with symbols in it)
* Refactor the targets which produce .tar.gz/.zip files into separate projects in `src/Installers/`
* Refactor installers, unit tests, and the framework projects to use ProjectReference to flow dependencies between different parts of the build.
* Makes it easier to build the shared framework locally (for the inner dev loop, you can run `dotnet build -p src/Framework/Microsoft.AspNetCore.App/src/ -r win-x64`)
2018-10-24 15:42:06 -07:00
Justin Kotalik 92baa4a75b
Cleanup ANCM installers/ Sign AspNetCore custom action (#1499) (#1502) 2018-10-15 17:46:36 -07:00
Nate McMaster fb3f5d95c2
Backport infrastructure changes and source reorganization
* Add build definition for Azure DevOps
* Put code for metapackages in a subfolder
* Update targets to prepare for submodules merging into this repo
* Add source code for windows installer
* Add source code for Debian installers
2018-10-12 13:59:43 -07:00
Nate McMaster c9747bcf6b
Use Microsoft400 for code signing CAB, MSI, and installer bundles (#1433) 2018-09-27 12:58:41 -07:00
Nate McMaster db1e4cf3d4
Use Microsoft400 for installers signing, not 401 (#1426)
400 only uses a SHA2 cert instead of dual signing.
2018-09-27 10:39:18 -07:00
Nate McMaster 06568d990b
Set the signing cert for .msi files to the 'Microsoft' certificate 2018-09-06 16:30:03 -07:00