Commit graph

84 commits

Author SHA1 Message Date
John Beisner
47da513313
Infrastructure updates: CLI:master -> release/2.1.3xx (#8541)
* 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.

* The "${arg,,}" syntax works well on dev and Jenkins OSX machines but does not work correctly on VSO build machines [likely a lower version of bash on VSO machines]. Therefore, using 'awk' to transforming to lower case. (#8497)

* Orchestrated final publish; CLI:master (#8504)

* Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407

* Changes per code review...

* The orchestrated "PackageVersion" type variables should not be used in any of the 'proj' files of the built build tools under: "build_projects"
2018-02-05 15:50:50 -08:00
jbeisner
ab97a076f2 Putting back 'docker' and 'stage0' parameters in the usage. 2018-01-17 17:56:34 +00:00
jbeisner
b1cc035ff6 Variable name change. 2018-01-12 00:42:16 +00:00
jbeisner
878821a51b Consider case and "target" as possibilities. 2018-01-11 23:36:10 +00:00
jbeisner
12350c4321 Fixing the line endings. 2018-01-11 23:09:31 +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
Jan Vorlicek
1abd2d9209 Enable Alpine 3.6 CLI build
This change enables CLI build for Alpine 3.6 and also adds CI job for
it. It is mostly based on changes that were necessary to
enable building of rhel.6 CLI
2017-12-13 12:10:44 +01: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
7a3dcee2aa Updated usage comments. 2017-12-11 08:12:45 -08:00
John Beisner
b06f6b1954 The target: 'GenerateInstallersAndCopyOutOfSandBox' should be parameterized in run-build.sh. 2017-12-10 18:12:20 -08:00
John Beisner
e69159a335 Fixing the comment. 2017-12-08 17:18:08 -08:00
John Beisner
21e9e7277a The first 'dotnet msbuild ' pass should not run 2 targets: /'WriteDynamicPropsToStaticPropsFiles' and 'BuildAndPublishAllLinuxDistrosNativeInstallers' 2017-12-08 17:06:36 -08:00
John Beisner
3bea47e1fe "${args[@]}" should be: $args
Reference: Jan Vorlicek did some work to enable RedHat6 and part of that work was to change the argument passing in bash.
2017-12-08 11:27:12 -08:00
Livar Cunha
5a0e95897e Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040
* dotnet/release/15.5: (26 commits)
  Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
  One more old style version package name needed to change in redist.
  Fixing the versions of MSBuild and passing the right property to find roslyn files.
  Use "15.5.179" for the other Microsoft.Build.* packages
  Moving the 'MicrosoftBuildPackageVersion' forward.
  Fixing "RuntimeFrameworkVersion"
  Updating version naming convention.
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  ...

	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Test.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	dir.props
	run-build.sh
	src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
	src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
	src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
	src/dotnet/dotnet.csproj
	src/redist/redist.csproj
	src/tool_fsharp/tool_fsc.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.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/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
2017-12-07 09:55:12 -08:00
John Beisner
165f7c4575 The first pass will need the extra args [same as run-build.ps1]. 2017-12-01 12:40:40 -08:00
Jan Vorlicek
41ae8a0f3c Fix issues caused by adding RHEL6 support
There were two issues. One was that additional arguments that are not
recognized by the build.sh script were incorrectly passed as a single
argument in single-quotes to msbuild.
The second issue was that when LD_LIBRARY_PATH was not set, the
dotnet-install.sh script was failing due to its using of the "set -u"
option that prevents usage of unset variables.
2017-09-22 17:51:30 +00:00
Jan Vorlicek
6630c8292b Fix issue and minor cleanup of the RHEL 6 support
This change fixes extraction of the unprocessed args and also implements
few minor changes that @eerhardt has asked for, like renaming the new argument
and changing usage of HostRid to Rid in build/BuildDefaults.props.
2017-09-21 20:38:34 +00: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
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
Kevin Jones
f1fbd6bdd8 Remove --targets from usage. 2017-08-15 09:50:38 -04: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
Nick Guerrera
59bbc5783f Fix test failures in local build due to environment variable filter 2017-06-29 13:45:01 -07:00
William Li
68c71d225b Stop produce duplicated package for VSTS build definition
Currently VSTS is producing duplicate package and they are running into
each other will producing

Today:
Linux x64 build definition: both .deb and .tar.gz
Ubuntu 16.04 build definition: both .deb and .tar.gz (ex.
dotnet-sdk-2.0.0-preview3-006477-linux-x64.tar.gz,
dotnet-sdk-debug-2.0.0-preview3-006477-linux-x64.tar.gz,
dotnet-sdk-internal-2.0.0-preview3-006477-linux-x64.tar.gz)

After this change:
Linux x64: .tar.gz
Ubuntu 16.04: .deb

No change for windows and macOS
Tested on Ubuntu with and without --linux-portable and windows
2017-06-16 07:32:20 -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
Eric Erhardt
eab48e1814 Unpin stage0. 2017-05-31 13:05:30 -05: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
Livar Cunha
a3baacaaf8 Updating the stage0 in release/2.0.0 to use a release/2.0.0 stage0 and turning off implicit package target fallback in the CLI. 2017-04-27 09:29:39 -07:00
Rikard Johansson
cd200fabd3 run-build.sh: use actual exit code ($?)
The parameter passed to `exit` was always 0 (exit code of previous `echo` call). It seems to me that the intention is to terminate the script with the actual exit error code (!= 0).
2017-04-11 07:11:27 +02:00
Jiyoung Yun
f6f1b10fc9 Add --runtime-id option to support cross build
When trying to cross build, Rid needs to change to the target Rid,
but architecture should use x64 as it as host.
In addition to the existing --architecture option, and additional --runtime-id option is required.
2017-04-04 17:47:24 +09:00
Nick Guerrera
815a33415e Unpin stage0 2017-03-23 14:21:04 -07:00
Eric Erhardt
c492e714e6 Enable tests on linux portable build. 2017-03-20 12:23:22 -05:00
Livar
ae6c0d17dc Merge pull request #5990 from livarcocc/enable_more_distros
Enable more distros
2017-03-20 09:36:24 -07:00
Livar Cunha
bb178a5133 Updated tests to the new appropriate TFM 1.1, since we need a shared runtime besides 2.0 in the new distros. Once we have vstest for 2.0 then we won't need it anymore. 2017-03-17 20:32:51 -07:00
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07:00
Omair Majid
df98363da4 Remove --linux-portable from dotnet-install.sh
It duplicates functionality achieved by using `--runtime-id linux-x64`.
Remove it and fix callers.

Keep the the --linux-portable flag in the  build scripts; that now calls
--runtime-id linux-x64 in the install script.
2017-03-17 20:27:02 -04:00
Karthik Rajasekaran
54df3398ea Allow nuget packages to be configured 2017-03-16 12:47:02 -07:00
Karthik Rajasekaran
ed145b37a6 Allow bootstrap directory to be configured 2017-03-10 17:46:12 -08:00