Commit graph

1067 commits

Author SHA1 Message Date
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
William Lee
55f62d9d64
Add install tool command (#8132)
* compose all the parts

* Fix on obtain and shim maker for better end to end experience
  * Fix error when there is space in the middle of path of nuget config
  * Fix path in profile.d is the tmp home path during install
  * better handle of ~home
  * remove profile.d file in uninstall script
  * Fix test since it looks up current directory
  * folder structure inside nupkg to tools/TFM/RID/mytool.dll
  * Add check for config file existence
  * Rename name space to Microsoft.DotNet.ShellShim
  * Rename name space to Microsoft.DotNet.ToolPackage
2017-12-04 14:13:24 -08:00
John Beisner
2cdb5a9f7e
Merge pull request #8119 from natemcmaster/install-script
Add parameter to dotnet-install to support pulling from private blob feeds
2017-12-04 13:28:08 -08:00
William Lee
bf6b5b3773
Use rhel docker image with sudo built in (#8151)
So we do not need to download sudo from the internet everytime we build
2017-12-03 10:15:44 -08:00
Livar Cunha
d613ec5758 Making the cli-test-env shell script runnable and removing test workaround for preview runtimes. It is not needed in master. 2017-11-30 11:50:37 -08:00
Nate McMaster
9a8316cd12 Always append feed_credential to URIs in dotnet-install.{sh,ps1} 2017-11-28 14:23:30 -08:00
Nate McMaster
fd04fdd5f2 Add parameter to dotnet-install to support pulling from private blob feeds 2017-11-28 13:32:32 -08:00
Nate McMaster
3444301dc7 Pipe ldconfig stderr to /dev/null 2017-11-28 13:31:10 -08:00
William Lee
cc80ed43e0
Tools shim maker and env path handling (#8085)
* Tools shim maker and env path handling

Includes component:

* Given executable, create shim (all three OSs)
* Add executable path to Env PATH during first run
* including manual instruction when there is no access
2017-11-27 10:45:43 -08:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
John Beisner
3d52d24058 Separating the 'legacy' URL construction from the 'current' URL construction methods and logic. 2017-10-13 09:43:04 -07:00
John Beisner
282de2bfe2 Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 2017-10-11 10:53:53 -07:00
Jan Vorlicek
41571303c0 Update CentOS 6 base docker image
This update fixes problem with git not supporting https protocol (which
wasn't affecting cli, but the other repos). The image now has a build of
CURL that supports file:// protocol and so I am removing the workaround
from the Dockerfile.
2017-10-11 19:05:17 +02:00
Jan Vorlicek
ee566157cb Fix RHEL 6 Dockerfile
The new base docker image sets the LD_LIBRARY_PATH to /usr/local/lib
and the yum is not compatible with the special CURL version we build.
This change fixes that by clearing the LD_LIBRARY_PATH for the yum
command invocation.
2017-10-10 11:38:55 +02:00
Jan Vorlicek
cdc357ad8f Merge pull request #7771 from janvorli/update-centos-docker-image
Update CentOS 6 Dockerfile
2017-10-06 23:06:30 +02:00
John Beisner
71ef664f73 Merge pull request #7756 from benknoble/quote-fix
Quote variable expansions in dotnet-install.sh
2017-10-06 11:41:25 -07:00
Jan Vorlicek
68fed641a1 Update CentOS 6 Dockerfile
Replace the base image with an updated one that now contains
clang 3.9 with PGO support and also the new git. So we don't
need to build it here anymore.
2017-10-06 01:37:33 +02:00
Nick Guerrera
241bf475f0 Append to existing PATH in build env scripts/cli-test-env.bat
We were clobbering the path down to just one directory
2017-10-05 13:27:49 -07:00
David Ben Knoble
8d671caef4 Remove unnecessary quotes per review 2017-10-04 15:33:45 -04:00
David Ben Knoble
0ee5b46cd7 Remove copy logging; unquote override_switch
The copy logging is no longer needed (cf. 191ffece6)

The quotes around the override switch caused cp to see "" as a target
2017-10-04 12:06:29 -04:00
David Ben Knoble
191ffece69 Log copying during dotnet-install.sh
There's an issue copying some of the files and I can't identify it
specifically. I need to see it in the test output.

I will revert this when I have identified and fixed the problem.
2017-10-04 09:42:12 -04:00
David Ben Knoble
b8e179501f Quote variable expansions in dotnet-install.sh
Fix #5281 to prevent paths with spaces from causing problems due to word
splitting.
2017-10-03 19:24:02 -04:00
Livar Cunha
4bd9bb92cc Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170927-070027
* dotnet/release/2.0.0: (29 commits)
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  ...
2017-09-27 14:35:00 -07:00
Jan Vorlicek
277789bf16 Add Dockerfile for RHEL 6 builds
This change enables building CLI for RHEL 6 in docker container.
2017-09-26 11:50:50 -07:00
John Beisner
38b88c99f1 Removing the trailing '\r' for bash shells; commit hash. 2017-09-26 08:32:11 -07:00
John Beisner
572d2367df Removing the trailing '\r' for bash shells.
https://github.com/dotnet/cli/issues/7392
2017-09-25 19:41:58 -07:00
John Beisner
44326a0a64 Fixing 'librarypath' 2017-09-22 14:16:08 -07:00
John Beisner
0722cce590 Update the installation scripts in release/2.0.0 branch. 2017-09-22 11:25:15 -07: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
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
John Beisner
a5c2cf4faa Logic error...fixing. 2017-09-18 13:05:43 -07:00
John Beisner
5c620978c1 https://github.com/dotnet/cli/issues/6747 2017-09-18 11:54:20 -07:00
William Lee
221ab05346 Use one build definition to produce all Linux distro specific packages (#7615)
By using `./build.sh /t:AllLiuxDistrosNativeInstaller`

Make a sandbox folder after compile step and copy compiled artifact to it. Since the content will be Linux generic, use package step with Docker in different distros.
After finishing all the distro specific packaging, upload all of them at once

Publish to debian only support all distro

Improve perf of AllLiuxDistrosNativeInstaller, by copying more cache in to sandbox

There will be a retry if package command failed
2017-09-14 13:33:46 -07:00
Daniel Plaisted
ec9be1d0d1 Update test environment script to work on Mac OS 2017-09-07 14:36:13 -07:00
Daniel Plaisted
987a5da85a Delete old environment scripts which don't appear to be used or up to date 2017-09-06 18:01:39 -07:00
Daniel Plaisted
ce7ff1cf6b Add build and test environment setup scripts, update developer guide 2017-09-06 17:59:04 -07:00
John Beisner
e0172b5689 Changes per code review... 2017-08-31 13:40:32 -07:00
John Beisner
8a150f89a3 Miscellaneous script fixes... 2017-08-31 13:18:42 -07:00
John Beisner
735188e023 Merge pull request #7377 from mikeharder/mikeharder/libcurl
Add prereq check for libcurl
2017-08-31 09:27:22 -07:00
William Li
7f54ccb903 Use Rest Api to upload to the feed
Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script
2017-08-30 06:54:34 -07:00
Nick Guerrera
4f6a2ae0a2 Merge pull request #7515 from natemcmaster/non-versioned-files
Add -SkipNonVersionedFiles to dotnet-install.{sh,ps1}
2017-08-28 21:50:12 -07:00
John Beisner
9af126356b Merge pull request #6981 from dotnet/namc/output
Change usages of Write-Output to Write-Host
2017-08-28 11:55:37 -07:00
Nate McMaster
7586ad844d Add -SkipNonVersionedFiles to dotnet-install.{sh,ps1} 2017-08-24 14:06:38 -07:00
Daniel Plaisted
83f9a374d3 Fix dotnet-install script when latest version file for channel is returned as application/octet-stream 2017-08-14 18:05:30 -07:00
Daniel Plaisted
8c5e955252 Fix dotnet-install script when latest version file for channel is returned as application/octet-stream 2017-08-14 18:05:04 -07:00
William Li
6164c26938 Remove comment
This is fine
2017-08-10 09:46:02 -07:00
Mike Harder
bc6c795338 Add prereq check for libcurl 2017-08-04 16:28:28 -07:00
John Beisner
1bd48fde5c Passwords/keys should not be passed in the environment via a docker file. 2017-07-26 10:34:50 -07:00
Livar Cunha
cf51d1d30a Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170718-070022
* dotnet/rel/1.1.0:
  Use docker image for opensuse 13.2 from runtime
  MSBuild 15.3.407
  Updated NuGet to 4.3.0-preview4-4273
2017-07-18 15:54:04 -07:00
William Li
79ff758a43 Use docker image for opensuse 13.2 from runtime 2017-07-18 14:25:45 -07:00