Commit graph

70 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
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
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -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
3cb1cca44d Third pass clean-up of package names. 2017-12-04 09:44:51 -08:00
John Beisner
4d694d2c56 Second pass clean-up of package names; resequencing download. 2017-12-04 09:31:28 -08:00
John Beisner
0f7783f72b Fixed typo... 2017-12-01 13:59:25 -08:00
John Beisner
c54911b788 Dependency Uptake: download and import a package version props file. 2017-12-01 12:39:51 -08:00
John Beisner
e7f4fb001b Writing a NuGet.config as part of the preparatory steps. 2017-11-28 12:54:32 -08: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
ca34332205 Rename Stage0 build variables to PreviousStage
(cherry picked from commit c6e4c8f477)
2017-09-27 14:37:37 -07:00
Daniel Plaisted
2b134c91fe Support new artifacts layout in tests and other build logic
(cherry picked from commit 13da213183)
2017-09-27 14:20:05 -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
c6e4c8f477 Rename Stage0 build variables to PreviousStage 2017-08-24 17:16:11 -07:00
Daniel Plaisted
13da213183 Support new artifacts layout in tests and other build logic 2017-08-24 15:49:13 -07:00
Daniel Plaisted
a463a34ac5 Update CliTargetFramework to netcoreapp2.1, and switch from hardcoding to using the variable in places 2017-08-23 10:40:26 -07:00
Livar Cunha
253a6c5add Turning off implicit restore when publishing the build project. 2017-06-08 17:00:01 -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 Cunha
df496d0959 Fixing the extra distros. 2017-03-20 12:41:47 -07:00
Justin Goshi
45a1e9e56c Allow host info passed in from the command line to override machine settings (#5904)
* Allow host info passed in from the command line to override machine settings

* Simplify the logic

* Address PR comments to keep a separate HostRid and HostOSName that are static

* Rename to BuildInfo.props

* Address PR comments

* Fix the previous merge

* Fix spacing

* Address PR comments
2017-03-08 09:10:53 -10:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647)
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
2017-02-13 13:06:30 -08:00
Piotr Puszkiewicz
6b7ad0544f small refactor 2017-02-09 00:26:40 -08:00
Justin Goshi
12e540920b Fix build break 2017-02-08 19:34:48 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Justin Goshi
50493d2dab Address PR comments 2017-02-08 14:02:29 -08:00
Justin Goshi
b927922b65 Address PR comments and fix build break 2017-02-07 16:52:08 -08:00
Eric Erhardt
d4153815d5 Update the CLI to netcoreapp2.0. 2017-01-26 07:28:59 -06:00
Piotr Puszkiewicz
d14698f1f6 Bump MSBuild Version to 15.1.0-preview-000503-01 (#5199)
* Bump MSBuild Version to 15.1.0-preview-000503-01

* tool_csc->tool_roslyn

* pull some properties up to dir.props

* Move Roslyn to "Roslyn" subdirectory

* Fix relative paths in RunCsc.*

* Add removal of csc & vbc from deps.json

* Revert roslyn to 2.0.0-rc3-61212-03

* netcoreapp -> 1.0.3
2017-01-05 14:56:11 -08:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06: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
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
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
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
Livar Cunha
33d930cced Updating the versions in build.proj. 2016-09-02 16:46:04 -07:00
Livar Cunha
1767385aa1 Updating versions in a few places that did not exist in the preview2 branch. 2016-09-02 15:01:59 -07:00
Livar Cunha
8bd9430660 Removing the hack that added Microsoft.WindowsAzure.Storage.dll to stage0 because of an issue in msbuild. 2016-08-11 16:09:06 -07:00
Eric Erhardt
70c80bf2d3 Fix CI by not copying Microsoft.DotNet.PlatformAbstractions to stage0, since it is already loaded into the stage0 dotnet process. 2016-08-11 07:42:23 -05:00
Livar Cunha
dc7f1fdf84 Updating the xunit version to one that does not depend on internalabstractions. 2016-08-10 13:40:13 -07:00
Livar Cunha
b7b90175f4 Removing the public types from InternalAbstractions. 2016-08-10 13:39:49 -07:00
Eric Erhardt
e6ed1bd32f Completely remove buildtools from our build. 2016-08-09 10:28:51 -05:00
Livar Cunha
567cd8e1b5 Adding the trailing slash in the directory property. BuildTools needs it like that and that is the pattern in MSBuild. 2016-07-27 15:59:55 -07:00
Livar Cunha
f31a135264 Loading Build.Common.targets, a common targets for BuildTools. We need it to fix the Publish failures we have been hitting. 2016-07-27 15:18:59 -07:00
PiotrP
97bc5e3cb7 Define build-tools required prop ToolsDir. 2016-07-26 18:22:58 -07:00
Jonathan Miller
3a6e15309e Bringing run.exe into the repo and starting with the clean command 2016-07-26 16:15:36 -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
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
Livar Cunha
01b4981461 Addressing code review comments 2016-07-15 13:44:11 -07:00