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

1023 commits

Author SHA1 Message Date
Faizan Ahmad
679ea57acf Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 21:46:55 +05:30
Faizan Ahmad
aea25b1fc5 Addressed PR comment 2016-10-26 16:53:34 +05:30
Livar
7149c722b1 Merge pull request #4496 from livarcocc/issue_4486 
Merging metadata with different values
 2016-10-25 22:26:21 -07:00
Livar
8befd890d8 Merge pull request #4494 from livarcocc/migrate_target_package 
When determining the P2P dependencies, only use dependencies of type project
 2016-10-25 22:25:28 -07:00
Eric Erhardt
33ec55aee3 Fix dotnet run3 --project to pass the project to msbuild. 
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301.
 2016-10-26 00:04:40 -05:00
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
763e6bc946 nitpick 2016-10-26 00:10:25 +05:30
Faizan Ahmad
cb42c594ab Test fix 2016-10-25 22:22:00 +05:30
Faizan Ahmad
8379feacdf Updated test to handle configuration. 2016-10-25 20:57:59 +05:30
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
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
caf072daeb Merge pull request #4463 from brthor/brthor/imports 
Turn on tests
 2016-10-21 14:22:21 -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
883eb2e82f Removing a test that is not necessary. 2016-10-20 15:53:31 -07:00
Bryan Thornbury
16ff3734a3 fix the multi tfm test to not build net20 2016-10-20 15:33:47 -07:00
Bryan Thornbury
1c1f4c462f turn on multi tfm test 2016-10-20 15:19:35 -07:00
Bryan Thornbury
481aebd18a turn on the web test 2016-10-20 15:04:53 -07:00
Livar Cunha
095105f2ec Addressing code review comments. 2016-10-20 14:35:45 -07:00
Livar Cunha
dc0d87c826 Adding an additional test to validate mappings to the root of the package. 2016-10-20 11:56:30 -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 Cunha
22bc479927 Updating msbuild to 15.1.319-preview5 2016-10-19 12:43:21 -07:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Eric Erhardt
b32aedde5a Add /p:SkipInvalidConfigurations=true to fix the test 2016-10-17 21:03:08 -05:00
Eric Erhardt
469f7be5c3 Add test for dotnet run with multiple frameworks. 2016-10-17 21:03:08 -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
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
7601f66328 Reducing the test method name sizes in an attempt to get it passing on Windows. 2016-10-16 18:42:57 -07:00
Livar Cunha
dab19ce57c Fixing msbuild.exe casing 2016-10-14 14:58:36 -07:00
Livar Cunha
8ad1982013 Handling configuration when the env variable is not set. 2016-10-14 14:36:09 -07:00
Livar Cunha
58bc3b5853 Making the tests aware of the Configuration used in the build. 2016-10-14 12:56:18 -07:00
Livar Cunha
99d6b1fd6d Adding some more tracing to tools command resolvers. 2016-10-14 12:56:18 -07:00
Livar Cunha
d8a10024e5 Addressing code review comments by removing unnecessary test artifacts. 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
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
Eric Erhardt
742d48b596 Fix binding-redirects.Tests to work with net46. 2016-10-11 18:30:15 -05:00
Eric Erhardt
acbef441b1 fixup Cli.Utils.Tests for latest code from rel/1.0.0 2016-10-11 17:31:18 -05: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
b8dbdc29ae Merging Test.Utilties with the latest code from rel/1.0.0. 2016-10-11 17:20:15 -05:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Eric Erhardt
00f543d089 Fix dotnet-tests to run tests on net46, since we only support netstandard1.3 in ProjectModel. 2016-10-11 16:59:58 -05:00
Eric Erhardt
7618cce420 Remove GivenADesktopAppWhichUsesCommandCreateDotnet, since Cli.Utils will only support netstandard1.5 going forward. 2016-10-11 16:16:44 -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
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
Justin Goshi
70a8872f45 Address CR comments for the new migration tests 
Changing the tests to also verify the error messages.
 2016-10-11 11:19:04 -07:00
Justin Goshi
5016aea90c Add tests 2016-10-10 18:01:59 -07: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
Eric Erhardt
93166dd77c Merge pull request #4361 from eerhardt/RemoveFsc 
Remove dotnet-compile-fsc.
 2016-10-10 14:17:29 -05: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
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
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
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
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
310da80c3a remove write 2016-10-05 11:39:14 -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
e5f6107d88 Fixing a test that needed the lock file now that that's what we use for tools. 2016-10-04 18:58:38 -07:00
Bryan Thornbury
bf5404373f add signed verification test 2016-10-04 16:48:14 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -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
a078e8b845 dir 2016-10-04 10:13:01 -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
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
79999f3798 Remove temporary test project. 2016-10-03 09:37:15 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications. 
Fix #4204
 2016-10-03 09:23:00 -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
