Commit graph

5385 commits

Author SHA1 Message Date
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
Livar Cunha
c980290431 Adding DropSuffix and ReleaseSuffix as enviroment variables passed down to docker. 2017-02-11 23:55:38 -08:00
Livar
bdf9ebee1c Merge pull request #5634 from livarcocc/drop_suffix
Drop suffix on the version of the CLI based on a DropSuffix property
2017-02-11 15:09:53 -08:00
Livar
251237b481 Merge branch 'rel/1.0.0' into drop_suffix 2017-02-11 11:52:10 -08:00
Livar Cunha
9f2ca9989c Introducing a in DependencyVersions to facilitate these updates in the future. Also aligns with master. 2017-02-10 23:05:16 -08:00
Livar Cunha
1d61bf97ed Updated the Shared Framework to 1.1.1 and 1.0.4. 2017-02-10 23:05:16 -08:00
Piotr Puszkiewicz
6091a4704c Merge pull request #5669 from livarcocc/update_msbuild
Updating msbuild to 15.1.0-preview-000545-01.
2017-02-10 19:39:19 -08:00
Eric Erhardt
01d2505c03 Merge pull request #5662 from eerhardt/FixNetStandardLibrary
Fix dotnet new classlib to contain the correct NETStandard.Library version.
2017-02-10 20:26:11 -06:00
Piotr Puszkiewicz
e9561f949f Merge pull request #5661 from dotnet/dev/jgoshi/refactorTasks
Refactor tasks used in generate static props files
2017-02-10 18:01:11 -08:00
Livar
078941ff51 Merge branch 'rel/1.0.0' into update_msbuild 2017-02-10 17:52:01 -08:00
Piotr Puszkiewicz
40751389e9 Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-10 17:44:41 -08:00
Piotr Puszkiewicz
eaa24012ea Merge pull request #5655 from dotnet/blackdwarf-patch-1
Update README.md
2017-02-10 17:42:09 -08:00
Livar Cunha
167e2da398 Updating msbuild to 15.1.0-preview-000545-01. 2017-02-10 16:13:15 -08:00
Krzysztof Wicher
2917598544 Remove IsAncestor and use PathUtility.IsChildOfDirectory instead 2017-02-10 15:50:48 -08:00
Krzysztof Wicher
e3b36b2b65 remove leftover from debugging 2017-02-10 14:27:41 -08:00
Justin Goshi
483e6bd9c1 Address PR comments 2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8 Merge branch 'master' into dev/jgoshi/refactorTasks 2017-02-10 13:38:07 -08:00