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

439 commits

Author SHA1 Message Date
Piotr Puszkiewicz
3a3ab7e0b0 MSBuildSDKsPath (#4824) 
* Tests in place

* Implementation
 2016-11-23 23:54:44 -08:00
Livar
923320b66b Merge pull request #4829 from jeffkl/4753 
Move project.lock.json during migration
 2016-11-23 14:02:35 -08:00
Jeff Kluge
2205a8577c Move project.lock.json during migration 
Closes #4753
 2016-11-23 09:46:36 -08:00
Livar Cunha
dc87680337 Making Project Tools use the CLI shared runtime if they have the prefercliruntime in the root of their package. This allows for project tools to not have to change when a new runtime comes up as long as they are compatible with the runtime that the CLI is using. 2016-11-23 09:25:47 -08:00
Livar
da0e7b744b Revert "update NuGet to 4.0.0-rc2 build (#4802)" (#4818) 
This reverts commit 0bafbd061e.
 2016-11-23 09:01:32 -08:00
Krzysztof Wicher
8e5ffaf176 fix some of the stuff in the feedback 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
5d1deeeea1 test project - almost finished - not all review changes included 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
8416085b3a Add test assets for testing and tiny bugfix 2016-11-22 14:45:29 -08:00
Rob Relyea
0bafbd061e update NuGet to 4.0.0-rc2 build (#4802) 2016-11-22 00:51:12 -08:00
dasMulli
acb4d64c07
Migration: Handle different variations of specifying assembly attributes. 2016-11-18 18:05:00 +01:00
Piotr Puszkiewicz
d39ee4a463 add *.xproj.user to backup file types 2016-11-16 01:10:55 -08:00
Justin Goshi
51562109ea Migrate test packages (#4720) 
* Migrate TestPackages

* Add check for desktop available

* Revert previous change

* WIP try something for non-Windows

* Another attempt to pack properly on non-windows

* Another attempt to fix pack errors

* Remove spaces

* Another attempt to make pack work cross-platform
 2016-11-15 12:12:28 -10:00
Krzysztof Wicher
7a3bc96f75 Fix 4508: CLI verbs that call into msbuild should control their output (#4719) 
* Fix 4508: CLI verbs that call into msbuild should control their output

* fix failing tests + tiny bufix in dotnet test
 2016-11-15 11:56:39 -08:00
Krzysztof Wicher
43df9a170d Fix 4655: Migrate errors are not getting put in formatted output (#4718) 
* Fix 4655: Migrate errors are not getting put in formatted output

* Move test asset to NonRestoredTestProjects

* use group test asset manager: NonRestoredTestProjects
 2016-11-15 09:39:58 -08:00
Krzysztof Wicher
9212605e89 binding redirects tests: Simplify and get ready for enabling (#4692) 
* binding redirects tests: Simplify and get ready for enabling

* fix targets broken during cleanup

* fix non-windows build

* apply pr feedback: remove some not needed code

* remigrate BindingRedirects samples, add x64 to bind redir proj
 2016-11-14 14:26:03 -08:00
Livar
312559ccdc Merge pull request #4636 from Faizan2304/xunitTemplateFix 
Update version of xunit adapter in test assets and xunit template
 2016-11-08 14:42:47 -08:00
Livar Cunha
92e7d8e9e9 Making M.NC.App conditional on netcoreapp1.0 framework for the test asset so that it can restore. 2016-11-07 17:41:51 -08:00
Livar Cunha
ef90667375 Hoisting FrameworkAssemblies for desktop frameworks during migration. 2016-11-07 16:16:48 -08:00
Faizan Ahmad
f3cffa0bf4 Update version of xunit adapter and runner 2016-11-07 14:50:08 +05:30
Parallels
d68341b92d Removing DocumentationFile path from migration and one test asset. 2016-11-04 11:51:43 -07:00
Piotr Puszkiewicz
24596b23ae 02->2 2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c Final Version Numbers 2016-11-04 10:09:22 -07:00
seancpeters
40c34f891a Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions (#4585) 
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions

* Fixed merge conflicts. Had to re-update the Sdk version in one place.

* re-migrate dotnet.dll

* Revert Performance Test Projects

* Fix test test

* Add missing WithRuntime

* Disable failing test test
 2016-11-03 22:12:33 -07:00
Rob Relyea
f961fef8e0 update NuGet in CLI to 4.0.0.2048 (#4614) 
* update NuGet in CLI to 4.0.0.2047

* update NuGet in CLI to 4.0.0.2048
 2016-11-03 22:11:44 -07:00
Faizan Ahmad
5c5f593449 Merge branch 'rel/1.0.0' into enablevstest 2016-11-02 23:50:44 +05:30
Faizan Ahmad
111499899d Reduced the test name to overcome 256 character file length limit in windows 2016-11-02 23:38:20 +05:30
Krzysztof Wicher
d520160ce3 Merge pull request #4554 from krwq/fix_lib_wo_netstandard 
When Library add reference to NETStandardLib if not present
 2016-11-01 16:50:47 -07:00
Krzysztof Wicher
e3bc102b06 When Library add reference to NETStandardLib if not present 2016-11-01 15:52:24 -07:00
Krzysztof Wicher
875e275e38 Revert "When Library add reference to NETStandardLib if not present" 
This reverts commit 57d79bb2d3.
 2016-11-01 15:45:14 -07:00
Krzysztof Wicher
57d79bb2d3 When Library add reference to NETStandardLib if not present 2016-11-01 15:34:17 -07:00
Livar Cunha
82ff6397f5 Migrating unqualifing references as projects if we find a matching project. Without this, we have project references being migrated as package references. 2016-11-01 14:17:12 -07:00
Faizan Ahmad
dfea5b780f Nitpick 2016-11-02 01:56:42 +05:30
Faizan Ahmad
0995daf83e 1) Added test to cover xunit scenario 
2) Added log in multi tfm test to root cause the issue where it is failing for net46
 2016-11-02 01:45:44 +05:30
Faizan Ahmad
5c5ce3d336 Enable test verb tests 2016-11-01 22:01:30 +05:30
Faizan Ahmad
1b5497afda Enale disabled vstest test. It was failing in restore. 
Going with increamental approach. In this commit i am trying to enable restore. In next commit will enable vstest
 2016-11-01 16:18:33 +05:30
Livar Cunha
9139c4006b Fixing full framework tests 2016-11-01 00:31:21 -07:00
Livar Cunha
c2f60cede4 Updating the SDK to the latest. 2016-11-01 00:29:54 -07:00
Piotr Puszkiewicz
d804502a8a Remove deprecated test assets (#4546) 
* Remove deprecated test assets

* Add missing nuget configs and fix poorly named test folder

* Test Cleanup
 2016-10-31 16:16:07 -07:00
Piotr Puszkiewicz
f53c51fc07 [WiP] enable /m by default (#4543) 
* MSBuild integration project + refactoring

* Feature Complete

* Change default target to an existing one
 2016-10-29 12:08:52 -07:00
Piotr Puszkiewicz
5ede3b6367 post migration cleanup (#4449) 
* Create tests

* Basic scenario working & tested

* Feature Complete

* prevent build of intentionally broken test asset

* Update migrate command backup

* PR Feedback

* Move negative test to negative test directory

* Fix tests

* make test output directories unique

* Merge Conflict

* make backup the default behavior

* Pass2Fail

* Remove tests' PJ dependency
 2016-10-29 01:58:37 -07:00
Justin Emgarten
f34a870bf7 Merge pull request #4535 from dotnet/emgarten/nuget2037 
Updating nuget to 4.0.0-rc-2037
 2016-10-28 18:12:56 -07:00
Livar
4c321d4148 Merge pull request #4529 from piotrpMSFT/PiotrpMSFT/FixUnicode 
Remove Unicdoe Path
 2016-10-28 17:58:41 -07:00
Justin Emgarten
54cad0b7a6 Updating nuget to 4.0.0-rc-2037 2016-10-28 17:13:29 -07:00
Livar
cbed94dbef Merge pull request #4517 from livarcocc/promote_project_dependencies 
Promote project dependencies
 2016-10-28 15:17:47 -07:00
Piotr Puszkiewicz
1a43d79b46 Remove Unicdoe Path 2016-10-28 13:40:19 -07:00
Faizan Ahmad
a09690d8df 1) Added diag support 
2) Added log in test which are failing in windows machine for framework net46
 2016-10-28 20:15:38 +05:30
Faizan Ahmad
63a14fd3ab Merge from rel/1.0.0 2016-10-28 17:56:24 +05:30
Piotr Puszkiewicz
1dc0c57885 Remove duplicate test asset (#4518) 2016-10-27 21:57:17 -07:00
Livar Cunha
83350434bc Adding a E2E test and a indirect dependency to TestAppDependencyGraph. 2016-10-27 20:08:53 -07:00
Livar Cunha
fa6aa749bd Doing a tree traversal of all dependencies and creating a list that is then added to the project dependencies of the project. 2016-10-27 20:08:53 -07:00
Piotr Puszkiewicz
6fcbefa4f7 [WIP] Removes *3 verbs, making msbuild the driver (#4456) 
Removes *3 verbs, making msbuild the driver
 2016-10-27 18:46:43 -07:00
Livar
53dc665e9b Merge pull request #4505 from livarcocc/assembly_info_migration 
Assembly info migration
 2016-10-26 17:00:22 -07:00
Justin Goshi
68afda8e4d Handle "runtimes" section (#4503) 
* Migrate "runtimes" section as a RuntimeIdentifiers property in the resulting csproj file. Also do not call restore3 from publish3 anymore.

* Fix up the publish3 tests to call restore3 first and the csproj files to have RuntimeIdentifiers
 2016-10-26 22:23:40 +00:00
Livar Cunha
f863630fd8 Adding a rule that turns off assembly info generation for attributes already defined when migrating. 2016-10-26 13:55:15 -07:00
Faizan Ahmad
d6f4f5f606 Update the version of Microsoft.NET.Sdk in test project 2016-10-26 23:46:56 +05:30
Faizan Ahmad
c7200f1599 Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 23:42:53 +05:30
Livar
4aa1c1bfb4 Merge pull request #4499 from eerhardt/FixRun3Project 
Fix dotnet run3 --project to pass the project to msbuild.
 2016-10-26 10:57:06 -07:00
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
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
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
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
Bryan Thornbury
eeb4ec52bd remove desktop from multi target test asset 2016-10-20 17:39:51 -07:00
Bryan Thornbury
16ff3734a3 fix the multi tfm test to not build net20 2016-10-20 15:33:47 -07:00
Bryan Thornbury
481aebd18a turn on the web test 2016-10-20 15:04:53 -07:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -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
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
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
d8a10024e5 Addressing code review comments by removing unnecessary test artifacts. 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
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382) 
Make csproj templates first-class in dotnet-new.
 2016-10-14 00:06:35 -07:00
Faizan Ahmad
391fff1f20 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-12 11:57:46 +05:30
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
Eric Erhardt
633b56e448 Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk. 2016-10-10 14:04:30 -05:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Livar Cunha
06aa54d16c Fixing a test. 2016-10-06 19:29:20 -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
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
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
Livar
7a0dff8a96 Merge pull request #4300 from livarcocc/support_for_toolsref 
Support for toolsref
 2016-10-05 13:18:12 -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
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
adff632929 green 2016-10-03 20:10:09 -07: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
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