68e1aae6cc Fixing tests. 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
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
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
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Livar Cunha
f0a50c92ac Fixing issues small issues found during build and tests. 2016-09-27 10:53:22 -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
Livar Cunha
f5feed1abb Removing a test that won't work now. 2016-09-23 14:37:16 -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
Livar Cunha
09a369530c Adding tests for run3. 2016-09-23 12:49:24 -07:00
Eric Erhardt
eed29be806 Add dotnet publish3 command. 2016-09-23 12:12:55 -05:00
Eric Erhardt
5cfe3e9ff5 Merge pull request #4229 from eerhardt/NewCommands 
Create a `dotnet msbuild` command and fill out the applicable command line arguments to `dotnet build3`.
 2016-09-23 09:05:01 -05:00
Bryan Thornbury
a04194c0f7 Merge pull request #4224 from brthor/brthor/remove-nuget 
Migration: Remove dependency on lock file and dotnet restore
 2016-09-22 18:47:58 -07:00
Livar
a0aa51777f Merge pull request #4233 from livarcocc/migrate_packOptions 
Adding migrate PackOptions capabilities.
 2016-09-22 17:57:08 -07:00
Bryan Thornbury
5523f24712 fix tests 2016-09-22 17:16:37 -07:00
Livar Cunha
768e289f0c Adding migrate PackOptions capabilities. 2016-09-22 16:14:27 -07:00
Bryan Thornbury
95e0ed3713 fix errors, enable tests 2016-09-22 14:30:56 -07:00
Eric Erhardt
5bd310bbd5 Add dotnet msbuild tests. 2016-09-22 15:56:36 -05:00
Bryan Thornbury
3e6e1ddcd0 add support for conditioned csproj references, add tests 2016-09-22 12:51:23 -07:00
Bryan Thornbury
a688885f21 remove nuget dependency in tests 2016-09-21 21:23:50 -07:00
Bryan Thornbury
8a420de736 Remove nuget dependency 2016-09-21 21:14:48 -07:00
Bryan Thornbury
5d2f0579d2 Migrate xproj to csproj dependencies 2016-09-21 17:27:02 -07:00
Bryan Thornbury
08fbe7f9d1 remove debug 2016-09-21 14:51:31 -07:00
Bryan Thornbury
2dd99ce015 improve finding encompassed items in a configuration 2016-09-21 14:41:16 -07:00
Bryan Thornbury
b03f4c282b remove some tests 2016-09-21 13:19:01 -07:00
Bryan Thornbury
fe676e7bc6 use c# boolean syntax 2016-09-21 11:51:13 -07:00
Bryan Thornbury
dc13951871 fix PublishWithContents test 2016-09-21 11:37:43 -07:00
Bryan Thornbury
875d91629e case insensitive msbuild metadata findng 2016-09-21 11:31:30 -07:00
Bryan Thornbury
362f71a94a Project Json mapping migration support 2016-09-20 21:18:11 -07:00
Bryan Thornbury
3a567e5957 Merge pull request #4185 from brthor/brthor/migrate-x-targetting 
Migration X-Targeting
 2016-09-19 16:01:04 -07:00
Bryan Thornbury
02495c07e0 Remove script extension inference test 2016-09-19 15:13:09 -07:00
Bryan Thornbury
448d9dc08b remove pathext workaround 2016-09-19 13:25:40 -07:00
Bryan Thornbury
67f292947d try again 2016-09-19 11:11:01 -07:00
Faizan2304
0ce597a147 Implemented vstest verb which will run the test from given container. (#4115) 
* Implemented vstest verb which will run the test from given container.

* Fixed Nitpick.

* 1) Addressed PR comment
2) Added tests for vstest verb

* Using specific version of Microsoft.TestPlatform.

* Address PR comments.

Modified help text for the vstest command.
Removed unused function.

* Fixed package related issue.
--Taking reference of microsoft.testplatform.cli nuget package which has contentFolder in it so that sub folder of this nuget can also be added in cli package.
-- Removing vstest.console, vshost and datacollector from Bundletools as we dont want *.deps.json to be override

* Nitpick

* Making vstest.console arguments compatible for non windows platform

* Fix tests to run on linux machine

* Updated the microsoft.testplatform.cli nuget package version. This version has fix related to non windows machine.

* changed dapter path from bin/debug to bin/Debug

* updated nuget version of package Microsoft.TestPlatform.CLI.

* Revert "updated nuget version of package Microsoft.TestPlatform.CLI."

This reverts commit bcc26c21d11c2bd2e5259a74f9890b0fd75962c7.

* Updated version of nuget package Microsoft.TestPlatform.CLI
Added Test project in solution file

* Addressed PR comment.

* Removed unnecessary --platform argument from test
 2016-09-19 10:59:26 -07:00
Bryan Thornbury
2ddcbe449c kill script extension inference tests 2016-09-19 10:54:45 -07:00
Bryan Thornbury
9067bc9e45 Path ext hacks 2016-09-19 10:33:03 -07:00
Bryan Thornbury
9d46a19c59 TFM 2016-09-19 09:16:36 -07:00
Bryan Thornbury
fe20698d81 PR Feedback 2016-09-16 16:37:48 -07:00
Bryan Thornbury
3cdd994798 fix test 2016-09-15 16:30:39 -07:00