Commit Graph

54 Commits

Author SHA1 Message Date
Justin Kotalik 42d3289662 Merge branch 'release/2.2' into jkotalik/masterMerge 2019-01-17 08:31:41 -08:00
Justin Kotalik 5b56de94fd
Allow disabling shared configuration check from hosting bundle. (#6498) 2019-01-16 12:04:36 -08:00
Pavel Krymets 6699fd056e
Add FilesToSign to all .cpp projects (#6443) 2019-01-07 10:05:12 -08:00
Nate McMaster dc206b747e
Ensure shared framework metadata files are generated on build (#6407) 2019-01-07 07:38:24 -08:00
Pavel Krymets 47e8d56853
Use ProjectReference.TargetPath in installers (#6391) 2019-01-04 16:01:49 -08:00
Pavel Krymets 143a727113
Remove AspNetCoreModule virtual projects (#6317) 2019-01-04 09:40:40 -08:00
Justin Kotalik 2b7a3a222a Build Windows Installers using the repo's main build script and repotasks (#6139)
Follow-up to #6078

This should solve race conditions in restoring .wixproj files.

Co-authored-by: Nate McMaster <natemcmaster@users.noreply.github.com>
Co-authored-by: Justin Kotalik <jkotalik@users.noreply.github.com>
2018-12-31 10:54:15 -08:00
Justin Kotalik e8d898dcd9 Merge branch 'release/2.2' 2018-12-26 14:21:28 -08:00
Nate McMaster f4bb260444
Merge branch release/2.1 into release/2.2 2018-12-21 13:24:33 -08:00
Nate McMaster 354c636498
Update Windows installer projects to use ProjectReference (#6078)
Changes:
* Build installer projects in parallel.
* Use `ProjectReference` to ferry bits between installer projects.
* Don't build wixproj to a unified output directory. This was only done to simplify finding file paths to MSI's built by other projects, but ProjectRef solves that.
* Add a VS solution for working on wixproj and the associated C++ custom actions.
   * To make wixproj work in VS, I replaced default globs with listing .wxs and .wxl files in the wixproj file.
* Add a target to copy the installers to the artifacts directory according to the layout described in /docs/Artifacts.md
2018-12-21 09:44:31 -08:00
Justin Kotalik 80bb14c3ef
Change build components to C++ Win10 17134 SDK (#4603) 2018-12-21 00:11:06 -08:00
Nate McMaster 92b40a4dbc
Restore accidental deletion of common.psm1 2018-12-20 17:34:06 -08:00
Pavel Krymets 55b8818540
Move logging site extension (#4005) 2018-12-19 09:35:06 -08:00
Nate McMaster 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
Pavel Krymets f077da5a8b
Add shared runtime items in a target (#4297) 2018-11-28 13:41:32 -08:00
Pavel Krymets 5116838807
Change package path to a directory (#4269) 2018-11-27 15:35:59 -08:00
Justin Kotalik 95d8b39e96
Revert "Target right version of ANCM nuget package (#4194)" (#4262) 2018-11-27 11:45:08 -08:00
Justin Kotalik 4d856dd279
Revert "Target right version of ANCM nuget package (#4194)" (#4261) 2018-11-27 11:44:47 -08:00
Ryan Brandenburg e60e74e2bb Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-26 12:32:17 -08:00
Ryan Brandenburg 1ee4e2b936 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-21 16:33:42 -08:00
Justin Kotalik 89330075b4
Target right version of ANCM nuget package (#4194) 2018-11-21 15:42:55 -08:00
Nate McMaster 0cbfa9ce6d
Update branding to 3.0.0-preview (#4171)
Changes:
* This uses date-based versioning
* Builds are `3.0.0-preview-$(buildnumber)`, not alpha1 or preview1.
2018-11-20 19:47:12 -08:00
Jacques Eloff 5a446ecc53
Merge pull request #4165 from aspnet/joeloff/SharedInstall
#3697 - override default install location
2018-11-20 13:41:08 -08:00
Jacques Eloff 07c3931758 #3697 - override default install location 2018-11-20 12:02:03 -08:00
Nate McMaster 71ca1faa6b
React to MSBuild breaking changes and remove ProdCon v1 variables (#4161)
This should unblock the consumption of the latest .NET Core SDK, which includes breaking changes in MSBuild. We don't _really_ need the MSBuild APIs which were broken because ProdCon v1 is dead. This removes the unused ProdCon v1 tasks and targets.
2018-11-20 11:34:53 -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 c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Justin Kotalik de9609b343
Remove implicit reference to InteralAspNetCoreSdk (#3998) 2018-11-12 09:05:17 -08:00
Justin Kotalik 8356baf7a6
Port ANCM installer changes to 2.1 (#3874) 2018-11-09 11:10:33 -08:00
Pavel Krymets 89a3526769
Move runtime site extension to installers (#3954) 2018-11-08 14:13:07 -08:00
Nate McMaster 416d8cd1ea
Merge branch 'release/2.2' 2018-11-08 08:48:35 -08:00
Justin Kotalik 263fb650be
Detect shared configuration in ANCM installers and fail if enabled (#3962) 2018-11-07 13:19:27 -08:00
John Luo 5488932e31 Merge branch 'release/2.2' 2018-11-06 14:04:45 -08:00
John Luo 7ef549416f Add prerelease label to deb installer package version 2018-11-06 14:02:48 -08:00
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 4f887e5cd4
Merge branch 'release/2.1' into release/2.2 2018-11-06 09:23:17 -08:00
Nate McMaster 17cccade43
Add IsFinalBuild switch to Windows installer script (#3892) 2018-11-06 09:06:10 -08:00
Nate McMaster cb85ffa8f6
Merge branch 'release/2.2' 2018-11-02 10:10:49 -07:00
Nate McMaster 303ee1ff56
Fix the filename for the debian installer 2018-11-01 22:50:58 -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 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 6dc4673881
Revert restarting was when installing ANCM (#3662) 2018-10-17 22:44:41 -07:00
Justin Kotalik b951ac9b64
Fix path to aspnetcoreca.dll for signed output (#1513) 2018-10-16 15:55:15 -07:00
Justin Kotalik 92baa4a75b
Cleanup ANCM installers/ Sign AspNetCore custom action (#1499) (#1502) 2018-10-15 17:46:36 -07:00
Nate McMaster c37a332a6a
Merge branch 'release/2.1' into release/2.2 2018-10-12 16:56:47 -07:00
Justin Kotalik dbc1d38a58
Move ANCM installers to Universe (#1456) 2018-10-12 14:32:12 -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 f2691ee4b6
Add a copy of scripts from dotnet-deb-tool 2.0.0 to this repo (#1442)
We currently build .deb files using dotnet-deb-tool, which comes from a package feed. We're not completely sure where the source code is for this tool, so this moves the scripts from the dotnet-deb-tool 2.0.0 package into this repo for safe keeping.
2018-10-02 14:32:12 -07:00