Commit graph

5351 commits

Author SHA1 Message Date
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
Eric Erhardt
454dd10f8d Update dotnet new to use the new 2.0 templates. 2017-02-09 10:18:39 -06:00
Piotr Puszkiewicz
6b7ad0544f small refactor 2017-02-09 00:26:40 -08:00
Livar
a88df7953c Merge branch 'rel/1.0.0' into drop_suffix 2017-02-08 20:35:49 -08:00
Livar
f2ad5a39ab Merge pull request #5624 from dotnet/dev/jgoshi/deprecatedMigrate
Migrate compilationOptions even when other deprecated options are present
2017-02-08 20:35:29 -08:00
Justin Goshi
12e540920b Fix build break 2017-02-08 19:34:48 -08:00
Justin Goshi
13fd6d85d7 Remove stuff from prepare.targets 2017-02-08 19:22:56 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Livar
f5618b8969 Merge branch 'rel/1.0.0' into dev/jgoshi/deprecatedMigrate 2017-02-08 18:23:24 -08:00
Livar
a8c88b4f37 Merge pull request #5628 from dotnet/updatenuget-2275
update nuget to 4.0.0-rtm-2275
2017-02-08 18:23:10 -08:00
Livar Cunha
d373ce8911 Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts. 2017-02-08 18:17:04 -08:00
Justin Goshi
b419f25d67 Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 17:18:54 -08:00
Piotr Puszkiewicz
8b71ebef9a Merge branch 'rel/1.0.0' into updatenuget-2275 2017-02-08 16:45:46 -08:00
Livar Cunha
35fc8c1d0e Step one of introducing a flag to drop the suffix out of our build versions. 2017-02-08 15:26:47 -08:00
Eric Erhardt
0dc62d0778 Merge pull request #5627 from eerhardt/FixSln
Fix the CLI .sln file to load and build in VS 2017.
2017-02-08 17:18:04 -06:00
Justin Goshi
5e3f368338 Update the test 2017-02-08 14:26:14 -08:00