Commit graph

49 commits

Author SHA1 Message Date
Piotr Puszkiewicz
d2035ff036 Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3'
Conflicts:
	build/Microsoft.DotNet.Cli.DependencyVersions.props
2017-01-30 23:27:48 -08:00
Parallels
c849e8ba4c Updating the template engine version to a version that depends on 1.6.0 and updating our build scripts to allow for a commit count override. 2017-01-26 20:44:31 -08:00
jonsequitur
090c8e2e09 hoist CoreCLRRid definition to Prepare.targets 2017-01-26 14:48:42 -08:00
Piotr Puszkiewicz
cc30bdde8a Make Deb tests test Deb 2017-01-26 14:48:40 -08:00
jonsequitur
d55be626a9 netcoreapp1.1 fixes 2017-01-26 14:48:39 -08:00
Livar
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -08:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -08:00
Mike Lorbetske
decec5f8da First step to ingest template engine (#5065)
* First step to ingest template engine

Please do not merge yet
@piotrp @seancpeters @livarocc

* Localization

* Attempt to get a build going

Rename program.cs to New3Command.cs
Move TableFormatter into its own file
Consume template engine packages version 1.0.0-beta1-20161218-24
Temporarily add MyGet templating feed so that package restore will work

* Update ExtendedCommandParser

Make short form args prefer longer runs of characters in the source
parameter before falling back to p:shortname syntax
Change scoping for a few methods to get rid of inconsistent visiblity
errors

* Fix package installation wildcards

* Cleanup New3Command, fix review issue, bump version, sorting for template list

* Installation, loc fix, help formatting

* Use latest TemplateEngine packages

* New3 unit tests

* Fixed formatting on csproj files

* Add the build steps to add templates to the layout

* Change tests slightly to make comparisons easier

Also fixes the wrong flag getting passed to set language

* Fixes for 127, 128, 130, 131 - help display

* Sync to latest TemplateEngine version

Absorbs new search logic

* All tests passing

Cleaner New3Command
Support for project/item template contexts

* Try to make tests more durable

* Disable test parallelization for dotnet-new tests

* Update web SDK and template engine versions

* Remove AI package feed

* Simplify CLI interface to Template Engine

* Fix host identifier and update to latest packages

* Update template engine & Web SDK versions

* Fix template engine version

* Remove UsingTask and redeclaration of property
2017-01-06 14:48:27 -08:00
Eric Erhardt
12f28a6019 Merge pull request #5225 from eerhardt/AddSharedFx11
Install Shared Framework 1.1 when installing the CLI
2017-01-06 11:21:14 -06:00
Piotr Puszkiewicz
d14698f1f6 Bump MSBuild Version to 15.1.0-preview-000503-01 (#5199)
* Bump MSBuild Version to 15.1.0-preview-000503-01

* tool_csc->tool_roslyn

* pull some properties up to dir.props

* Move Roslyn to "Roslyn" subdirectory

* Fix relative paths in RunCsc.*

* Add removal of csc & vbc from deps.json

* Revert roslyn to 2.0.0-rc3-61212-03

* netcoreapp -> 1.0.3
2017-01-05 14:56:11 -08:00
Eric Erhardt
63669d5129 MSI support for installing shared fx 1.1. 2017-01-05 15:39:35 -06:00
Eric Erhardt
e5e11c19c2 Download and extract shared framework 1.1. This initial change gets 1.1 into the archive installers. Still need to bring it into the native installers as well. 2017-01-05 15:03:56 -06:00
Justin Goshi
b72d625168 Include ASP packages in offline cache (#5124)
* Archive asp.net package references

* Archive asp.net package references

* Change the hash input so it's the same on all platforms

* Address PR comments
2016-12-27 11:28:24 -10:00
Livar Cunha
de9ae38375 Updating the branding of rel/1.0.0 to preview5. 2016-12-05 14:47:16 -08:00
Piotr Puszkiewicz
f18967e39a Update CLI's MSBuild Version to 15.1.0-preview-000451-02 (#4889)
* Centralize definition of MSBuild Version in CLI

* MSBuild --> 15.1.0-preview-000451-02
2016-12-01 20:10:42 -08:00
Piotr Puszkiewicz
3a3ab7e0b0 MSBuildSDKsPath (#4824)
* Tests in place

* Implementation
2016-11-23 23:54:44 -08:00
Justin Goshi
be61afcfa5 Remove unused project.json and .xproj files (#4735)
* Remove unused project.json and .xproj files

* Update the test msi script
2016-11-15 16:12:19 -10:00
Justin Goshi
6d57ca7e14 Migrating all test projects (#4668)
* WIP migrate tests

* WIP fixing more tests

* WIP fix test build break

* Test results files are now trx

* Get CI to pass until we get an xunit xml logger

* Added DotNetTestPJ since that was needed for one test

* Fix build break

* Forgot to add DotNetTestPJ as a build task

* Need to restore project.json for the project used in ubuntu test

* Restore PJ for ubuntu test

* Switch the Ubuntu test to csproj based
2016-11-11 21:46:29 -10:00
Livar Cunha
c7841909fd Updating the CLI versino to preview4. 2016-11-07 10:39:59 -08:00
Piotr Puszkiewicz
fd9cb55f1a Add msbuild-based stage0 where possible (#4597)
* Add msbuild-based stage0 where possible

* Fix bash initialization script

* Windows Fixes

* Fix dotnet deb tool
2016-11-02 23:01:57 -07:00
Justin Goshi
a4776a2b2c Migrate src and tools to csproj (#4538)
Thanks for getting this in!
2016-10-29 01:04:20 -07:00
Piotr Puszkiewicz
6fcbefa4f7 [WIP] Removes *3 verbs, making msbuild the driver (#4456)
Removes *3 verbs, making msbuild the driver
2016-10-27 18:46:43 -07:00
Livar Cunha
09d811fdbd Adding an OverrideRid property used in the GetRuntimeInfo task to override the rid of the CLI. This allows us to build for osx.10.11 when building on osx.10.12. 2016-10-08 11:45:19 -07:00
Piotr Puszkiewicz
5ebc6a1ceb Decompose Crossgen, remove CleanPublishOutput, replace ExtractArchive with *FileExtractToDirectory (#3927)
* Eliminate CleanPublishOutput

* Decompose Crossgen Task

* WiP

* TarGzFileExtractToDirectory

* FixModeFlags --> CHMod

Also various eliminations of dead code

* Tasks cleanup

Move all tasks to .tasks file. There is little value in keepint them in each source file as they are already being used assumptively by files that happen to get executed later.

Also eliminating uses of <Exec> for DotNet invocations

* Move to BuildTools implementation of TarGzCreateFromDirectory

* Eliminate Command.cs and helpers

* Remove dead code

* Revert TarGz from BuildTools

Latest build tools package has not picked up the task, though it is checked in.

* Disable ChMod on Windows

* Windows bug fix

* PR Feedback

* Finish changing Chmod caps
2016-07-26 00:29:59 -04:00
Piotr Puszkiewicz
1bf9795374 Replaces custom archiving tasks with build_tools implementation (#3905)
* TarGzFileCreateFromDirectory

* Replace ArchiveDirectory with BuildTools implementation

* Fix archive naming

* Because sometimes XML cares about whitespace...

* Create Packages Directory

* Cleanup
2016-07-22 19:01:32 -04:00
Piotr Puszkiewicz
9446a81a25 Move CheckPrereqs to MSBuild (#3895)
* Move CheckPrereqs to MSBuild

* Tabs to Spaces

* PR feedback
2016-07-20 23:42:23 -04:00
Piotr Puszkiewicz
89e127b8ac Move downloads to CDN (#3873) 2016-07-15 15:36:01 -04:00
Piotr Puszkiewicz
a477fe7253 Incremental build of test projects (#3859)
* If restore incrementality fails, clean out all lock files to re-enable incrementality.

* Incremental build of TestProjects

* Remove reduntant build of test projects

* Fix CI

* Fix list of executable tests

* Msi tests on net46

* Path Separators

* PR Feedback

* Win Diag

* Let's try a hack!

* And another!

* Mor Diag

* McHack

* Slashety slash slash

* One more hack
2016-07-15 00:20:23 -07:00
Piotr Puszkiewicz
f63258ebaa Incremental Test Part 2 - TestAssetProjects (#3854)
* Incremetntal build of TestAsset Projects

* Cleanup

* PR Feedback
2016-07-13 12:52:33 -07:00
Piotr Puszkiewicz
08e9bc903e CLI Testing via msbuild (#3779)
* Rebase

* Remove Multi-Project Validator

* Remove projectmodelserver tests

* Enable test package creation

* Incremental test restore

* WiP

* Enable Test Asset Project restore

* Build Test Assets & Restore Test Projects

* Build Test projects

* Enable Test Execution

also moves Test Targets to a well-known CLI Version [Stage 2]

* Pass throuh existing telemetry profile

* 2-space tabs

* Revert TestTargets.cs

* WiP PR feedback

* Refactoring

* Fix naming of RestoreTestAssetPackages

* DotNetTest task

* Fix merge issue

* ExecuteWithCapturedOutput

MSBuild considers StdErr output to be failures. This causes output of any test command which is expected to produce an error to be swallowed in the test.

* Workaround for always-on tracing functionality in dotnet-test

* Fix Path Separator Windows/Unix

* Seperate package build from pack

* Windows Pathing issues

* PR Feedback

* Workaround for msbuild #773

https://github.com/Microsoft/msbuild/issues/773
2016-07-11 12:46:27 -07:00
Livar Cunha
cdddc2e432 Addressing code review comments. Fixing issue with compile where we were not copying the msbuild files to the right place. Fixed an issue where we were trying to download installers for OSes that don't have installers. Added init-tools scripts. 2016-07-06 12:03:16 -07:00
Livar Cunha
cc1bb54f1a Removing build scripts from dotnet-cli-build. Moving the stage0 to a run_build scripts and invoking dotnet build3 build.proj for the build. 2016-07-05 15:09:39 -07:00
Piotr Puszkiewicz
a19f9021a5 Fix ExeExtension on non-Windows (#3777) 2016-07-04 20:36:30 -07:00
Livar Cunha
f66ec9a789 Adding trailing slash back to OutputDirectory that I accidently removed when merging and improving the inputs for GenerateNuGetPackagesArchiveInputs to take into account the c# template and the dotnet-archive and Microsoft.Dotnet.Archive codes. 2016-07-01 20:46:54 -07:00
Livar Cunha
3c789c8230 Addressing more code review comments 2016-07-01 11:09:11 -07:00
Livar Cunha
9135be75f4 Addressing code review comments and making incremental build work. 2016-07-01 10:35:40 -07:00
Livar Cunha
ce52d698d1 Making CompileStage batch over the different stages to avoid msbuild caching of targets. 2016-07-01 10:34:08 -07:00
Livar Cunha
76728be4cb CompileTargets moved to MSBuild
CompileTargets moved to MSBuild. Still need to work on input/outputs, refactoring of targets, specially around CompileStage and moving some of the tasks back to msbuild instead of C# code.
2016-07-01 10:33:30 -07:00
Bryan Thornbury
a0c1b7a0c0 Everything working 2016-07-01 07:06:27 -07:00
Bryan Thornbury
5cfecec2e9 nuget version 2016-07-01 07:06:27 -07:00
Eric Erhardt
cddf8fa985 Implement incremental builds for Prepare targets. 2016-06-30 11:46:52 -05:00
Eric Erhardt
15642cfd2a Finish converting 'Prepare' to MSBuild.
Implement DownloadHostAndSharedFxArtifacts
Implement ZipTemplates
Switch the Prepare target to use all the MSBuild targets.
2016-06-29 19:19:58 -05:00
Bryan Thornbury
2ed5363187 Merge pull request #3696 from brthor/brthor/msbuild-package-targets
msbuild package targets
2016-06-29 16:51:58 -07:00
Bryan Thornbury
fa97921a4d change to properties, artifact names 2016-06-29 15:12:58 -07:00
Eric Erhardt
a7d2972509 Fix Stage0 calculation on Unix. 2016-06-28 19:03:10 -05:00
Eric Erhardt
bf172df39b Respond to PR feedback and fix CommitCount not being padded with zeros. 2016-06-28 18:59:15 -05:00
Eric Erhardt
aff23d00f4 Implement RestorePackages in MSBuild.
This adds the DotNetTool custom task, with `dotnet restore` implemented.
2016-06-28 18:22:15 -05:00
Eric Erhardt
038758acf4 Convert 'Init' to MSBuild. 2016-06-27 21:39:19 -05:00
Bryan Thornbury
4d8ed818e5 base init infra 2016-06-27 12:56:15 -07:00