Commit graph

5116 commits

Author SHA1 Message Date
Matt Ellis
921c116c65 Consume local info support from VersionTools
Davis added support for VersionTools to be able to pull from a local
filesystem layout that looks like what we have in GitHub on
dotnet/versions.

Start to consume this so a composed build can use this logic to update
dependencies using local version information produced during the build.
2017-02-21 16:56:00 -05:00
Justin Goshi
b58a0210e2 Refactor properties from LzmaCompile.targets 2017-02-21 12:52:17 -08:00
Justin Goshi
f8148abec3 merge 2017-02-21 10:16:07 -08:00
Justin Goshi
27a11e4eca Merge branch 'master' into dev/jgoshi/morePropsRename 2017-02-21 10:00:30 -08:00
Livar
99f7eb4843 Merge pull request #5699 from krwq/2017-02-13-psi-extraction
Unit tests for dotnet build
2017-02-19 09:57:07 -08:00
Livar
c85047cfb3 Merge pull request #5751 from piotrpMSFT/piotrpMSFT/merge/rel1.0.0
merge rel/1.0.0 into master
2017-02-19 09:56:20 -08:00
Livar Cunha
3ff78c64ff Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix. 2017-02-18 22:03:36 -08:00
Piotr Puszkiewicz
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Justin Goshi
4f209e61ea Refactor properties out of test.targets 2017-02-17 12:28:25 -08:00
Justin Goshi
30a43b3bda Merge 2017-02-17 09:53:00 -08:00
Piotr Puszkiewicz
85b2a129db Merge branch 'rel/1.0.0'
Conflicts:
	TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
	TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
	TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
	build.proj
	build/Compile.targets
	build/Microsoft.DotNet.Cli.Compile.targets
	build/Microsoft.DotNet.Cli.DependencyVersions.props
	build/Microsoft.DotNet.Cli.Monikers.props
	build/Microsoft.DotNet.Cli.Prepare.targets
	build/package/Microsoft.DotNet.Cli.Nupkg.targets
	build/package/Nupkg.targets
	build/test/TestPackageProjects.targets
	build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
	build_projects/dotnet-cli-build/GetCommitCount.cs
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
	src/dotnet-archive/dotnet-archive.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_nuget/tool_nuget.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/ArgumentsReflector/ArgumentsReflector.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/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/crossgen.Tests/crossgen.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-build.Tests/dotnet-build.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
	test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
	test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-run.Tests/dotnet-run.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
	test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
	test/dotnet-test.Tests/dotnet-test.Tests.csproj
	test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
	test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
	tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Piotr Puszkiewicz
