Commit graph

1953 commits

Author SHA1 Message Date
Livar Cunha
71aa93b164 Merging metadata with different values by setting the metadata values to be string joined and semi-column separated. This fixes the problem of having multiple mappings for the same file in a include/mappings. 2016-10-25 15:26:04 -07:00
Livar Cunha
175eaeb5c1 When determining the P2P dependencies, only use dependencies of type project. This prevents us from migrating a package dependency as a project dependency because of a project with the same name being present. 2016-10-25 13:09:06 -07:00
Faizan Ahmad
33caa408a1 1) Added support to run test from test3 verb for the project targeting multiple TFM
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
2016-10-25 20:10:18 +05:30
Livar
2cc007520d Merge pull request #4479 from livarcocc/projectdependencies_full_framework
Making OutputPathCommandResolver work with MSBuild.
2016-10-24 16:18:15 -07:00
Livar Cunha
1506bf3bf2 Changing the IProject OutputPath property to FullOutputPath. 2016-10-24 14:47:05 -07:00
Livar
f68670e13c Merge pull request #4438 from jeffkl/restore
Reduce MSBuild verbosity for restore
2016-10-24 12:49:07 -07:00
Livar Cunha
d61ebd3087 Making OutputPathCommandResolver work with MSBuild. 2016-10-24 12:41:27 -07:00
Livar Cunha
be419e3b70 Fixing project dependencies migration so that they are only conditioned when they where under a TFM in the project.json to begin with. 2016-10-21 18:00:17 -07:00
Livar
d8bf015d7c Merge pull request #4459 from livarcocc/package_files
Package files
2016-10-20 21:01:02 -07:00
Bryan Thornbury
5301f08423 turn on signing test (#4460)
* turn on signing test

* fix the test

* test with xplat AssemblyOriginatorKeyFile

* tweak signassembly condition
2016-10-20 20:15:42 -07:00
Livar Cunha
095105f2ec Addressing code review comments. 2016-10-20 14:35:45 -07:00
Livar Cunha
ddef1fc424 Adding pack files migration. 2016-10-20 11:56:07 -07:00
Bryan Thornbury
ecbc45098d Add support for Migration defaults (#4242)
* Add support for sdk props/targets defaults to Migration.

* fix the transform applicator

* remove transform applicator dependency on insertion order for item merges

* defaults constructor msbuild version change
2016-10-20 11:00:41 -07:00
Livar
501d575aeb Merge pull request #4455 from livarcocc/update_sdk
Updating the SDK version to the latest.
2016-10-19 20:55:43 -07:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -07:00
Livar Cunha
22bc479927 Updating msbuild to 15.1.319-preview5 2016-10-19 12:43:21 -07:00
Livar
b7ac730a7f Merge pull request #4444 from livarcocc/update_templates
Updating the msbuild templates in the CLI to use TargetFramework
2016-10-18 17:39:03 -07:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Livar Cunha
440871bad0 Removing -t msbuild, now that the default template is msbuild. 2016-10-18 10:35:04 -07:00
Jeff Kluge
c98b6cc412 Reduce MSBuild verbosity for restore
Remove the MSBuild logo
Set verbosity to minimal
2016-10-18 09:10:26 -07:00
Eric Erhardt
1b6502848e Respond to PR feedback. 2016-10-17 21:03:09 -05:00
Eric Erhardt
cbeb5b9912 Report a meaningful error when trying to run a multi-TFM project.
Add `--no-build` option to `dotnet run3` since even incrementally building a project takes a non-trivial amount of time.
2016-10-17 21:00:58 -05:00
Justin Goshi
71666cc9b5 Auto add referenced assemblies for desktop migration
* https://github.com/dotnet/cli/issues/4351

Auto add referenced assemblies for desktop migration. Adds the same ones
that the build for project.json does.

* Address PR comments

* Address CR comments

* Address CR comment

Use .ToList() instead of new List

* Fix a build break

Needed .noautobuild file in my test asset project

* Change the migrate test for desktop framework to windows only

* Reducing to 120 characters per line
2016-10-18 01:02:10 +00:00
Piotr Puszkiewicz
cfcc97b3f0 Move Web template to csproj (#4429)
* Move Web template to csproj

* PR Feedback

* Updated template
2016-10-17 14:45:37 -07:00
Livar
6f62a8155c Merge pull request #4395 from livarcocc/projectdependenciescommandresolver
Making Projectdependenciescommandresolver work with MSBuild
2016-10-17 10:45:47 -07:00
Livar Cunha
3798102035 Changing the API to create the MSBuild project to LoadProject and removing some non-existing paths from the RepoDirectoriesProvider. 2016-10-17 08:43:47 -07:00
Livar Cunha
391d04c67a Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running. 2016-10-16 18:44:07 -07:00
Livar Cunha
ce812a64c2 Removing DotnetFiles from Cli.Utils. 2016-10-14 15:46:52 -07:00
Eric Erhardt
c3ddbba163 Rename restore3 --recursive to --no-dependencies to match the build3 option. 2016-10-14 17:28:58 -05:00
Livar Cunha
dab19ce57c Fixing msbuild.exe casing 2016-10-14 14:58:36 -07:00
Livar Cunha
99d6b1fd6d Adding some more tracing to tools command resolvers. 2016-10-14 12:56:18 -07:00
Livar Cunha
d779ab3e3f Fixing the tool used in the test that I changed when trying things out and fixing the code that sets environment variables in the command to check if the environment variable already exists before adding it. 2016-10-14 12:56:18 -07:00
Livar Cunha
318c9f3e44 Making ProjectDependenciesCommandResolver handle msbuild projects as well by using the ProjectFactory and IProject.
Moving the CommandResolution classes that depend on msbuild back into Cli.Utils.

Updating the src projects to a netstandard compatible with Cli.Utils moving to netstandard1.5
2016-10-14 12:56:18 -07:00
Justin Emgarten
bc82b16a01 Merge pull request #4406 from dotnet/emgarten/solutionRestore
Adding recursive restore and solution level restore
2016-10-14 11:18:24 -07:00
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382)
Make csproj templates first-class in dotnet-new.
2016-10-14 00:06:35 -07:00
Justin Emgarten
53b436c5d5 Updating NuGet to 3.6.0-rc-1984 2016-10-13 19:31:15 -07:00
Justin Emgarten
fcdc23233e Recursive restore and solution restore support
This change adds support for restoring solution files with msbuild /t:Restore and dotnet restore3.
Restoring a project file will now recursively restore all dependency projects to match build.

Fixes https://github.com/dotnet/cli/issues/4252
Related to: https://github.com/NuGet/Home/issues/2993
2016-10-13 19:18:02 -07:00
Bryan Thornbury
1926d0e4a4 fix null ref when only one item (#4390) 2016-10-12 16:01:22 -07:00
Bryan Thornbury
f79d78703b remove autounify, fix langversion (#4387)
* remove autounify, fix langversion

* PR feedback
2016-10-12 14:59:36 -07:00
Faizan Ahmad
578edc9350 Rebase with rel/1.0.0 2016-10-12 22:53:43 +05:30
Faizan Ahmad
4dd685a45c Addressed livar PR comment 2016-10-12 15:20:07 +05:30
Justin Emgarten
f2eef338db Updating NuGet to 3.6.0-rc-1979 2016-10-12 00:49:44 -07:00
Faizan Ahmad
391fff1f20 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-12 11:57:46 +05:30
Justin Goshi
07418af874 Fixes #4293
https://github.com/dotnet/cli/issues/4293
2016-10-11 18:25:47 -10:00
Eric Erhardt
ea092717ac Merge pull request #4369 from eerhardt/SingleTFM
Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
2016-10-11 20:59:48 -05:00
Justin Goshi
59f2483fd3 https://github.com/dotnet/cli/issues/4293
Improve help text for commands that shell out to msbuild.
2016-10-11 17:29:09 -07:00
Bryan Thornbury
924c2c2954 Fix Migration Imports (#4350)
* Fix Migration Imports

* turn tests back on

* turn other tests back on

* test update

* update nuget version

* fix string join

* bump nuget version

* undo

* undo

* undo
2016-10-11 15:22:18 -07:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Eric Erhardt
38753d42b0 Fix the tests for targeting netstandard1.3. 2016-10-11 16:01:03 -05:00
Justin Goshi
19abf66412 Fixes issue #4313
Improve error messages for the migrate command
2016-10-11 10:58:49 -10:00
Livar
4780eb667b Merge pull request #4374 from livarcocc/update_msbuild_to_316
Updating the MSBuild version to 15.1.316-preview5.
2016-10-11 11:40:17 -07:00
Piotr Puszkiewicz
28193c5f75 Merge pull request #4303 from dasMulli/feature/dotnet-clean-verb
Added clean3 verb for msbuild based projects.
2016-10-11 11:36:27 -07:00
Livar Cunha
7dec493a8a Updating the MSBuild version to 15.1.316-preview5. 2016-10-11 10:35:40 -07:00
Bryan Thornbury
0a889b2feb Merge pull request #4371 from brthor/brthor/typebuild
Fix Migration type:build
2016-10-11 10:09:28 -07:00
Eric Erhardt
edf2fc1f53 Merge pull request #4367 from eerhardt/NewSdk
Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk.
2016-10-10 20:31:58 -05:00
Bryan Thornbury
0bdd3bd59f type build, suppress parent, include, exclude working 2016-10-10 16:21:55 -07:00
Bryan Thornbury
c44e50dfc4 type build tests 2016-10-10 16:21:53 -07:00
Justin Goshi
48ae5d17ac Improve error messages for the migrate command
https://github.com/dotnet/cli/issues/4313
2016-10-10 15:38:25 -07:00
Livar
31c88e112f Merge pull request #4363 from livarcocc/update_msbuild_313
Updating the msbuild dependencies to 15.1.313-preview5.
2016-10-10 14:16:14 -07:00
Eric Erhardt
85a737c223 Respond to PR feedback.
Small variable rename.
2016-10-10 16:07:31 -05:00
Eric Erhardt
eec324a844 Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
Microsoft.Extensions.Testing.Abstractions is the only one I couldn't move to netstandard1.3 that should be.  But this library should be removed with the new `dotnet test` strategy.
2016-10-10 15:57:08 -05:00
Eric Erhardt
93166dd77c Merge pull request #4361 from eerhardt/RemoveFsc
Remove dotnet-compile-fsc.
2016-10-10 14:17:29 -05:00
Eric Erhardt
633b56e448 Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk. 2016-10-10 14:04:30 -05:00
Livar Cunha
5ff4887dd1 Updating the msbuild dependencies to 15.1.313-preview5. 2016-10-10 09:55:30 -07:00
Livar Cunha
c2bce2e2cc Moving the InferLegacyRestoreRuntime method to Test.Utilities, since it is needed only by tests. 2016-10-10 09:52:39 -07:00
dasMulli
148319a3c2 Added clean3 verb for msbuild based projects. 2016-10-10 18:31:30 +02:00
Eric Erhardt
6cf0327875 Remove dotnet-compile-fsc.
It's new home is https://github.com/dotnet/netcorecli-fsc/
2016-10-10 11:23:46 -05:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Livar Cunha
09d811fdbd Adding an OverrideRid property used in the GetRuntimeInfo task to override the rid of the CLI. This allows us to build for osx.10.11 when building on osx.10.12. 2016-10-08 11:45:19 -07:00
Bryan Thornbury
2727b191e3 Merge pull request #4310 from brthor/brthor/migrationreport
Migration Report
2016-10-07 11:01:06 -07:00
Livar Cunha
167470b1c9 Updating the SDK version, which we need to pick up the NuGetTargetMoniker fix. 2016-10-06 18:31:15 -07:00
Livar Cunha
6242db9b14 Moving msbuild dependencies to msbuild 15. 2016-10-06 17:29:07 -07:00
Bryan Thornbury
fbaf9a679e Project Migration Report 2016-10-06 15:56:15 -07:00
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Faizan Ahmad
3f271e1215 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-06 17:50:59 +05:30
Sridhar Periyasamy
5c6e3a05fb Merge pull request #4305 from dotnet/sridhar-ms/migrate-p2p-fix
Fix P2P migration and migrate folders in global.json
2016-10-05 20:59:39 -07:00
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Bryan Thornbury
d0b28bc7ad remove lock file workaround 2016-10-05 17:02:32 -07:00
Nate McMaster
b38f644347 Merge pull request #4326 from dotnet/namc/user-secrets
Add migration rule for 'userSecretsId'
2016-10-05 16:40:38 -07:00
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Sridhar Periyasamy
a396630576 Fix P2P migration
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
2016-10-05 16:25:28 -07:00
Faizan Ahmad
a8e7df848b Adding support for noBuild, output and framework. 2016-10-06 04:33:54 +05:30
Livar Cunha
bfc1f82d68 Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec. 2016-10-05 15:27:30 -07:00
Nate McMaster
190f0fc756 Rename to MigrateJsonPropertiesRule 2016-10-05 15:15:13 -07:00
Nate McMaster
dd7a76e6f0 Add migration rule for 'userSecretsId' 2016-10-05 15:05:19 -07:00
Fredric Silberberg
b2802cdf50
Added comment about updating in VS calls of dotnet migrate when cli args change. 2016-10-05 14:26:20 -07:00
Bryan Thornbury
50e83b9c65 Merge pull request #4320 from brthor/brthor/toolsrefmigration
dotnet cli migrate tools ref
2016-10-05 13:39:34 -07:00
Livar
7a0dff8a96 Merge pull request #4300 from livarcocc/support_for_toolsref
Support for toolsref
2016-10-05 13:18:12 -07:00
Livar Cunha
465b32dab4 Addressing code review comments. 2016-10-05 11:51:59 -07:00
Bryan Thornbury
1232a38e51 dotnet cli migrate tools ref 2016-10-05 11:36:23 -07:00
Livar Cunha
facbef52ff Changing the code to read tools from csproj because the tools section in assets.json is no longer being populated. 2016-10-04 18:59:44 -07:00
Livar Cunha
1570e0fde4 Moving the ProjectToolsCommandResolver to dotnet out of Cli.Utils because of the dependency on Microsoft.Build. Also added a EndToEnd test for tools ref using the MSBuildTestApp. 2016-10-04 18:59:44 -07:00
Livar Cunha
12e8e8eca7 Temp 2016-10-04 18:58:38 -07:00
Livar Cunha
b4b89c7849 Switch to code to generate deps file for tools using the lock file. 2016-10-04 18:58:38 -07:00
Livar Cunha
05472919af Changing the tool resolution to fully use the NuGet file and no longer rely on the project.json file. 2016-10-04 18:58:38 -07:00
Bryan Thornbury
3149af8941 remove proejct.migrated.json 2016-10-04 16:40:20 -07:00
Bryan Thornbury
49637d0fe9 pr feedback 2016-10-04 16:37:23 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
851ed78605 key 2016-10-04 15:53:14 -07:00
Bryan Thornbury
148008d733 fix key sign 2016-10-04 15:49:35 -07:00
Bryan Thornbury
7632cd3502 Merge pull request #4261 from brthor/brthor/packageref
PackageReference Migration
2016-10-04 14:42:43 -07:00
Bryan Thornbury
21c45de0b7 error preference 2016-10-04 10:45:57 -07:00
Faizan Ahmad
579df78466 - Implementation of test3 verb for single TragetFramework
- E2E test for test3 verb.
2016-10-04 15:37:36 +05:30
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Eric Erhardt
d4d2be5f8c Fix the merge of preview2 to build correctly. 2016-10-03 14:48:33 -05:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05:00
Faizan Ahmad
b240b855c1 Update the new version of Microsoft.TestPlatform.cli which has fix related to testAdapterPath.
Updated the test project to reflect the same.
2016-10-04 00:17:35 +05:30
Eric Erhardt
f065a29704 Rename IsCurrentRuntimeSupported() to SupportsCurrentRuntime(). 2016-10-03 12:45:39 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications.
Fix #4204
2016-10-03 09:23:00 -05:00
Livar Cunha
5f3da6428d Testing out a theory that setting the output path will solve this problem. 2016-09-30 15:52:22 -07:00
Livar Cunha
27b5abfc36 Trying out with the latest SDK. 2016-09-30 12:03:03 -07:00
Eric Erhardt
283bf7139e Changing the rules on when to use the CLI's BuildRid.
Use the CLI's BuildRid when the current machine is not supported by the shared framework.
2016-09-30 12:00:37 -05:00
Livar Cunha
4173d19b3c Pinning the SDK version for migrated apps. 2016-09-30 09:27:16 -07:00
Livar Cunha
29b197534c Updating to a new SDK and adding a work around to set project.lock.json for migrated projects. 2016-09-30 09:27:15 -07:00
Livar Cunha
77ada164c6 Forgot to actually invoke the method to clean PackageRefs. 2016-09-30 09:27:15 -07:00
Livar Cunha
7e16ad0388 Adding TargetFrameworks even for single TFM and cleaning up PackageRef. 2016-09-30 09:27:15 -07:00
Livar Cunha
715f1f6a10 Addressing code review comments. 2016-09-30 09:27:15 -07:00
Livar Cunha
c04f7a0cd0 Changing the migrate command to obtain the sdk package version from the PackageRef in csproj instead of project.json. 2016-09-30 09:27:15 -07:00
Livar Cunha
c41b35f06f Updating tests to reflect msbuild projects running without project.json. 2016-09-30 09:25:11 -07:00
Livar Cunha
2bbef9328b Removing project.json from msbuild template and msbuild test app. 2016-09-30 09:25:11 -07:00
Eric Erhardt
ce6c29676d Adding "BuildRid" to the CLI as a fallback RID to use when inferring which RID to use when building, running, and publishing self-contained applications.
This enables users to use the CLI on newer versions of the OS that aren't fully supported yet - for example using a new OSX version that isn't listed in the runtime graph in the current NuGet packages.

Fix #4238
2016-09-29 22:39:00 -05:00
Livar Cunha
e91b2f6011 Updating ToolpathCalculator to use asset.json now that we updated to a new NuGet. 2016-09-29 14:06:45 -07:00
Livar Cunha
082a90035d Bumping nuget to 3.6.0-beta.1.msbuild.17 2016-09-29 12:16:41 -07:00
Sridhar Periyasamy
98231a6628 Merge pull request #4254 from dotnet/sridhar-ms/migrate-directory
Add support to migrate a directory.
2016-09-29 10:13:55 -07:00
Eric Erhardt
04869b9997 Updating msbuild to 0.1.0-preview-00043-160929. 2016-09-29 10:26:55 -05:00
Bryan Thornbury
f5b17e63ce fixup 2016-09-28 15:40:38 -07:00
Bryan Thornbury
8c563a58f8 Fix tools with trailing backslashes in additionalProbingPath 2016-09-28 14:21:52 -07:00
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Nick Guerrera
936692acf1 Update msbuild to latest 2016-09-28 04:37:39 -07:00
Livar
464024252f Merge pull request #4267 from livarcocc/fix_run_csc_cmd
Double quoting the path to the host and to csc.dll in RunCsc.cmd
2016-09-27 17:52:28 -07:00
Livar Cunha
9150596c92 Double quoting the path to the host and to csc.dll in RunCsc.cmd so that it works when the CLI is in a path with spaces. 2016-09-27 16:17:06 -07:00
Eric Erhardt
3da55881b5 Merge pull request #4264 from nguerrera/update-msbuild
Update msbuild to latest
2016-09-27 18:08:12 -05:00
Nick Guerrera
6bc099e5e0 Update msbuild to latest 2016-09-27 15:16:13 -07:00
Livar Cunha
d7e00907e0 Fixing windows test breaks. It was because of how the NuGet API is putting Directory Separators in the lock file. They always normalize them to forward slash. 2016-09-27 13:08:45 -07:00
Livar Cunha
2ea227e388 Fixing a build break on windows. 2016-09-27 10:53:23 -07:00
Livar Cunha
2acd4474de Fixing a migration test where migration was not failing for a unresolved dependency because we were not classifing unresolved dependencies correctly. 2016-09-27 10:53:23 -07:00
Livar Cunha
f0a50c92ac Fixing issues small issues found during build and tests. 2016-09-27 10:53:22 -07:00
Livar Cunha
6527cbc592 Replacing the LockFile APIs from the one in ProjectModel to the one in NuGet.ProjectModel. 2016-09-27 10:53:21 -07:00
Rohit Agrawal
cfe76534ca bump nuget to 3.6.0-beta.1.msbuild.16 2016-09-26 16:47:20 -07:00
Sridhar Periyasamy
7ee2bd1f26 Add support to migrate a directory.
- Given a directory migrate all the project.jsons in it recursively.
- Remove '-p/--project' option. Instead directly pass a directory or project.json as argument.
- Add tests.
2016-09-26 14:16:17 -07:00
Eric Erhardt
5434c7f392 Merge pull request #4237 from eerhardt/PublishCommand
Add `dotnet publish3` command
2016-09-26 11:51:19 -05:00
Sridhar Periyasamy
038fb6fbae Merge pull request #4221 from dotnet/sridhar-ms/multiple-proj-migrate
Migrate P2P references
2016-09-23 22:30:58 -07:00
Sridhar Periyasamy
ec7aa87576 Add xproj tests to test migrate command. 2016-09-23 17:33:35 -07:00
Rohit Agrawal
dfc5650db8 bump nuget version to 3.6.0-beta.1.msbuild.15 (#4241) 2016-09-23 17:14:32 -07:00
Sridhar Periyasamy
d43ade9629 Address PR Feedback 2016-09-23 15:31:15 -07:00
Eric Erhardt
fce4b9044a Respond to PR feedback. 2016-09-23 16:53:57 -05:00
Bryan Thornbury
b0565e6498 fix projectdependnecy finder 2016-09-23 14:25:57 -07:00
Sridhar Periyasamy
46ab621422 Migrate P2P references
- Given a project migrate all the project references recursively.
- Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated.
- Remove the '--output' since it is not used heavily and makes migrating multiple projects easier.
- Add tests
2016-09-23 14:25:57 -07:00
Eric Erhardt
66fbd6f278 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160923-4. 2016-09-23 16:14:03 -05:00