Commit graph

306 commits

Author SHA1 Message Date
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
Piotr Puszkiewicz
b354e1a3c6 Eliminate imports from CLI, where possible (#4673)
* Remove imports from dotnet.dll

* Add back dotnet5.4 to dotnet.dll due to AppInsights

* dotnet-cli-build.csproj: OData
redist.csproj: AppInsights
2016-11-10 10:19:37 -08:00
Livar Cunha
de0ca4823f Fixing how we clean the file when it fails to download. We were doing it inside the using statement, so it still had a lock to the file and failed to delete it. 2016-11-09 10:05:05 -08:00
Livar Cunha
087852b1b8 Changing the lzma generation to first trying to download it from blob. If that fails, generate it. And if we generate it and we are uploading things to azure, upload it as well. 2016-11-08 15:14:47 -08:00
Piotr Puszkiewicz
24596b23ae 02->2 2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c Final Version Numbers 2016-11-04 10:09:22 -07:00
seancpeters
40c34f891a Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions (#4585)
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions

* Fixed merge conflicts. Had to re-update the Sdk version in one place.

* re-migrate dotnet.dll

* Revert Performance Test Projects

* Fix test test

* Add missing WithRuntime

* Disable failing test test
2016-11-03 22:12:33 -07:00
Rob Relyea
f961fef8e0 update NuGet in CLI to 4.0.0.2048 (#4614)
* update NuGet in CLI to 4.0.0.2047

* update NuGet in CLI to 4.0.0.2048
2016-11-03 22:11:44 -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
Livar Cunha
c2f60cede4 Updating the SDK to the latest. 2016-11-01 00:29:54 -07:00
Jeff Kluge
595a768e30 Custom logger for MSBuild to receive telemetry events (#4551)
* Upgrade MSBuild references to 15.1.0-preview-000370-00

* Custom logger for MSBuild to receive telemetry events

Had to make the telemetry session ID a static variable so that the forwarding app could use it.

I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
2016-10-31 16:16:39 -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
Livar
3ec5279491 Merge pull request #4516 from dagood/disable-parallel
Use --disable-parallel during xplat restores
2016-10-29 00:49:09 -07:00
Justin Emgarten
54cad0b7a6 Updating nuget to 4.0.0-rc-2037 2016-10-28 17:13:29 -07:00
Davis Goodin
59a6c72be7 Use --disable-parallel during xplat restores.
Works around NuGet parallel restore timeouts becoming build failures when the machine has a slow connection, for example in our Docker Fedora containers.
2016-10-28 10:53:56 -05: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
Eric Erhardt
33ec55aee3 Fix dotnet run3 --project to pass the project to msbuild.
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301.
2016-10-26 00:04:40 -05:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -07:00
Justin Goshi
a6d37d25f5 Clean up dotnet-cli-build.csproj (#4416)
Clean up dotnet-cli-build.csproj
2016-10-17 23:50:22 +00:00
Livar Cunha
391d04c67a Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running. 2016-10-16 18:44:07 -07:00
Justin Goshi
a3deb373e1 Merge branch 'rel/1.0.0' into dev/jgoshi/switchToMsbuild 2016-10-14 12:31:53 -07:00
Justin Emgarten
bc82b16a01 Merge pull request #4406 from dotnet/emgarten/solutionRestore
Adding recursive restore and solution level restore
2016-10-14 11:18:24 -07:00
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382)
Make csproj templates first-class in dotnet-new.
2016-10-14 00:06:35 -07:00
Justin Emgarten
53b436c5d5 Updating NuGet to 3.6.0-rc-1984 2016-10-13 19:31:15 -07:00
Justin Goshi
18bc875dca Change cli build to csproj files (First step on one project)
First doing this just for dotnet-cli-build
2016-10-13 18:09:30 -07:00
Nate Amundson
3ae14ab618 Upload checksums for installation artifacts (#4191)
The checksums are SHA-512 hashes, which users can use to verify file
integrity and authenticity.
2016-10-12 14:25:06 -05:00
Justin Emgarten
f2eef338db Updating NuGet to 3.6.0-rc-1979 2016-10-12 00:49:44 -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
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Nate Amundson
19f295113a Merge pull request #4234 from naamunds/SupportCustomContainer
Support building with custom container name
2016-10-03 18:02:05 -05:00
Livar Cunha
082a90035d Bumping nuget to 3.6.0-beta.1.msbuild.17 2016-09-29 12:16:41 -07:00
Eric Erhardt
04869b9997 Updating msbuild to 0.1.0-preview-00043-160929. 2016-09-29 10:26:55 -05:00
Nick Guerrera
936692acf1 Update msbuild to latest 2016-09-28 04:37:39 -07:00
Nick Guerrera
6bc099e5e0 Update msbuild to latest 2016-09-27 15:16:13 -07:00
Rohit Agrawal
cfe76534ca bump nuget to 3.6.0-beta.1.msbuild.16 2016-09-26 16:47:20 -07:00
Rohit Agrawal
dfc5650db8 bump nuget version to 3.6.0-beta.1.msbuild.15 (#4241) 2016-09-23 17:14:32 -07:00
Nate Amundson
343374d7c7 Support building with custom container name
Currently, using a custom container name is supported for only some
publish steps.  This commit makes it supported for all publish steps.

This commit also ensures that the Overwrite property is specified on all
calls to the UploadToAzure task.
2016-09-22 19:02:53 -07:00
Nick Guerrera
4807c8b0b0 Update msbuild to latest 2016-09-22 12:52:09 -07:00
Justin Emgarten
1626cf2e62 Restore3 support for PackageReference
Fixes https://github.com/NuGet/Home/issues/3453
2016-09-16 13:40:10 -07:00
Nick Guerrera
e59b2f3e6d Update msbuild 2016-09-15 10:59:03 -07:00
Rohit Agrawal
194a850c71 update nuget and sdk to include msbuild pack target 2016-09-12 17:10:31 -07:00
Eric Erhardt
0ecb3b7538 Update MSBuild to 0.1.0-preview-00034-160909. 2016-09-12 12:14:17 -05:00
Livar Cunha
27bc1c4f91 Merge branch 'rel/1.0.0-preview2' into merge_preview2_to_rel100
* rel/1.0.0-preview2:
  Update versions of EF and scaffolding tools
  Update Kestrel to 1.0.1
  Update version of routing to 1.0.1
  Add missing comma to F# lib project.json
  Update cshtml wildcard in publishOptions
  Don't print arguments in F# console app
  Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
  Update MVC version to 1.0.1
  Upgrade Corefx and coreclr references
  fix typo in dotnet-install file
  Remove the VS2012 CRT dependency from docs (#3632)
  Fix README to use hostfxr download links (#3622)
  Fix Oracle Linux version in README.md
  Use NugetCache Sentinel for Telemetry setting.
  Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.
  Remove showing firsttime eula for non verbs.
  Adding Oracle Linux and Linux Mint to the titles
  Moving Ubuntu 16.04 to be next to Ubuntu 14.04
  Update README.md
2016-09-02 14:53:16 -07:00
Joel Verhagen
3619b7d767 Set the "hashPath" when building the .deps.json file
Update Microsoft.Extensions.DependencyModel to 1.0.1-beta-000933
Update Microsoft.DotNet.PlatformAbstraction to 1.0.1-beta-000933
Update NuGet to 3.6.0-beta.1.msbuild.4
Update dotnet-test-xunit to 1.0.0-rc2-350904-49
2016-09-02 10:02:54 -07:00
Sridhar Periyasamy
8fcfc2af05 Upgrade Corefx and coreclr references
Microsoft.NetCore.App 1.0.0 => 1.0.1
Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4
CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122"

List of changes
- all project.jsons
- dotnet new templates
- and build projects files
   - shared-build-targets-utils\DependencyVersions.cs
   - CliDependencyVersions.cs
2016-08-31 10:41:47 -07:00
PiotrP
ec23abadec Update MSBuild version 2016-08-30 10:31:04 -07:00
Piotr Puszkiewicz
3a2632f6d5 Refactor DEB.proj 2016-08-27 18:07:49 -07:00
Piotr Puszkiewicz
ab1797cb29 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-26 22:39:40 -07:00
PiotrP
ed66c70106 wIp 2016-08-26 15:46:08 -07:00
PiotrP
c5b4e48410 Initial removal of DebPackageCreator.cs 2016-08-25 13:19:22 -07:00
Nick Guerrera
c702957730 Update to new msbuild 2016-08-24 10:10:20 -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
Joel Verhagen
aacc30d5d8 Add "path" property the .deps.json file for libraries
Update DependencyModel and PlatformAbstractions packages to 1.0.1-beta-000917
Update dotnet-test-xunit to 1.0.0-rc2-330423-54
2016-08-18 15:57:03 -07:00
Piotr Puszkiewicz
5ffdcd5797 DEB start 2016-08-18 12:35:39 -07:00
Livar Cunha
90232486e5 Updating System.Reflection.Metadata to a newer version in some projects that I forgot to do so before. 2016-08-18 11:55:27 -07:00
Piotr Puszkiewicz
2db1997bc0 Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
2016-08-16 18:30:52 -07:00
drewgil
11b666acee Add nuget command to dotnet cli 2016-08-16 09:27:55 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -07:00
Livar Cunha
b7b90175f4 Removing the public types from InternalAbstractions. 2016-08-10 13:39:49 -07: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
5f60c2cf37 Move CLI Build to MSBuild 00024-160610 2016-08-09 01:12:29 -07:00
Eric Erhardt
b3e69b139e Update NuGet to 3.5.0-rc1-1697 2016-08-01 13:58:04 -05:00
Eric Erhardt
6eabeb9be0 Generate runtimeconfig.json and runtimeconfig.dev.json from MSBuild
Moves generating the runtimeconfig files to a separate MSBuild target which is only dependent on project.lock.json.

Also, moving up our NuGet dependency to 3.5.0-rc1-1653, since that brings in the LockFile.PackageFolders property, which is needed for runtimeconfig.dev.json.
2016-07-26 20:53:17 -05:00
Bryan Thornbury
7707ad970c small fix 2016-07-26 16:04:14 -07:00
Bryan Thornbury
3bc1aa9128 Consume dotnet-deb-tool in cli 2016-07-26 15:26:44 -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
24d2e638d5 Build Cleanup: Part 2 (#3890)
* Remove deprecated build_projects sources

* Remove BuildSetup, StandardGoals, and Target Attributes

* Incremental restore of tasks dll

* CheckPreReq conforms with MSBuild Error Handling guidelines

* Eliminate deprecated content

* PR Feedback
2016-07-19 17:01:02 -04:00
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
Eric Erhardt
eada6913c4 PR feedback 2016-07-15 19:52:20 -05:00
Eric Erhardt
a27d02eb66 Move to buildtools' VersionTools for update-dependencies. 2016-07-15 19:41:29 -05: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
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
5059e9c61b CLI Build Cleanup: Round 1 (#3869)
* dotnet-cli-build non-runnable

* Usings + License
2016-07-15 08:31:50 -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
Bryan Thornbury
003e6ba282 Deb Package Targets 2016-07-13 11:07:14 -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
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
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
aebb42335c Changed dotnet stage0 to no longer pivot on OS. We just place it under dotnet_stage0/ 2016-07-05 16:28:00 -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
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
9135be75f4 Addressing code review comments and making incremental build work. 2016-07-01 10:35:40 -07:00
Livar Cunha
b8ccb0d1ae Adding CompileTargets.cs back. I got ahead of myself by removing it. We haven't switched our official builds to msbuild yet. 2016-07-01 10:34:29 -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
5cfecec2e9 nuget version 2016-07-01 07:06:27 -07:00
Piotr Puszkiewicz
c7d3f24be0 MakeRelative Task (#3750)
* MakeRelative Task

* PR Feedback

* Fix naming conflict
2016-06-30 17:11:33 -07:00
PiotrP
5ed1371cd9 Remove Project Model Server 2016-06-30 14:31:08 -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
2ed5363187 Merge pull request #3696 from brthor/brthor/msbuild-package-targets
msbuild package targets
2016-06-29 16:51:58 -07:00
Bryan Thornbury
e6905da2b3 ToUpper 2016-06-29 15:59:35 -07:00
Bryan Thornbury
ddb3637c26 PR Feedback 2016-06-29 15:56:13 -07:00
Bryan Thornbury
fa97921a4d change to properties, artifact names 2016-06-29 15:12:58 -07:00
Eric Erhardt
bf172df39b Respond to PR feedback and fix CommitCount not being padded with zeros. 2016-06-28 18:59:15 -05:00