Commit graph

88 commits

Author SHA1 Message Date
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Tanner Gooding
a8856ddccc Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-03 15:24:39 -07:00
Livar
2b2d9c2355
Merge pull request #8987 from livarcocc/disable_msbuild_node_reuse
Disabling msbuild node reuse for unix.
2018-04-06 09:07:05 -07:00
Livar Cunha
9706863629 Disabling msbuild node reuse for CLI full build. 2018-04-05 10:16:26 -07:00
Steve MacLean
ed35c638fb [Arm64] Enable arm64 cli builds 2018-04-04 17:47:58 -04:00
Livar Cunha
b250271ac1 Removing the dependency on the project.json CLI from the windows build scripts as well. 2018-03-27 16:38:29 -07:00
John Beisner
a54f0ffb81
Enable 'arm' builds in the CLI (#8791)
* First draft enablement of Win-arm and Linux-arm builds for the CLI.

* Fixing a typo

* Disable tests for arm; enable badges and FinalizeBuild for arm.

* Remove the 'Win-arm' leg.

* Update the README

* Update the README [2]

* Update netci.groovy

* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
2018-03-14 19:04:25 -07:00
John Beisner
3e35517ce8
Repairing the first pass call to 'dotnet msbuild'; CLI:master (#8488)
* '$ExtraParametersNoTargets', which is used on the first pass call to 'dotnet msbuild', currently is of type 'string' not 'List'1' as is '$ExtraParameters'. This results in the non-honoring of any parameter other than parameter one. Solution: Make a copy of '$ExtraParameters' to '$ExtraParametersNoTargets' of type 'List'1' and remove the targets from the list.

* Swallow the boolean output from '$ExtraParametersNoTargets.Remove'

* Specifically capture "/t:" or "/target:" only.
2018-01-29 11:48:26 -08:00
jbeisner
331b58c8a2 Should use a trailing space instead of a leading space; MSBuild thinks the '$ExtraParametersNoTargets' variable a switch instead of a string. 2018-01-17 22:33:22 +00:00
jbeisner
ab97a076f2 Putting back 'docker' and 'stage0' parameters in the usage. 2018-01-17 17:56:34 +00:00
jbeisner
878821a51b Consider case and "target" as possibilities. 2018-01-11 23:36:10 +00:00
jbeisner
1ea48da27c Run-Build.sh/ps1 does not behave correctly when passing in a target. 2018-01-11 21:23:46 +00:00
Eric Erhardt
52a59dd56e Bump stage0 to 2.2.0-preview1-007799.
Need to remove some unnecessary dependencies in dotnet-cli-build.csproj because the NuGet.CommandLine.XPlat reference was bringing in an old MSBuild version, which was breaking restore. I didn't see any usages of this reference, so I'm removing it since it is not needed.
2017-12-12 17:16:25 -06:00
John Beisner
02b1cc6aa7 'channel' parameter is superfluous if also using a 'version' parameter. 2017-12-08 17:49:38 -08:00
Livar
0ca9728098
Merge branch 'master' into merges/release/15.5-to-master-20171204-080035 2017-12-04 11:20:08 -08:00
John Beisner
ae5e396f94 Handling the possible semi-colon(s) in the property parameters. 2017-11-28 17:39:35 -08:00
John Beisner
e7f4fb001b Writing a NuGet.config as part of the preparatory steps. 2017-11-28 12:54:32 -08:00
John Beisner
929cf1d5ac Corrected usage... 2017-11-11 21:22:54 -08:00
Nick Guerrera
69a3c9d248 Merge dotnet/cli:dev/release/2.0 into dev/repo-refactoring 2017-10-19 16:44:10 -07:00
Nick Guerrera
57d256dbf5 Make copy idempotent 2017-10-18 16:12:13 -07:00
Nick Guerrera
218b887d87 Download stage0 when DOTNET_TOOL_DIR is not set 2017-10-18 12:43:34 -07:00
Matt Ellis
eacc4d248c Don't pull down stage 0 from the internet
The composed build will set `PREBUILT_DOTNET_TOOL_DIR` to a location
where the dotnet tool can be copied from.

Long term we should get rid of the copy in favor of just using one
from a common location, but some of the Stage0 logic in the CLI build
system will need to change, I think.
2017-10-18 12:43:33 -07:00
Livar Cunha
03e37047a3 Fixing Windows build script. 2017-10-13 16:40:31 -07:00
Livar Cunha
62ae014c37 Making this repo consume the dotnet-sdk-internal zip and produce a full core-sdk by using sdk-internal, runtime, lzma, templates and store. Also deleted a bunch of now, unecessary code. I am sure there is more to be deleted though. 2017-10-13 10:45:50 -07:00
Daniel Plaisted
9f3bbc40a2 Use a shorter path for test working directories, get rid of Stage 0 project.json based CLI
(cherry picked from commit 4c3b13e4a8)
2017-09-27 14:40:57 -07:00
Jan Vorlicek
90e217831b Enable RHEL 6 support
This change enables RHEL 6 support. It also adds a new command line option to the
run-build.sh script that enables passing in a folder containing a bootstrap CLI.
This helps in bringup of new target platforms.
2017-09-21 15:20:55 +00:00
William Li
1a9bad1fd1 Revert "pin stage0 due to build failure"
This reverts commit 4fe4c4d28a.
2017-09-18 11:19:07 -07:00
William Li
4fe4c4d28a pin stage0 due to build failure 2017-09-15 13:28:01 -07:00
John Beisner
a8e96e9d52 Adding a Jenkins test leg to master - Spanish. 2017-09-06 16:12:31 -07:00
Daniel Plaisted
4c3b13e4a8 Use a shorter path for test working directories, get rid of Stage 0 project.json based CLI 2017-08-29 17:59:34 -07:00
Nick Guerrera
cf511cdc17 Revert "Pin Stage0 to a version with .NET Core 2.0 instead of 2.1"
This reverts commit 83b92ee8d6.
2017-08-25 14:05:55 -07:00
Daniel Plaisted
83b92ee8d6 Pin Stage0 to a version with .NET Core 2.0 instead of 2.1
This will avoid https://github.com/dotnet/corefx/issues/23496, which https://github.com/dotnet/cli/pull/7506 will work around
2017-08-24 14:43:58 -07:00
Nick Guerrera
685d28436c Use 2.1 builds for stage0 of 2.1 builds 2017-07-25 16:09:54 -07:00
William Li
dd137f6b42 Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
This reverts commit 0dd17b6330.
2017-06-30 22:42:00 -07:00
John Beisner
0dd17b6330 Pinning the SDK version to: "2.0.0-preview3-006628" 2017-06-30 17:42:42 -07:00
John Beisner
ce61070a69 Updates to install scripts to consume the renaming packages at blob storage. Unpinning the CLI build from a specific version. 2017-06-07 10:18:05 -07:00
John Beisner
5a1c401331 Moving the pinned version of the SDK for installation forward from "2.0.0-preview2-006341" to "2.0.0-preview2-006349" 2017-06-06 16:06:38 -07:00
John Beisner
1bf7752480 Renaming "dotnet-dev" to "dotnet-sdk"; therefore: renaming "dotnet-sdk" to "dotnet-sdk -internal". Pinning the install scripts to a unrenamed version so the build will not break on the 'latest'.
Note: This is part 1 of a 2 part change
2017-06-05 09:54:28 -07:00
Livar
413fa23eee Merge pull request #6731 from livarcocc/merge_rel_110
Merge rel/1.1.0 into release/2.0.0
2017-06-01 11:54:16 -07:00
Livar Cunha
f4bb13acaa Merge branch 'rel/1.1.0' into merge_rel_110
* rel/1.1.0: (41 commits)
  Updating the Sdk to one that includes the error surfacing work.
  Update NuGet to 4.3.0-preview2-4082
  Update NuGet to 4.3.0-preview1-4081 and SDK to corresponding 1.1.0 based version
  Updating MSBuild to 15.3.0-preview-000246-05 to match VS.
  Updating the global.json creation to use the IFile interface and adding a unit test to cover it.
  Making restore use a config file so that it does not use fallback folders that may exist in the machine.
  Dropping a global.json when running the first run experience with a version that matches the version of the CLI being used in the command that triggered the first run.
  Updating the websdk version for 1.0
  Trying to fix the opensuse42 test failure, where we tried to invoke a tool that target 1.0.4 where the 1.0 runtime is not available.
  Pinning the stage0 to the last build out of rel/1.0.1 and adding a project to download 1.0 dependencies for test assets.
  Updating the branding to rel/1.1.0
  Dummy commit.
  Adding the access token to the lzma url.
  Dummy change to force a build.
  Reverting the msbuild version to the release version.
  Adding the web feed to nuget.config, as some packages failed to mirror and we need a build ASAP.
  Updating the msbuild, SDK and Web SDK versions.
  Dummy commit to kick off the build.
  the FSharp.NET.Sdk version `-bundled` contains only the Sdk dir
  bump f# sdk package version
  ...
2017-06-01 09:43:31 -07:00
Eric Erhardt
eab48e1814 Unpin stage0. 2017-05-31 13:05:30 -05:00
John Beisner
b48b7d2ea0 .NET Core 2+ Naming and Versioning
New file name structure for the runtime and the CLI
per: https://github.com/dotnet/designs/issues/2

The renaming of assets, therefore the dotnet installation scripts must change to accommodate.

Trivial:
"Write-Host" should be "Write-Output"
2017-05-26 15:46:56 -07:00
Livar Cunha
f270ecd025 Pinning the stage0 to the last build out of rel/1.0.1 and adding a project to download 1.0 dependencies for test assets. 2017-05-17 21:06:42 -07:00
Nick Guerrera
ee16de3f7b Fix bad merges 2017-05-05 16:38:10 -07:00
Nick Guerrera
071789b33f Merge branch 'release/2.0.0' into merge-release-2.0 2017-05-05 16:21:15 -07:00
Matt Ellis
b6a2c01cf6 Remove dependency on run.exe
Our build scripts were pulling down all of buildtools and run.exe in
service of "clean.{cmd|sh}". While having consisent commands across
the repos is a good thing to strive for, we are pulling down a bunch
of additional stuff we don't need for simple commands that have well
known analogs (e.g. git clean).

If we had been all in on run.exe, this might have made sense, but we
aren't, so it feels like something we should clean up.

By doing this, we can stop downloading bootstrap from github when we
build (super dangerous anyway because changes in buildtools could have
broken us).

In addition, I changed the way we install dotnet to just invoke the
script in `scripts/obtain/` instead of downloading a version from
GitHub. This makes local development of changes to obtain easier and
removes yet another place we had to download a script.
2017-04-29 14:00:02 -07:00
Livar
9c85fc7fed Merge pull request #6436 from nguerrera/sdk-resolver
Add msbuild sdk resolver
2017-04-28 15:54:07 -07:00
Livar Cunha
7477334c48 Pinning stage0 to a version that rolls tools forward from 1.0 to 2.0 because the deb-tool targets netcoreapp1.0. 2017-04-28 11:21:25 -07:00
Nick Guerrera
afd1d8ed66 Reduce build console output spew 2017-04-27 23:07:18 -07:00
Daniel Plaisted
af9a85fd3f Disable multilevel lookup and fix tests that were depending on .NET Core 1.0 shared framework 2017-04-27 12:56:28 -07:00