Commit graph

5351 commits

Author SHA1 Message Date
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
Livar
4c77764661 Merge pull request #5673 from livarcocc/new_shared_framework_versions
New shared framework versions 1.0.4 and 1.1.1
2017-02-13 15:31:56 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -08:00
Livar
ec0f544203 Merge pull request #5680 from livarcocc/migrate_rtm_packages
Updating the version of the ASP.NET packages that we migrate to, to the RTM version.
2017-02-13 13:44:15 -08:00
jonsequitur
f1bf1d83aa remove calls to DisplayAsError 2017-02-13 13:35:43 -08:00
jonsequitur
bb9cdf5725 make string consistent 2017-02-13 13:35:43 -08:00
jonsequitur
baf1f76b6f undelete some unused localizable strings 2017-02-13 13:35:43 -08:00
jonsequitur
7ce780c59c remove apostrophe 2017-02-13 13:35:41 -08:00
jonsequitur
1a0adcbe5a fix loc text dependent test 2017-02-13 13:35:41 -08:00
jonsequitur
43c9b363b0 remove unused and incorrect localizations 2017-02-13 13:34:20 -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
Livar Cunha
6670301493 Modifying the docker environment variables to be upper case, because that's how VSO passes them along. 2017-02-13 12:56:10 -08:00
Piotr Puszkiewicz
3806eeb151 Merge pull request #5660 from krwq/2017-02-10-tamisol
TestAssets Isolation
2017-02-13 11:24:43 -08:00
Omair Majid
d999f22788 Use dotnet-install from the cli master branch
During the cli build, the cli downloads and executes the bootstrap
script from buildtools. The bootstrap script then downloads and executes
the dotnet-install script from cli, but in the 'rel/1.0.0' branch, not
the master branch.

This means that someone building cli's master branch will end up using
the dotnet-install.sh or dotnet-install.ps1 script from cli's rel/1.0.0
branch.

Fix that by telling the bootstrap script to download and use the version
of dotnet-install script from the master branch (which is the current
branch the user is building).

Ideally, we would just call the dotnet-install script in the current
repo/branch, but because the bootstrap script sits in the middle and is
part of a different repository, we can't.

This is a workaround for #5410.
2017-02-13 14:12:19 -05:00
Livar Cunha
02c70abe49 Updating the version of the ASP.NET packages that we migrate to, to the RTM package versions. 2017-02-12 22:09:44 -08:00
Livar
2384b5f1a8 Merge pull request #5677 from livarcocc/more_docker_variables
Adding DropSuffix and ReleaseSuffix as enviroment variables passed down to docker.
2017-02-12 00:37:19 -08:00