Commit graph

1936 commits

Author SHA1 Message Date
PiotrP
e23ffbe13e Adjust ToolPath 2016-08-30 14:18:13 -07:00
Piotr Puszkiewicz
22db479ee2 Move DEB.proj in-process 2016-08-30 11:45:58 -07:00
PiotrP
3cdd15a145 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 10:30:45 -07:00
PiotrP
afcc679646 Try da hak 2016-08-29 14:35:55 -07:00
Piotr Puszkiewicz
7993b438a0 Reset ToolsVersion to 14 2016-08-27 21:46:18 -07:00
Piotr Puszkiewicz
c8139a9790 Bump ToolsVersion to 15 2016-08-27 18:31:26 -07:00
Piotr Puszkiewicz
3a2632f6d5 Refactor DEB.proj 2016-08-27 18:07:49 -07:00
Piotr Puszkiewicz
8eecff0112 Address build issues 2016-08-27 15:57:14 -07:00
PiotrP
ed66c70106 wIp 2016-08-26 15:46:08 -07:00
Livar Cunha
9f2a0169fc Addressing code review comments. 2016-08-26 11:23:47 -07:00
Livar Cunha
b09a6c6350 Adding dotnet-test-console to the list of generated nupkgs and fixing some namespace for the new command resolvers. 2016-08-25 23:14:25 -07:00
PiotrP
c5b4e48410 Initial removal of DebPackageCreator.cs 2016-08-25 13:19:22 -07:00
Piotr Puszkiewicz
56d2153c08 WiP 2016-08-23 16:09:12 -07:00
Piotr Puszkiewicz
578adf072c Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	src/dotnet/Program.cs
2016-08-18 18:08:45 -07:00
Piotr Puszkiewicz
e92c9603c8 Test reliability and format cleanups 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
a1e3218023 msbuild885 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
2cf4eb3106 Missed file 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
43c5a2c59b multi-proc test execution 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
5ffdcd5797 DEB start 2016-08-18 12:35:39 -07:00
Livar Cunha
86f8115ee7 Updating the System.Reflection.Metadata version and changing the order of platform assemblies passed to crossgen. 2016-08-17 16:42:19 -07:00
Livar Cunha
5c4785e662 Removing dependency model from one of the packaged projects in the CLI. 2016-08-10 13:39:49 -07:00
Livar Cunha
0a55a7cb99 Updating the msbuild changes to handle DependencyModel coming from core-setup instead of a project dependency. 2016-08-10 13:39:49 -07:00
Eric Erhardt
2b741bca27 Fix and re-enable build3 tests. 2016-08-10 09:21:43 -05:00
Piotr Puszkiewicz
b3f5174f00 PR Feedback 2016-08-09 14:49:13 -07:00
Piotr Puszkiewicz
3a55a4182f src/redist/project.json 2016-08-09 13:22:22 -07:00
Eric Erhardt
2bea6bac83 Move 14.1 to 15.0 now that MSBuild is version 15.0. 2016-08-09 10:28:50 -05:00
Eric Erhardt
d5179f9168 Temporarily copy the dotnet/buildtools tasks we use into dotnet/cli to allow us to move up to a newer MSBuild. 2016-08-09 08:28:23 -05:00
Piotr Puszkiewicz
f09903d5c6 Copy MSBuild.exe into root dir to work around MSBUILD #872 2016-08-09 00:28:41 -07:00
PiotrP
359f274626 Workaround for msbuild #872 2016-08-08 14:35:09 -07:00
Piotr Puszkiewicz
479399ff47 Fix invocation of insignia.exe -ab
http://wixtoolset.org/documentation/manual/v3/overview/insignia.html
2016-08-02 12:59:45 -07:00
Piotr Puszkiewicz
253d232943 Add missing dependencies to bundle targets 2016-08-01 23:25:28 -07:00
Piotr Puszkiewicz
52ed2b090f Remove temporary hacks from new NuGet 2016-08-01 19:11:40 -07:00
Livar Cunha
06bbaf7fb5 Disabling build3 tests. 2016-07-28 23:13:19 -07:00
Piotr Puszkiewicz
336b97212f Crossgen package name casing 2016-07-28 22:29:29 -07:00
Livar Cunha
567cd8e1b5 Adding the trailing slash in the directory property. BuildTools needs it like that and that is the pattern in MSBuild. 2016-07-27 15:59:55 -07:00
Eric Erhardt
74da44a2bf Temporarily restoring in-between compilation stages in order to use the current NuGet restore implementation. 2016-07-26 21:00:14 -05:00
Jonathan Miller
3a6e15309e Bringing run.exe into the repo and starting with the clean command 2016-07-26 16:15:36 -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
Eric Erhardt
fd8bbdcb63 Merge pull request #3911 from eerhardt/msbuild-E2E
MSBuild end to end
2016-07-22 18:49:22 -05: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
Eric Erhardt
1f8facc7c5 Fix TestSdkDeb to run tests against the installed dotnet. 2016-07-22 07:04:25 -05: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
Bryan Thornbury
2455528b2e fix nupkg generation 2016-07-15 15:58:03 -07:00
Livar
3f52e83daf Merge pull request #3872 from livarcocc/publish_msbuild
Publish msbuild
2016-07-15 15:05:49 -07:00
Livar Cunha
01b4981461 Addressing code review comments 2016-07-15 13:44:11 -07:00
Piotr Puszkiewicz
89e127b8ac Move downloads to CDN (#3873) 2016-07-15 15:36:01 -04:00
Livar Cunha
03a17a9b76 Adding a task to set the blob properties correctly based on type. 2016-07-15 11:40:56 -07: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
Livar Cunha
6d7f110122 Uploading assets using msbuild.
Copying Microsoft.WindowsAzure.Storage.dll to the sdk stage0 folder to get around issue https://github.com/Microsoft/msbuild/issues/658.
2016-07-14 16:56:20 -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
Bryan Thornbury
9e20cd2669 PR Feedback 2016-07-13 11:19:38 -07:00
Bryan Thornbury
975727df6b continue on error for ubuntu 16 2016-07-13 11:07:16 -07:00
Bryan Thornbury
e9d97ea7bd Fixup dotnet-sdk-debug layout 2016-07-13 11:07:16 -07:00
Bryan Thornbury
7d10620c6d fix restore issue in deb targets 2016-07-13 11:07:15 -07:00
Bryan Thornbury
38ba3066ea fix archive targets bug 2016-07-13 11:07:14 -07:00
Bryan Thornbury
003e6ba282 Deb Package Targets 2016-07-13 11:07:14 -07:00
Livar
660d81901b Merge pull request #3849 from brthor/brthor/versionbadge
Brthor/versionbadge
2016-07-13 09:17:18 -07:00
Piotr Puszkiewicz
16bedef2c5 Piotrp msft/msbuild/incremental test (#3842)
* Incremental Testing - Part 1

* Fix 'clean' bug

* Remove --fallbacksource from TestAssetPackage restore.
2016-07-12 17:10:48 -07:00
Bryan Thornbury
610626dce3 version badge target 2016-07-12 16:52:58 -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
5d40e8b734 Fixing Ubuntu packaging issue, part 99 of hopefully 99. 2016-07-06 16:45:41 -07:00
Livar Cunha
8eb05a4deb Addressing code review comments and fixing another issue with deb installer generation. 2016-07-06 14:45:07 -07:00
Livar Cunha
4510d9803c Fixing the path for msbuild targets. 2016-07-06 13:46:54 -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
5302a63aa3 Addressing more code review comments and removing the incrementality from BuildProjectsForNuGetPackages. All it does is invoke dotnet build, which already has incremental builds. I will let it handle this one. 2016-07-01 10:37:01 -07:00
Livar Cunha
2846a9b2e7 Fixing an issue where there was a new line in the path to dotnet.exe in the sharedframework and added incrementality to BuildProjectsForNuGetPackages. 2016-07-01 10:35:40 -07:00
Livar Cunha
9135be75f4 Addressing code review comments and making incremental build work. 2016-07-01 10:35:40 -07:00
Livar Cunha
52e9475be8 Fixed tabs to 2 spaces instead of 4 for our targets files 2016-07-01 10:34:29 -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
b91160ef06 Fixing some paths, moving the compile.targets to the end of build.proj. 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