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
Piotr Puszkiewicz
a906069859
Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj
...
Remove more properties from build.proj
2017-02-14 16:19:53 -08:00
Piotr Puszkiewicz
101d57dcb5
Merge pull request #5462 from ramarag/dotnet-cache
...
Dotnet cache
2017-02-14 16:18:53 -08:00
Livar
9e0a63852c
Merge branch 'rel/1.0.0' into fix_chmod_permissions
2017-02-14 15:48:34 -08:00
Piotr Puszkiewicz
6415c2334a
Merge branch 'rel/1.0.0' into tp20170210-02
2017-02-14 15:47:24 -08:00
Justin Goshi
149a4590b5
Do not add duplicate projects ( #5698 )
2017-02-14 15:47:06 -08:00
Justin Goshi
62abef428e
Rename build files
2017-02-14 15:42:13 -08:00
Justin Goshi
4d24ae06bb
Default to C# project type guid
2017-02-14 14:57:04 -08:00
Livar
4d9e7f959a
Merge pull request #5700 from livarcocc/update_version_test
...
Updating the version test to use .version file instead of regex
2017-02-14 13:59:50 -08:00
Livar Cunha
8a53b08959
Running chmod after crossgen so that our chmod changes are not overwritten by it.
2017-02-14 13:13:08 -08:00
Matt Ellis
0e0a419a3d
Merge pull request #5695 from ellismg/fix-update-script
...
Get update-dependenices working again
2017-02-14 11:26:30 -08:00
Livar Cunha
54464dda36
Updating the version test to check that dotnet --version uses the .version file instead of using a regular expression to validate the printed version.
2017-02-14 10:32:11 -08:00
Justin Goshi
87ee130ab5
Create CoreSetupInfo.props
2017-02-14 10:30:28 -08:00
Rohit Agrawal
9cf8e8c57f
update nuget to 4.0.0-rtm-2283 ( #5691 )
2017-02-13 18:11:51 -08:00
Rama Krishnan Raghupathy
c20e106d75
Adding End to End test for cache and filtered publish
2017-02-13 17:56:25 -08:00
Justin Goshi
3b9ecf7f86
Address PR comments
2017-02-13 17:37:23 -08:00
Matt Ellis
5d932c6aba
Get update-dependenices working again
...
- Fix build issues due to .props file not existing on a clean
enlistment
- Fix path separator issues on *NIX
- Add update-dependencies.sh
- Support -Update in update-dependencies.ps1
2017-02-13 17:30:33 -08:00
Livar
eca4905466
Merge pull request #5689 from livarcocc/upper_case_docker_params
...
Modifying the docker environment variables to be upper case
2017-02-13 17:04:24 -08:00
Rama Krishnan Raghupathy
4fdc72890a
Appending dotnet publish xlf
2017-02-13 16:01:16 -08:00
Rama Krishnan Raghupathy
da2cb43949
Adding xlf for dotnet cache
2017-02-13 16:01:10 -08:00
Rama Krishnan Raghupathy
badab4680d
Adding the shim of dotnet-cache
...
Adds filter profile option to publish
2017-02-13 16:01:06 -08:00
Livar
6833d479f4
Merge branch 'rel/1.0.0' into upper_case_docker_params
2017-02-13 15:32:15 -08:00
