Commit graph

5188 commits

Author SHA1 Message Date
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
Livar
d1a844da2c Merge branch 'rel/1.0.0' into dev/jgoshi/dotnetAddDefaultProjectTypeGuid 2017-02-15 14:10:10 -08:00
Livar
58b6a0810f Merge pull request #5715 from piotrpMSFT/piotrpMSFT/bump/15.1.548
Bump MSBuild to 15.1.548
2017-02-15 14:09:47 -08:00
Livar
a1f4e81aec Merge branch 'rel/1.0.0' into piotrpMSFT/bump/15.1.548 2017-02-15 13:03:27 -08:00
Livar
e427bc0d9a Merge pull request #5721 from livarcocc/fix_PUBLISH_NUPKG_TO_AZURE_variable_name
The variable was missing dollar sign parenthesis in the target file.
2017-02-15 13:03:06 -08:00
Steve Desmond
bcad939b91 don't try to make crossgen executable if crossgen is disabled (it might not exist!) 2017-02-15 15:39:55 -05:00
Justin Goshi
e66f6cd1a3 Do not rename the file yet 2017-02-15 12:05:36 -08:00
Justin Goshi
4d38a9be97 Fix the file 2017-02-15 12:00:57 -08:00
Justin Goshi
74493a13e9 Delete the renamed file 2017-02-15 11:59:51 -08:00
Justin Goshi
b40635f8df Fix up the file 2017-02-15 11:59:30 -08:00
Justin Goshi
2f298ed616 Now add the original file without any rename 2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30 One more try. Delete the file first 2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0 try new spacing 2017-02-15 11:54:35 -08:00
Livar Cunha
6c07b929bd The variable was missing dollar sign parenthesis in the target file. 2017-02-15 11:53:31 -08:00
Justin Goshi
0c7a94e7cb Trying to figure out spacing 2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d fix tabs 2017-02-15 11:51:00 -08:00
Justin Goshi
688195b8b5 try again 2017-02-15 11:47:33 -08:00
Justin Goshi
e85f4069c4 Now rename 2017-02-15 11:43:27 -08:00
Justin Goshi
7a894df413 Trying to fix the diff of one file 2017-02-15 11:42:34 -08:00
Livar Cunha
8d38a2a67f Making the tool name comparison with the package case insensitive, so that tools are not required to be declared with the exact casing as the packages that contain them. 2017-02-15 11:33:59 -08:00
Justin Goshi
72db23ed4d Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 10:28:47 -08:00
Piotr Puszkiewicz
627c03b070 Bump MSBuild to 15.1.548 2017-02-14 22:47:37 -08:00
Piotr Puszkiewicz
4cc0f9d8a5 Merge pull request #5706 from dotnet/naamunds/signing-msbuild15-fix
Remove import of dir.props from Signing.proj
2017-02-14 22:32:24 -08:00
Piotr Puszkiewicz
4634d0e120 Merge pull request #5657 from codito/tp20170210-02
Insert TestPlatform v15.0.0-preview-20170210-02.
2017-02-14 18:08:15 -08:00
Piotr Puszkiewicz
175ac5fc2e Merge pull request #5686 from omajid/master
Use dotnet-install from the cli master branch
2017-02-14 17:07:58 -08:00
Piotr Puszkiewicz
25e0020da5 Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 16:51:59 -08:00
Piotr Puszkiewicz
0576d0c71b Merge pull request #5702 from livarcocc/fix_chmod_permissions
Running chmod after crossgen so that our chmod changes are not overwritten by it
2017-02-14 16:51:43 -08:00
Nate Amundson
73d59c423d Remove import of dir.props from Signing.proj
The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.)  Once the agents have MSBuild 15, this import can be added back.
2017-02-14 16:49:57 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00