Commit graph

189 commits

Author SHA1 Message Date
Justin Goshi
acc77e2a46 Address pr comments 2017-02-23 09:26:14 -08:00
Eric Erhardt
7036fa1aef Update dotnet-deb-tool-consumer to use the latest dotnet-deb-tool.
The latest deb-tool will use the CLI's runtime, which is required on distros that don't have .NET Core 1.0 installed.
2017-02-22 21:34:22 -06:00
Justin Goshi
e894d7e60e Refactor publish.target 2017-02-22 16:54:15 -08:00
Eric Erhardt
996d458e30 Support Ubuntu16.10 installer
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
2017-02-22 15:18:45 -06:00
Piotr Puszkiewicz
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Piotr Puszkiewicz
85b2a129db Merge branch 'rel/1.0.0'
Conflicts:
	TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
	TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
	TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
	build.proj
	build/Compile.targets
	build/Microsoft.DotNet.Cli.Compile.targets
	build/Microsoft.DotNet.Cli.DependencyVersions.props
	build/Microsoft.DotNet.Cli.Monikers.props
	build/Microsoft.DotNet.Cli.Prepare.targets
	build/package/Microsoft.DotNet.Cli.Nupkg.targets
	build/package/Nupkg.targets
	build/test/TestPackageProjects.targets
	build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
	build_projects/dotnet-cli-build/GetCommitCount.cs
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
	src/dotnet-archive/dotnet-archive.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_nuget/tool_nuget.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/ArgumentsReflector/ArgumentsReflector.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/crossgen.Tests/crossgen.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-build.Tests/dotnet-build.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
	test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
	test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-run.Tests/dotnet-run.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
	test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
	test/dotnet-test.Tests/dotnet-test.Tests.csproj
	test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
	test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
	tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Justin Goshi
e7de32e988 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
Matt Ellis
47b75cfa12 Misc build changes
For injestion into a composed build, I'm adding some minor tweaks to
our build system:

 - Teach DownloadFile task how to consume file:// URLs so we can pass
   around artifacts using local sources.
 - Add `SkipBuildingInstallers`, an MSBuild property that can be set
   to true when installers (pkgs, msis, debs, rpms and the like) do
   not need to be built.
 - Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
   can be set to prevent additional shared frameworks (i.e. shared
   frameworks that the CLI does not use at runtime) from being
   downloaded and included in our payload.
 - Add `IncludeNuGetPackageArchive` an MSBuild property that can be
   set to prevent the lzma archive containing all the nupkgs we
   restore on first run from being included in the final output.
 - Provide a way to change the Uri use for blob storage (so the
   composed build and point at a local folder that looks like blob
   storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Livar
1c896d4402 Adding release suffix as a modified parameter of the build and removing NugetVersionForVS. we don't need that concept. 2017-02-09 22:31:46 -08:00
Livar Cunha
81a94c0902 Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI. 2017-02-09 15:47:53 -08:00
Livar Cunha
35fc8c1d0e Step one of introducing a flag to drop the suffix out of our build versions. 2017-02-08 15:26:47 -08:00
Piotr Puszkiewicz
0a634d5174 Add incrementality check for MSI generation 2017-02-07 10:56:06 -08:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08:00
Unknown
8671021577 Update MSBuild 2017-02-03 17:07:53 -08:00
Eric Erhardt
9f0bb778a1 Merge rel/1.0.0 into master. 2017-02-01 14:32:59 -06:00
Piotr Puszkiewicz
31a6da880f Reverse installation order of shared frameworks 2017-01-27 11:49:54 -08:00
Piotr Puszkiewicz
cc30bdde8a Make Deb tests test Deb 2017-01-26 14:48:40 -08:00
jonsequitur
bed3d974d6 add netcoreapp1.1 to Ubuntu installer 2017-01-26 14:48:40 -08:00
Eric Erhardt
6cb4b27ebb Make Deb tests test Deb 2017-01-26 14:52:55 -06:00
Eric Erhardt
1950ef5e17 Merge rel/1.0.0 into master 2017-01-23 09:57:56 -06:00
Livar
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
Piotr Puszkiewicz
0bd6303f47 Restore debian test before running it (#5272) 2017-01-11 10:53:26 -08:00
Eric Erhardt
c481ad9cdc Merge all hard-coded versions and version suffixes to be defined in a single spot. 2017-01-10 20:54:11 -06:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -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
Eric Erhardt
a211353e52 Fix TestSdkDeb by installing the AdditionalSharedHost installer. 2017-01-05 22:25:58 -06:00
Eric Erhardt
80919ddc12 Work around MSBuild issue with using %AD at the beginning of an Include. 2017-01-05 21:05:06 -06:00
Eric Erhardt
48ec34e7b4 DEB support for installing shared fx 1.1. 2017-01-05 18:06:16 -06:00
Eric Erhardt
6106cae066 PKG support for installing shared fx 1.1. 2017-01-05 17:30:08 -06:00
Eric Erhardt
63669d5129 MSI support for installing shared fx 1.1. 2017-01-05 15:39:35 -06:00
Livar Cunha
72cd3d7c43 Pinning stage0 to latest and reverting build scripts to use stage0 for now. 2017-01-05 12:40:23 -08:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Livar Cunha
de9ae38375 Updating the branding of rel/1.0.0 to preview5. 2016-12-05 14:47:16 -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
51cb0ab4d5 Remove deprecated nupkgs, pack in-place to enable signing (#4615)
* Remove deprecated nupkgs, pack in-place

* Add back target specifiers.

* fix suffix
2016-11-03 22:11:58 -07: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
Piotr Puszkiewicz
bf7c9d3d0c PR Feedback 2016-10-10 08:52:57 -07:00
Piotr Puszkiewicz
e8d90e1c19 Expand MSI generation inputs to include all files in the directory 2016-10-10 08:32:09 -07:00
Sridhar Periyasamy
d0e06b9220 Create a nuget package with the windows installers.
These nuget packages are used to deliver the CLI payload to Visual Studio
setup authoring. They are pushed (by VSO build definitions) into an internal feed consumed by
Visual Studio.
2016-10-05 13:56:57 -07:00
Bryan Thornbury
e3a50e00c8 project json migration nuget package 2016-09-08 14:43:04 -07:00
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
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
5ffdcd5797 DEB start 2016-08-18 12:35:39 -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
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
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
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
Piotr Puszkiewicz
89e127b8ac Move downloads to CDN (#3873) 2016-07-15 15:36:01 -04: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
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 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
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
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
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
fa97921a4d change to properties, artifact names 2016-06-29 15:12:58 -07:00