Commit Graph

52 Commits

Author SHA1 Message Date
Nate McMaster 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
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
= 35f876e190 Merge branch 'release/2.2' 2018-11-16 00:32:36 -08:00
Pavel Krymets 09e5daa037
Update schema before running tests (#4030) 2018-11-15 08:13:20 -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
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 fcb970ec83
Upgrade to EF Core 3.0.0-preview-181109-02 2018-11-09 14:33:52 -08:00
Nate McMaster 1c8df01d09
Update PR validation to fix the FastCheck config and IIS tests 2018-11-09 14:09:09 -08:00
Nate McMaster 979f72a839
Update PR validation to run a real build 2018-11-09 13:08:02 -08:00
Nate McMaster bd5bf34351
Merge branch 'release/2.2' 2018-11-09 07:29:37 -08:00
Nate McMaster db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects (#3987) 2018-11-08 23:40:14 -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
Justin Kotalik c5e7bd244d Merge branch 'release/2.2' 2018-11-05 09:10:29 -08:00
Justin Kotalik 90b11de8f1
Get IISIntegration CI working (#3875) 2018-11-05 08:45:11 -08:00
John Luo d36a480253 Build and crossgen linux-arm shared framework in Docker container 2018-11-02 15:14:19 -07:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07: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 5e4166f940
Merge branch 'release/2.2' 2018-10-29 16:05:19 -07:00
John Luo a058bc0c0a Win-arm shared framework 2018-10-29 12:54:38 -07:00
Pavel Krymets 134bd90888
Filter paths in SiteExtension trigger (#3747) 2018-10-29 10:59:37 -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
Nate McMaster 43792f20b2
Merge branch 'release/2.2' 2018-10-24 12:45:15 -07:00
Pavel Krymets 935df249c4
Shorten siteextension version to fit into 20 chars (#3707) 2018-10-23 16:27:23 -07:00
Nate McMaster dc37a2c23d
Merge branch 'release/2.2' 2018-10-19 14:11:58 -07:00
Pavel Krymets d3216a66c1
Create a build configuraition to build OOB logging site extension package (#3643) 2018-10-19 12:19:33 -07:00
Nate McMaster 6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch 2018-10-17 16:06:14 -07:00
Nate McMaster d991c50c82
Merge release/2.1 and aspnet/WebSockets release/2.2 2018-10-17 15:47:04 -07:00
Nate McMaster b1427c759b
Remove the WebSockets submodule 2018-10-17 14:53:22 -07:00
Nate McMaster c2e4a74f7d
React to renaming this repo from Universe to AspNetCore 2018-10-17 10:24:18 -07:00
Nate McMaster a35226131a
Merge branch release/2.2 2018-10-16 12:02:18 -07:00
Nate McMaster 489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo 2018-10-15 10:21:02 -07:00
Nate McMaster a673bfd741
Add build script and CI config for the DataProtection folder 2018-10-15 10:13:04 -07:00
Nate McMaster 24d13700d7
Merge branch 'release/2.2' 2018-10-12 17:56:10 -07:00
Nate McMaster c37a332a6a
Merge branch 'release/2.1' into release/2.2 2018-10-12 16:56:47 -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
Mike Harder 991526bbc9
Merge pull request #1449 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-03 13:57:50 -07:00
Mike Harder 51491de90b
Enable Node10 for macOS (#1448) 2018-10-03 12:56:07 -07:00
Mike Harder e2a0746663 Merge branch 'merge/release/2.2-to-master' 2018-10-03 12:05:53 -07:00
Mike Harder 79ccb2b90d Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 2018-10-03 11:15:18 -07:00
Mike Harder 9c37082a74
Add Linux, Node8, and Node10 to test matrix (#1445)
- Test both Node8 and Node10 on Windows and Linux
- Only test Node8 on MacOS, since the ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS
  - https://github.com/aspnet/Templating/issues/608
- Move Windows build to "Hosted VS2017" pool which has more agents
  - We would rather use the "Hosted" pool, but "npm restore" currently fails on agents in this pool
- Remove "Preview" from Mac pool name
2018-10-03 11:02:59 -07:00
Nate McMaster 7c0bad4cef
Merge branch 'release/2.2' 2018-09-27 13:00:01 -07:00
Mike Harder cf204df326
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2018-09-27 12:24:12 -07:00
Mike Harder e8d3321025
Add AdditionalRestoreSources parameter to Cli.FunctionalTests (#1429)
- Required for builds which need to restore from multiple feeds
2018-09-27 12:17:14 -07:00
Nate McMaster 3dc53456e2
Merge branch 'release/2.2' 2018-09-26 11:10:00 -07:00
Nate McMaster 02dac71f64
Move e2e-tests.yml into the right folder 2018-09-26 10:58:07 -07:00
Nate McMaster 90ed3bde5e
Add more logging for E2E tests
Trying to diagnose why ProdCon fails to download metadata
2018-09-26 09:42:18 -07:00
Nate McMaster 1bf8e3985f
Merge branch 'release/2.2' 2018-09-25 10:25:03 -07:00