a801d387d0 Merge pull request #5739 from dotnet/dev/jgoshi/refactorCompileProps
Refactor properties out of Compile.targets
2017-02-17 00:55:13 -08:00
Justin Goshi
23a3879f46 Fix build break 2017-02-16 16:42:49 -08:00
Justin Goshi
5359ce47e9 Rename 2017-02-16 15:10:18 -08:00
Justin Goshi
e232e7d386 Revert the new file name 2017-02-16 15:09:42 -08:00
Justin Goshi
8acaadb625 Revert the rename 2017-02-16 15:09:08 -08:00
Krzysztof Wicher
ae05e8af1d remove parameterless constructor 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
6f1ea62bc9 rename variable to buildCommand 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
e6578eeb14 split msbuildforwardingapp unit tests with build invocation 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
1b7d4e3200 split env var test 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
39feabd941 patterns for environmental variables 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
27d358c884 add EOLs in the end of files 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
531b0136eb add tests for checking filename, working dir and validation of presence of environmental variables 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
8ad8fe7e8e complete dotnet-build invocation test cases 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
8ebc06da46 add more unit tests 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
9c00966956 preview of single unit test for dotnet build 2017-02-16 14:22:02 -08:00
Justin Goshi
58d167f3e5 Refactor properties out of Compile.targets 2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0 Finish renaming props file to remove Microsoft.Dotnet.Cli prefix 2017-02-16 11:16:20 -08:00
Piotr Puszkiewicz
dfde101b7c Merge pull request #5610 from jonsequitur/NonWindowsFactAttribute
use WindowsOnlyTheory where appropriate, introduce NonWindowsOnlyFactAttribute
2017-02-16 11:06:41 -08:00
Piotr Puszkiewicz
d3d6bdebd1 Merge pull request #5618 from jonsequitur/remove-incorrect-localizations
Remove incorrect localizations
2017-02-16 11:05:36 -08:00
Piotr Puszkiewicz
bde27ccbc9 Merge pull request #5705 from dotnet/dev/jgoshi/renamePropsFiles
Rename props files
2017-02-16 11:02:07 -08:00
Piotr Puszkiewicz
ede77f3d7a Merge pull request #5731 from piotrpMSFT/piotrpmsft/cleanup/remove-dotnet-restore-projectjson
remove dotnet restore-projectjson
2017-02-16 10:17:50 -08:00
Justin Goshi
c8fb586677 merge 2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
4feaf3f124 Remove dotnet-restore-projectjson 2017-02-16 01:01:32 -08:00
Piotr Puszkiewicz
b38fd3ad7b Merge pull request #5716 from piotrpMSFT/piotrpMSFT/infra/FinishPrepareProps
Removes remaining PropertyGroups from targets inside prepare.targets
2017-02-15 21:34:47 -08:00
Piotr Puszkiewicz
1f026bc530 Merge pull request #5728 from krwq/2017-02-15-attempt-to-fix-intermittent-failures
Attempt to fix intermittent failures with ...CLIRetriesLaunchingTheCommandForAtLeastOneSecond
2017-02-15 21:33:42 -08:00
Piotr Puszkiewicz
159f7a1547 Fix up sln file 2017-02-15 19:38:50 -08:00
Piotr Puszkiewicz
0e5633e527 Remove BundledRuntimes properties 2017-02-15 19:37:51 -08:00
Krzysztof Wicher
9d589668c0 more locks 2017-02-15 17:49:40 -08:00
Krzysztof Wicher
1f07e1e2e3 attempt to fix intermittent failures 2017-02-15 17:49:40 -08:00
Piotr Puszkiewicz
05e60505b0 Merge pull request #5726 from krwq/2017-02-15-fixbuild
Fix build on master caused by newly added refs to TestAssetsManager
2017-02-15 17:31:40 -08:00
Justin Goshi
e7de32e988 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
Matt Ellis
47b75cfa12 Misc build changes
For injestion into a composed build, I'm adding some minor tweaks to
our build system:

 - Teach DownloadFile task how to consume file:// URLs so we can pass
   around artifacts using local sources.
 - Add `SkipBuildingInstallers`, an MSBuild property that can be set
   to true when installers (pkgs, msis, debs, rpms and the like) do
   not need to be built.
 - Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
   can be set to prevent additional shared frameworks (i.e. shared
   frameworks that the CLI does not use at runtime) from being
   downloaded and included in our payload.
 - Add `IncludeNuGetPackageArchive` an MSBuild property that can be
   set to prevent the lzma archive containing all the nupkgs we
   restore on first run from being included in the final output.
 - Provide a way to change the Uri use for blob storage (so the
   composed build and point at a local folder that looks like blob
   storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Krzysztof Wicher
6d4ef71083 fix newly added remainings of TestAssetsManager 2017-02-15 16:33:21 -08:00
Livar
7fe8d37fa8 Merge pull request #5720 from livarcocc/ignore_case_tools
Making the tool name comparison with the package case insensitive
2017-02-15 16:24:53 -08:00
Justin Goshi
2664015e55 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 16:01:37 -08:00
Livar
47c16b271e Merge branch 'rel/1.0.0' into ignore_case_tools 2017-02-15 15:35:53 -08:00
Livar
860c451229 Merge pull request #5703 from dotnet/dev/jgoshi/dotnetAddDefaultProjectTypeGuid
Default to C# project type guid
2017-02-15 15:35:40 -08:00
Krzysztof Wicher
a6bc22e499 Remove TAM (#5670)
* remove reference to TestAssetsManager in dotnet-add-reference

* remove TestAssetsManager dependency from dotnet-build

* remove TAM ref from dotnet-list-reference

* remove TAM dependency from dotnet-msbuild

* remove TAM dependency from ProjectJsonMigration tests

* remove TAM dependency from dotnet.Tests

* remove TAM dependency from dotnet-new.Tests

* remove TAM from dotnet-pack.Tests

* remove TAM from dotnet-publish.Tests

* remove TAM from dotnet-restore.Tests

* remove TAM dependency from dotnet-remove-reference.Tests

* remove TAM dependency from dotnet-run.Tests

* remove TAM dependency from dotnet-test.Tests

* remove TAM dependency from Microsoft.DotNet.Cli.Utils.Tests

* remove TAM from TestBase

* remove TAM

* remove newly introduced dependency on TAM
2017-02-15 15:35:03 -08:00
Eric Erhardt
511d7e96a1 Merge pull request #5722 from stevedesmond-ca/no-xgen-exe-check
don't try to make crossgen executable if crossgen is disabled (it might not exist!)
2017-02-15 14:31:38 -08:00