mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6116 commits 41 branches 190 tags 95 MiB
Commit graph

6116 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version. 
Fix #5638
 2017-02-10 14:22:07 -06:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Eric Erhardt
e7689a3116 Merge pull request #5648 from eerhardt/master-UpdateDependencies 
Upgrade update-dependencies
 2017-02-10 14:02:12 -06:00
Krzysztof Wicher
dbd278e65e adjust nuget.config paths 2017-02-10 10:57:36 -08:00
Krzysztof Wicher
f77c5d76cb copy files and direct restore and build without adjusting paths 2017-02-10 10:54:05 -08:00
Eric Erhardt
31ff72e62d Respond to PR feedback. 2017-02-10 11:53:27 -06:00
Krzysztof Wicher
4952a819d4 wip 2017-02-10 09:49:21 -08:00
Arun Mahapatra
4621c1a6ec Insert TestPlatform v15.0.0-preview-20170210-02. 2017-02-10 21:58:34 +05:30
Zlatko Knezevic
654f835d50 Update README.md 
Change the links on the dotnet/README.md to point aka.ms/dotnet-* set of links.
 2017-02-10 00:01:56 -08:00
Livar
1c896d4402 Adding release suffix as a modified parameter of the build and removing NugetVersionForVS. we don't need that concept. 2017-02-09 22:31:46 -08:00
Piotr Puszkiewicz
68ad8bdec6 Merge pull request #5653 from jonsequitur/string-fix-for-cache-priming 
remove redundant word 'create'
 2017-02-09 22:24:30 -08:00
jonsequitur
bee34cc0ff remove redundant word 'create' 2017-02-09 18:28:34 -08:00
Livar Cunha
81a94c0902 Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI. 2017-02-09 15:47:53 -08:00
eerhardt
72af77de1b Update CoreSetup to beta-001509 2017-02-09 16:56:32 -06:00
Eric Erhardt
1e20550f5d Upgrade update-dependencies script. 
- Take the latest VersionTools, so we can take advantage of new features.
- Update what files need to be updated - DependencyVersions.props.
- Clean up the powershell script.
 2017-02-09 16:56:19 -06:00
Piotr Puszkiewicz
0986cc079a Merge pull request #5617 from dotnet/dev/jgoshi/firstPassProps 
Generate host and build info and store them in .props files
 2017-02-09 13:22:12 -08:00
Unknown
ee34309e4a Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	build/Microsoft.DotNet.Cli.Prepare.targets
 2017-02-09 11:00:02 -08:00
Piotr Puszkiewicz
806b294777 Overwrite props files if they exist 2017-02-09 10:50:21 -08:00
Eric Erhardt
5406d2af14 Merge pull request #5600 from piotrpMSFT/piotrpMSFT/merge/rel100toMaster 
Merge rel/1.0.0 to Master
 2017-02-09 12:14:45 -06:00