Commit Graph

150 Commits

Author SHA1 Message Date
Jacques Eloff eebd61642f
Merge pull request #10296 from aspnet/joeloff/LocLink
Fix .wxl reference
2019-05-23 09:05:04 -07:00
Doug Bunting 5502c2080e Fix sign check
- most likely cause of failing official builds
- small typo in #10340: need to find .cab files _below_ `$(TargetDir)`
2019-05-18 19:00:04 -07:00
Jacques Eloff fa2cad3452 CopyCabs 2019-05-17 12:15:20 -07:00
John Luo 818dc3b74a
Update log directory (#10301)
* Update log directory

This will now include functional test logs

* There were a few more places logs was used instead of log
2019-05-17 09:02:34 -07:00
Nate McMaster 117dd8cff4
Use Arcade version suffixes for local (3.0.0-dev) and PR builds (3.0.0-ci) (#10279)
* Update versioning for local and PR builds to match Arcade versioning
* Mark CanCancelIAsyncEnumerableClientToServerUpload as flaky - cref aspnet/AspNetCore-Internal#2465
* Disable rollforward in project template tests (3.0.0-dev is older than 3.0.0-preview*). This prevents tests from rolling forward onto technically older bits
2019-05-16 12:59:40 -07:00
Jacques Eloff d83bb8efa2
Merge pull request #10241 from aspnet/joeloff/SetupAssets
Publish the shared framework MSI to artifacts
2019-05-16 10:56:38 -07:00
Jacques Eloff 75dcbf3f98 Fix .wxl reference 2019-05-16 10:32:37 -07:00
Nate McMaster dc90e11c7a
Move obj and bin directories into repo root (#10063)
The Arcade SDK requires that the obj/ and bin/ folders be placed in the top-level artifacts/ folder of the repo. Although this PR does not complete our Arcade convergence, this is a step towards updating our repo to build with the Arcade SDK.

Changes:
* Set output path for build to artifacts/bin/$(ProjectName)/ 
* Set intermediate output path for build to artifacts/obj/$(ProjectName)/
* Cleanup .gitignore files (remove duplication between repo-root and tested gitignore files)
* Add code check which looks for project files that share the same name (could cause issues)
* Rename project files to have unique names (avoid race condition of build output)
* Update all locations which were hard-coded to expect bin/ and obj/ in the project directory
* Add overrides for tests which still assert test binaries exist in a given location relative to the source code
2019-05-15 13:44:55 -07:00
Nate McMaster 77e08c26d5
Replace all usages of RepositoryRoot with RepoRoot (#10267)
Preparing to adopt the Arcade SDK, which uses the shorter variable name instead
2019-05-15 12:00:19 -07:00
Jacques Eloff 3282e6fe2d Publish the shared framework MSI to artifacts 2019-05-14 10:22:36 -07:00
Jacques Eloff fb495ad7ed Responding to feedback 2019-05-13 16:36:53 -07:00
Jacques Eloff d819851b3b Set Compressed=yes 2019-05-11 09:38:50 -07:00
Jacques Eloff 349ed16587 Add localized strings for bundles 2019-05-11 09:34:51 -07:00
Jacques Eloff da6a5a4cae Localization prep - move strings from theme.xml to theme.wxl 2019-05-01 14:53:27 -07:00
Justin Kotalik 08e12af57a
Update ANCM to output out of proc symbols (#9698) 2019-04-23 15:11:01 -07:00
Justin Kotalik cc2005c7d0
Use correct path to x86 installers to ANCM (#9646) 2019-04-22 16:51:30 -07:00
John Luo 7a040f310b
Enable Pubternal API checks (#9530)
* Enable Pubternal API checks

* Use pragma

* Convert to pragma

* Test fix

* Remove extra restore dependencies
2019-04-19 18:49:07 -07:00
Nate McMaster 485795ad3c
Revert ANCM installers to build with v141 C++ toolset (#9477) 2019-04-17 15:54:17 -07:00
Andrew Stanton-Nurse 01b0c888d2
Flow ANCM version number in the build output (#9269)
* Update IIS libraries to platform toolset v142

* Drop ancm version into a text file next to the installer

* feedback and try reverting removal of VC++ 141 tools to fix build
2019-04-17 08:09:07 -07:00
Doug Bunting a54646f9a5 Use default VC toolset (#9332) 2019-04-12 16:28:19 -07:00
Justin Kotalik 3b180691e1 Merge branch 'release/2.2' into merge/release/2.2-to-master 2019-04-12 08:42:55 -07:00
Justin Kotalik 7e1d545e29 Remove dependency on jscript in IISExpress installers (#8707)
* Add a .gitignore
2019-04-11 21:25:54 -07:00
Justin Kotalik 8d987241de
Produce Corresponding symbols in installer output for ANCM (#9262) 2019-04-11 08:24:32 -07:00
Justin Kotalik 212ba91a5c
Make IISExpress not depend on jscript. (#9212) 2019-04-09 13:11:03 -07:00
Justin Kotalik cacf9aa9f1
Fix folder version for global module to only have 3 numbers (#9211) 2019-04-09 12:47:27 -07:00
Jacques Eloff eb1ce947c5 Fix up property group, preprocessor statement 2019-03-19 11:50:13 -07:00
Jacques Eloff eb8ca48e77 Remove duplicate inputs 2019-03-19 11:50:12 -07:00
Jacques Eloff 2aabd9f847 Fix inputs for UpgradeCode 2019-03-19 11:50:11 -07:00
Jacques Eloff f87c75a90d Fix for #7729 to ensure upgradable bundles 2019-03-19 11:50:11 -07:00
Pavel Krymets 22623b905f
Add dependency from AspNetCore targeting pack to dotnet Core targeting pack (#8490)
Fixes https://github.com/aspnet/AspNetCore/issues/8284
2019-03-15 11:28:42 -07:00
Justin Kotalik c79b2413cc
Swap installer order (#8266) 2019-03-07 15:45:31 -08:00
Nate McMaster e7b00a5508
Deprecate the Microsoft.AspNetCore.App metapackage in favor of targeting and runtime packs (#7832)
* Deprecate the Microsoft.AspNetCore.App metapackage in favor of targeting and runtime packs
* Stop producing Microsoft.AspNetCore.App, and runtime.$(rid).Microsoft.AspNetCore.App
* Generate the shared framework without using 'NuGet' restore
* Stop producing intermediate packages for shared-framework only assemblies
* Put the platform manifest into the targeting pack (data/Microsoft.AspNetCore.App.PlatformManifest.txt)
* Create well-known, shared intermediate directories that installers can use to bundle content
2019-02-28 10:14:18 -08:00
Nate McMaster d2d60000eb
Create Linux installers for the aspnetcore targeting pack (#7776)
This creates 3 new build outputs:

* aspnetcore-targeting-pack-$(version).tar.gz
* aspnetcore-targeting-pack-$(version)-linux-x64.deb
* aspnetcore-targeting-pack-$(version)-linux-x64.rpm

Other changes:
* Make RPM packaging consistent with other installers. Vendor == Microsoft Corporation
* Add shared properties for building the targeting pack (or not building it in a servicing build)
2019-02-25 12:00:36 -08:00
Nate McMaster 9a2db43848
Follow-up to VS2019 conversion (#7753)
* Set VS version in file to 16.0.0.0
* Fix for restore failure on Microsoft.AspNetCore.App.Runtime.csproj
2019-02-20 11:02:38 -08:00
Nate McMaster 85ae18c723
Make Visual Studio 2019 a prerequisite to building this repo (#7005)
Changes:

* Make Visual Studio 2019 a prerequisite for building this repo
* Update .sln files
* Update Windows SDK to 17134
* Update developer docs
* Disable ANCM tests
* Update to .NET Core SDK 3.0 Preview 2
* Use Microsoft.NET.Sdk.Razor as a package consistently accross the repo
* React to changes in metadata from Microsoft.NETCore.App
* React to changes in .NET Core SDK
* Attempt to workaround CodeCheck.ps1 failure which doesn't repro locally or on different agents. Possibly due to differences in the version of the PowerShell task?
* Remove dead YML file
* Rename usages of win7-{x64,x86} to win-{x64,x86}
* Update KoreBuild to 3.0.0-build-20190219.1
2019-02-20 09:53:53 -08:00
Nate McMaster a9c358bbbd
Build MSI installers for targeting pack (#7726)
Part of #6501 

This adds a new Windows installer for the targeting pack. It places *.dll and *.xml (docs) in `[DOTNETHOME]\packs\Microsoft.AspNetCore.App.Ref\$(version)\ref\netcoreapp3.0`.

Outputs:
* aspnetcore-targeting-pack-$(version).zip
* aspnetcore-targeting-pack-$(version)-win-x64.exe (defaults to C:\Program Files\dotnet)
* aspnetcore-targeting-pack-$(version)-win-x86.exe (defaults to C:\Program Files (x86)\dotnet)

These all include the same files. These are meant to be bundled in the .NET Core SDK installer, but can be launched directly too.
2019-02-19 16:28:08 -08:00
Nate McMaster 6defaadb8b
Update location of obj/ and bin/ directories to match Arcade conventions (#7585) 2019-02-14 16:27:53 -08:00
Nate McMaster 2ac4619635
Replace custom targets for generating assembly attributes and source control info by using SDK features (#7504) 2019-02-13 10:22:03 -08:00
John Beisner 0970019ce7 Updating per code review... 2019-02-06 00:54:01 +00:00
John Beisner b7c341d228 Updating the DotNetLogo bitmaps' purple color to .Net core's latest branding. 2019-02-05 22:09:36 +00:00
Pavel Krymets 0605d162ee
Use SetPlatform in native project references (#7260)
May fix https://github.com/aspnet/AspNetCore/issues/7250 

We were double building native projects in x86 and win32 platforms
2019-02-05 09:15:25 -08:00
Nate McMaster 7ee3399ce2
Fix code-signing for xplat packages and Windows installers (#7191) 2019-02-01 10:52:00 -08:00
Nate McMaster 6081fec894
Add new build.cmd/sh options for suppressing restore, NodeJS, setting target arch and OS name, and more (#7137)
Add new command line parameters for working with the project:

* `-NoBuild`, `-NoRestore` - these already existed, but users found it hard to discover this powershell syntax: '-build:$false'
* `-Arch`/`--arch` - set the target CPU architecture to build. Defaults to x64
* `--os-name` - on non-Windows builds, manually specify if the build should target Alpine. generic Linux, or MacOS
* Rename flags used to build specific project types. The pattern now is `--build-$(group)` or `--no-build-$(group)` (In PowerShell its `-Build$(Group)` or `-NoBuild$(Group). Example: -NoBuildJava

Changes to build definitions:
* Update the ci build definition to build all supported architectures
* Support publishing multiple artifacts per job

Other changes:
* `-NoBuild` implies `-NoRestore`
* Add new properties, `TargetArchitecture`, `TargetOsName`, and `TargetRuntimeIdentifier`
* Replace usages of `SharedFxRid` with these new properties
* To make `--no-build-nodejs` actually work, replaced Components.Browser.JS.csproj with Components.Browser.JS.npmproj
* Fix errors when building for win-arm on a clean machine
* Fix a few other project errors, like using the wrong syntax for DefaultItemExcludes, or using the wrong Platform value for x86
2019-01-31 15:47:47 -08:00
Pavel Krymets ec8a4da9bb Remove ANCM V1 leftovers (#7104) 2019-01-29 14:25:19 -08:00
Pavel Krymets 1ecc8dd9c6
Remove AspNetCoreModule V1 (#7071) 2019-01-29 08:20:00 -08:00
Nate McMaster ac04019e42
Remove obsolete build infrastructure (#6995)
Changes:

* Remove obsolete targets which are unnecessary now that this repo no longer builds git submodules in a separate build process
* Remove the need for static analysis of 'ArtifactInfo' items
* Simplify how the code signing task is configured
* Remove unused repo tasks
* Remove duplicate lists of external dependencies and packages to be produced
* Remove obsolete build definition
* Remove obsolete build script parameters
* Add VisualStudioSetupOutputPath
2019-01-28 09:57:59 -08:00
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
Justin Kotalik fc39ea3bec
Make hosting bundle get prodcon runtime versions (#1435) 2018-09-27 16:44:40 -07:00
Nate McMaster e3ba165baa
Update build.ps1 2018-09-06 23:04:43 -07:00
Nate McMaster e23e8fff95
Install MicroBuild code signing plugin and set SignType = real (#1376) 2018-09-05 12:50:34 -07:00
Nate McMaster b67a141263
Add code for building the Windows Hosting Bundle and ASP.NET Core runtime installers into this repo
This code previously was in private repos because it had references to internal locations and drop shares. This code has been modified to remove these internal-only pieces.
2018-08-20 15:56:22 -07:00