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
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
25e0020da5
Merge branch 'rel/1.0.0' into tp20170210-02
2017-02-14 16:51:59 -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
6415c2334a
Merge branch 'rel/1.0.0' into tp20170210-02
2017-02-14 15:47:24 -08:00
Justin Goshi
62abef428e
Rename build files
2017-02-14 15:42:13 -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
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
Justin Goshi
3b9ecf7f86
Address PR comments
2017-02-13 17:37:23 -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
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
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
251237b481
Merge branch 'rel/1.0.0' into drop_suffix
2017-02-11 11:52:10 -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
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
Livar Cunha
167e2da398
Updating msbuild to 15.1.0-preview-000545-01.
2017-02-10 16:13:15 -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
Arun Mahapatra
4621c1a6ec
Insert TestPlatform v15.0.0-preview-20170210-02.
2017-02-10 21:58:34 +05:30
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
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
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
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
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 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
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
