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

2890 commits

Author SHA1 Message Date
Jon Sequeira
11270a436b list command help text fix 2017-03-14 16:13:49 -07:00
Jon Sequeira
59d1fe32bc remove redundant help 2017-03-14 15:22:31 -07:00
Jon Sequeira
35732fc07d include HelpText in CommandParsingError, write it to stdout 2017-03-14 12:26:24 -07:00
Jon Sequeira
22fb17422f handle -? and /? arguments as help 2017-03-14 11:30:35 -07:00
Jon Sequeira
898d10cb2d help text adjustments for dotnet sln 2017-03-14 11:23:19 -07:00
Jon Sequeira
96683c1421 help text updates 2017-03-14 10:33:58 -07:00
Nikolaj Jørgensen
cacd52fdbb Change name for DOTNET_PACKAGES to NUGET_PACKAGES 
README was never updated in #817, making it show an obsolete variable.

This reflects the name used in the current code
 2017-03-14 10:55:29 +01:00
Zlatko Knezevic
36e3d5d2f9 Removing locale from the commented links 2017-03-13 20:56:42 -07:00
Jon Sequeira
2c96d8e8b9 throw exceptions for command not found 2017-03-13 20:06:59 -07:00
Zlatko Knezevic
fa98674954 Responding to PR feedback 2017-03-13 19:42:30 -07:00
Jon Sequeira
ace4fe49f6 new CliCommandLine version 2017-03-13 16:01:58 -07:00
Jon Sequeira
f5d9cfc79c reverse order of help response vs error response 2017-03-13 15:29:39 -07:00
Jon Sequeira
204d8594bf throw exception on parse errors 2017-03-13 13:29:03 -07:00
Jon Sequeira
11b7e7e449 new CliCommandLine version 2017-03-13 12:46:39 -07:00
Jon Sequeira
02ac115f2b new CliCommandLine version with help fix 2017-03-13 09:03:14 -07:00
Jon Sequeira
8a0f37ed79 bump CliCommandLine version 2017-03-13 08:25:21 -07:00
Zbyněk Sailer
ddd27248b1 LOC CHECKIN | dotnet/cli | 20170313 | bugfix 2017-03-13 14:24:31 +01:00
Jon Sequeira
d3143b779f stop writing ParseResult.Diagram to output 2017-03-12 16:48:59 -07:00
Jon Sequeira
a6c2b6c9f6 update CliCommandLine, other code changes 2017-03-12 15:06:34 -07:00
Jon Sequeira
5c4db56d3b correct arguments for dotnet sln commands 2017-03-11 11:47:04 -08:00
Jon Sequeira
86f26550f1 R: fix spelling 2017-03-11 11:00:18 -08:00
jonsequitur
ae01694167 Merge branch 'tab-completion' of https://github.com/jonsequitur/cli into tab-completion 2017-03-11 09:45:19 -08:00
Piotr Puszkiewicz
2d8555c345 Merge remote-tracking branch 'dotnet/master' into tab-completion 2017-03-10 18:59:38 -08:00
Piotr Puszkiewicz
7795ce4d67 Fix build command 2017-03-10 18:59:32 -08:00
Jon Sequeira
6e3a55e872 update CliCommandLine version 2017-03-10 18:21:58 -08:00
Piotr Puszkiewicz
3bdfe28765 Resolve build breaks 2017-03-10 17:52:40 -08:00
Piotr Puszkiewicz
23d4fb32f3 Merge remote-tracking branch 'jonsequitur/tab-completion' into tab-completion 2017-03-10 17:37:26 -08:00
Jon Sequeira
34d9cbf863 new CliCommandLine version 2017-03-10 17:11:19 -08:00
Jon Sequeira
a3f536c248 move subcommands to new parser 2017-03-10 16:43:44 -08:00
Eric Erhardt
b019f4e53d Remove unused constants. 
These strings were used in the project.json days, but are no longer used.
 2017-03-10 17:35:17 -06:00
Piotr Puszkiewicz
df3c08b645 Pass through test options to msbuild 2017-03-10 13:49:49 -08:00
Piotr Puszkiewicz
e1568bbc1e Re-enable localizable strings 2017-03-10 13:36:18 -08:00
Piotr Puszkiewicz
18a2b95dec Initial port of dotnet test 2017-03-10 13:18:14 -08:00
Piotr Puszkiewicz
0df2462344 Merge remote-tracking branch 'dotnet/master' into tab-completion 2017-03-10 12:03:01 -08:00
Piotr Puszkiewicz
d6f0265d15 Merge remote-tracking branch 'jonsequitur/tab-completion' into tab-completion 2017-03-10 10:43:06 -08:00
Piotr Puszkiewicz
482f1b555b missing peren 2017-03-10 10:43:01 -08:00
Piotr Puszkiewicz
3ff16d9b66 Merge remote-tracking branch 'jonsequitur/tab-completion' into tab-completion 2017-03-10 10:34:27 -08:00
Jon Sequeira
d3319adb59 fix merge error 2017-03-10 10:34:25 -08:00
Piotr Puszkiewicz
1f5be51955 relocate suggest.cs 2017-03-10 10:17:10 -08:00
Piotr Puszkiewicz
940dd6863a move dotnet-run 2017-03-10 10:13:11 -08:00
Piotr Puszkiewicz
071f4dc697 Convert Run 2017-03-10 09:08:01 -08:00
Piotr Puszkiewicz
4149150acc Resolve Parser ambiguity 2017-03-10 01:13:13 -08:00
Piotr Puszkiewicz
120d28a78d Migrate dotnet-pack 2017-03-10 01:11:16 -08:00
Piotr Puszkiewicz
4912e4aa6c Fix naming of BuildCommand.cs 2017-03-10 01:11:07 -08:00
Piotr Puszkiewicz
92245e4523 Centralize VersionSuffixOption 2017-03-10 01:10:23 -08:00
Piotr Puszkiewicz
dc72b7ce92 Fix Clean ordering 2017-03-10 01:08:19 -08:00
Piotr Puszkiewicz
fd6d499ba6 dotnet-migrate 2017-03-09 18:45:11 -08:00
Piotr Puszkiewicz
ba50d619d8 Build fixes for clean & build 2017-03-09 18:44:48 -08:00
Livar
374f9ebcee Merge pull request #5979 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001711 (master)
 2017-03-09 18:42:08 -08:00
jonsequitur
58bf70a476 merge 2017-03-09 18:36:05 -08:00
Piotr Puszkiewicz
706e34ad47 Cache 2017-03-09 18:16:26 -08:00
Piotr Puszkiewicz
ca9268c504 Clean 2017-03-09 18:16:20 -08:00
Piotr Puszkiewicz
c68aba4f63 Test Fix 2017-03-09 17:52:17 -08:00
Piotr Puszkiewicz
bbc23af138 Fix failing Cache tests 2017-03-09 17:20:00 -08:00
Piotr Puszkiewicz
03544ad0cd Build Unit Tests 2017-03-09 16:39:49 -08:00
Piotr Puszkiewicz
cb19d357d6 Build issues 2017-03-09 16:17:15 -08:00
Piotr Puszkiewicz
1c25a17e03 , -> ; 2017-03-09 16:13:19 -08:00
Piotr Puszkiewicz
e0da3090e6 Initial Cache parser 2017-03-09 16:12:08 -08:00
Piotr Puszkiewicz
3ebdf2909d TFM, RID, Config as CommonOptions 2017-03-09 16:11:58 -08:00
Piotr Puszkiewicz
30e856a365 zeroormore 2017-03-09 14:47:02 -08:00
Piotr Puszkiewicz
ae152503aa port build command 2017-03-09 14:36:31 -08:00
Eric Erhardt
35e3d69a2f Update ProjectJsonMigration's Roslyn 
Now that Roslyn is no longer in the Shared Framework, it doesn't make sense to keep using 1.3.0.  Instead, we should use the same Roslyn version that we use for csc.
 2017-03-09 16:35:08 -06:00
Justin Goshi
c35dbd9563 Migration of xproj with name different from folder leaves ref to old project in solution (#5958) 
* WIP trying to remove unused xproj files

* Use relative path

* Add a test

* Fix a few test failures

* Fix path issue

* Address PR Comments
 2017-03-09 12:17:18 -10:00
Jon Sequeira
ee2b8f2efa add diag to VerbosityOption 2017-03-09 13:57:37 -08:00
Jon Sequeira
ea899f236e fix publish parser args validation 2017-03-09 13:19:46 -08:00
Jon Sequeira
46b799af01 trigger help display using HelpException 2017-03-09 12:31:34 -08:00
Jon Sequeira
998ac9c3eb ParseCommand 2017-03-09 10:53:17 -08:00
Jon Sequeira
4284c4e363 small change to arg forwarding methods, test fixes 2017-03-09 09:14:55 -08:00
jonsequitur
0b94c979db publish using new parser, rename ArgsToBeForwarded 2017-03-09 07:35:06 -08:00
jonsequitur
1a0ba24883 publish command using new parser 2017-03-08 17:53:07 -08:00
Jon Sequeira
fd6f7e48b5 WIP 2017-03-08 16:02:24 -08:00
Rama Krishnan Raghupathy
7e0010c57f display exception as error 2017-03-08 15:12:50 -08:00
Jon Sequeira
30480fa189 restore:captures arguments for forwarding to MSBuild 2017-03-07 16:40:18 -08:00
Eric Erhardt
f0e156d384 Merge pull request #5942 from ramarag/mult_Ver 
Cache accepting multiple input files
 2017-03-07 17:44:23 -06:00
Rama Krishnan Raghupathy
ed1ca04f51 Enabling multifile support for cache 2017-03-07 14:38:07 -08:00
Jon Sequeira
53ea7f62bf update CliCommandLine version 2017-03-07 11:29:29 -08:00
Jon Sequeira
1ed5b420a9 don't split on : or = in restore command parse 2017-03-07 11:28:35 -08:00
Jon Sequeira
c176b5953f additional logging 2017-03-07 07:10:12 -08:00
Jon Sequeira
69bc90dc6f dotnet restore using new parser 2017-03-06 20:53:26 -08:00
Jon Sequeira
0094fd4e08 revert subcommand change, align CliCommandLine versions 2017-03-06 16:34:05 -08:00
jonsequitur
6b66db7436 a few small code cleanups 2017-03-06 12:22:32 -08:00
jonsequitur
5f227c1c45 split parser definitions across multiple files 2017-03-06 12:21:51 -08:00
jonsequitur
8b0dd3579c a couple of parser unit tests 2017-03-06 12:21:22 -08:00
jonsequitur
614f71d19f add help text for a couple of commands 2017-03-06 12:20:14 -08:00
jonsequitur
d40a87bc44 introduce dotnet complete command 2017-03-06 12:19:06 -08:00
Zlatko Knezevic
4da96e1ace Responding to PR feedback 2017-03-05 21:06:43 -08:00
blackdwarf
4aacb22993 Add support for dotnet help <verb> 
This commit adds supports for getting more detailed help by using the
`dotnet help <verb>` syntax (e.g. `dotnet help build`). This change
opens up the URL that is specified for each verb in the default browser
on the user's machine, so internet access is required.
 2017-03-04 19:19:39 -08:00
Livar
b42697ff09 Merge pull request #5917 from eerhardt/FixVersionsRepoUpdater 
Fix UpdateVersionsRepo to always write the files correctly.
 2017-03-03 20:31:05 -08:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly. 
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
 2017-03-03 21:43:38 -06:00
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK 
Update NET.Sdk to 1.1.0-alpha-20170303-2
 2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
99301d0d95 fix cache test 2017-03-03 16:59:12 -08:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
 2017-03-02 23:49:01 -08:00
Livar Cunha
103833fd34 Updating the version of the TestFramework which fixed the tests for dotnet test and vstest and actually managed to move the projects used there to 2.0. So, only test packages should remain 1.0. 2017-03-02 21:43:06 -08:00
Piotr Puszkiewicz
d55a8f8188 Add missing copyright headers to all cs files 2017-03-02 21:04:03 -08:00
Piotr Puszkiewicz
841846f32b Standardize on newline between Property|ItemGroup areas 2017-03-02 20:38:56 -08:00
Piotr Puszkiewicz
e617376bc7 Trailing newlines + standardize tabs -> spaces 2017-03-02 20:35:20 -08:00
Piotr Puszkiewicz
d9a06ba95c Remove unnecessary Release constants 
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
  </PropertyGroup>
 2017-03-02 20:11:21 -08:00
Piotr Puszkiewicz
78cf9a2941 Version as Metadata in src/ 2017-03-02 19:49:30 -08:00
Maira Wenzel
8a0dd7aece Merge branch 'master' into mairaw-patch-1 2017-03-02 10:52:55 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master 
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
 2017-03-01 20:50:42 -08:00
Livar Cunha
a9a986c30c Merge branch 'rel/1.0.0' into merge_rel_1_0_0_into_rel_1_0_1 
* rel/1.0.0:
  Update LZMA license with correct text
  Add license text to LZMA SDK license notice
 2017-03-01 11:56:37 -08:00
Piotr Puszkiewicz
85ca206d84 Merge pull request #5879 from dotnet/piotrpMSFT/infra/reduceRedist 
Remove unnecessary P2P's from redist.csproj
 2017-03-01 10:13:59 -08:00
Piotr Puszkiewicz
65f6424ddf symbols sdk 2017-03-01 01:24:07 -08:00
Piotr Puszkiewicz
5f4ef8ff77 Remove unnecessary P2P's from redist.csproj 2017-03-01 01:08:33 -08:00
Piotr Puszkiewicz
eb09b62236 Because ; 2017-03-01 00:46:13 -08:00
Piotr Puszkiewicz
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
7bdd7befd8 Merge resolution 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
eee7c7ed32 Move PDB removal to redist.csproj target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
283a80dff0 Move Symbols package creation to redist target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
28d83da782 Remove vbc in a target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
a1d27b6843 Merge pull request #5741 from spboyer/master 
Update help text for dotnet-add-package
 2017-03-01 00:36:57 -08:00
Piotr Puszkiewicz
db35770913 Add back Windows condition 2017-02-28 19:30:43 -08:00
Piotr Puszkiewicz
3682882be4 Make RunCsc.sh executable 2017-02-28 19:13:00 -08:00
Piotr Puszkiewicz
0100fd9aa7 Simplify chmod usage 2017-02-28 18:53:13 -08:00
Piotr Puszkiewicz
664f089985 Reduce chmod 2017-02-28 18:16:51 -08:00
Maira Wenzel
15938b5536 Update LocalizableStrings.cs 2017-02-28 17:18:08 -08:00
Piotr Puszkiewicz
01ca1b1208 Ensure redist publishes Roslyn 
Also fix issue found in PR
 2017-02-28 01:39:45 -08:00
Piotr Puszkiewicz
9bdd38cc19 Initial 2017-02-28 01:17:22 -08:00
Piotr Puszkiewicz
e2c9071c81 Remove duplicate glob 2017-02-27 19:11:38 -08:00
Piotr Puszkiewicz
e9a31a27ba Use PublishDir within redist.csproj 2017-02-27 18:48:05 -08:00
Piotr Puszkiewicz
452b7fcbdd Maybe order matters for AV... 2017-02-27 18:19:06 -08:00
Piotr Puszkiewicz
8ca21b67f9 Add relative paths, add logs by default 2017-02-27 17:19:39 -08:00
Piotr Puszkiewicz
5d193e8b39 Merge conflicts 2017-02-27 17:13:13 -08:00
Piotr Puszkiewicz
981db5f817 Wip 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
69f5ecbeea Remove targets from deps file 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
b1787426c0 Also move nupkg contentFiles 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Richard Lander
6e74e3b50e Update LZMA license with correct text 2017-02-27 16:32:41 -08:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Livar
480f2dd377 Fixing the exclude pattern used by the Migration to exclude WEB SDK globs. 2017-02-24 01:12:35 -08:00
Livar Cunha
8e35beccb8 Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects. 2017-02-23 22:55:35 -08:00
Livar Cunha
733ee18c5a Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items. 2017-02-23 20:36:02 -08:00
Livar Cunha
f05bbd92a6 Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never. 2017-02-23 18:47:17 -08:00
Livar Cunha
b660311772 Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps. 2017-02-23 18:47:17 -08:00
Livar Cunha
1228c7ef55 Do not migrate Content that is already included in the Web SDK for web apps. 2017-02-23 18:47:17 -08:00
Livar Cunha
14a7dd7ef1 Migrate now moves all file copies to the None element. 2017-02-23 18:47:17 -08:00
Livar Cunha
3bbfcb428b Adding merging of ProjectItemElement.Update. Before, we only merged Include. 2017-02-23 18:47:16 -08:00
Piotr Puszkiewicz
f5f6adccb0 Merge pull request #5797 from krwq/2017-02-17-clean-up-cli-utils 
Add unit tests around command line parsing
 2017-02-23 14:07:28 -08:00
Eric Erhardt
ace9526681 Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0' 
Conflicts:
	README.md
	build/Microsoft.DotNet.Cli.Monikers.props
	test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
 2017-02-23 15:42:35 -06:00
Krzysztof Wicher
3a3025b3af remove duplication in dotnet-restore 2017-02-23 11:31:48 -08:00
Krzysztof Wicher
c75d2e446e reduce some repetition 2017-02-23 11:24:36 -08:00
Piotr Puszkiewicz
56f9a84dfd Generate Version file before redist publish 2017-02-23 02:33:00 -08:00
Piotr Puszkiewicz
7818348fc2 Move copying sharedfx to before publish of redist 2017-02-23 01:12:32 -08:00
Piotr Puszkiewicz
1199df1c05 Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Piotr Puszkiewicz
dc1b97c4a1 Merge pull request #5806 from piotrpMSFT/piotrpMSFT/infra/HackFilesToCopy 
remove HackFilesToCopy
 2017-02-22 20:16:51 -08:00
Livar Cunha
24431edfa3 Fixing the origin versions of BrowserLink to migrate. 2017-02-22 20:11:53 -08:00
Livar Cunha
281bd15a19 Fixing a couple of stray package versions. 2017-02-22 20:11:40 -08:00
Livar Cunha
3701b94c32 Updating the FTS versions of packages. Started uplifting FTS packages. And migration BrowserLink.Loader to BrowserLink. 2017-02-22 20:11:34 -08:00
Livar Cunha
523935f3fe Updating packages for migration to new LTS versions. 2017-02-22 20:11:19 -08:00
Eric Erhardt
8aaffc2238 Fix tests on netcoreapp1.1 only platforms 2017-02-22 21:34:21 -06:00
Krzysztof Wicher
eddca32b2f add dotnet clean unit tests 2017-02-22 17:40:02 -08:00
Piotr Puszkiewicz
31f2410b4f Enable Publishing Roslyn with Static Output Path 2017-02-22 17:33:26 -08:00
Piotr Puszkiewicz
4d0dbdbb7f Cleanup 2017-02-22 17:05:49 -08:00
Piotr Puszkiewicz
b81a00cfe3 add back Roslyn tasks 2017-02-22 17:01:14 -08:00
Piotr Puszkiewicz
5a89b01459 Remove HackFilesToCopy 2017-02-22 16:57:32 -08:00
Krzysztof Wicher
b85a2ec6f2 unit tests for dotnet-cache invocation, some cleanup 2017-02-22 15:49:39 -08:00
Krzysztof Wicher
3415a79940 vstest unit tests 2017-02-22 13:53:44 -08:00
Eric Erhardt
6d7d84cb7e Upgrade vstest.console to run on netcoreapp1.1 2017-02-22 15:13:02 -06:00
Krzysztof Wicher
1514dd5e16 add dotnet-publish unit tests 2017-02-22 12:45:11 -08:00
Krzysztof Wicher
584b4a93c0 add dotnet pack unit tests 2017-02-22 12:01:59 -08:00
Krzysztof Wicher
06ceb66089 skip not finished tests and add restore unit tests 2017-02-22 11:43:03 -08:00
Krzysztof Wicher
873bb31cfa Move CommandCreationException to root 2017-02-22 10:52:23 -08:00
Krzysztof Wicher
099dca3950 stub for tests 2017-02-22 10:44:15 -08:00
Shayne Boyer
0e3b47b725 undo .xlf remove-reference 2017-02-22 10:46:31 -05:00
Shayne Boyer
2f65c3ee6a undo .xlf fils for add-reference 2017-02-22 10:43:40 -05:00
Shayne Boyer
f078575040 undo .xlf files 2017-02-22 10:40:37 -05:00
Piotr Puszkiewicz
ae94c70a37 Cli.Utils.csproj update to ensure the right version is stampted 2017-02-21 23:04:29 -08:00
Piotr Puszkiewicz
e46ca4769c fix dotnet version 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
a7fdc20f25 Convert redist.csproj outputdir to static property 
Also some cleanup to unnecessary stuff.
 2017-02-21 22:17:28 -08:00
Mike Lorbetske
e145ca88e4 Placeholder for template update 2017-02-21 16:28:47 -08:00
Livar
99f7eb4843 Merge pull request #5699 from krwq/2017-02-13-psi-extraction 
Unit tests for dotnet build
 2017-02-19 09:57:07 -08:00
Livar Cunha
b8a68ad2e0 No longer add runtime identifier when migrating apps that contain full framework and no runtime identifiers already. 2017-02-17 11:30:20 -08:00
Piotr Puszkiewicz
85b2a129db Merge branch 'rel/1.0.0' 
Conflicts:
	TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
	TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
	TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
	build.proj
	build/Compile.targets
	build/Microsoft.DotNet.Cli.Compile.targets
	build/Microsoft.DotNet.Cli.DependencyVersions.props
	build/Microsoft.DotNet.Cli.Monikers.props
	build/Microsoft.DotNet.Cli.Prepare.targets
	build/package/Microsoft.DotNet.Cli.Nupkg.targets
	build/package/Nupkg.targets
	build/test/TestPackageProjects.targets
	build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
	build_projects/dotnet-cli-build/GetCommitCount.cs
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
	src/dotnet-archive/dotnet-archive.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_nuget/tool_nuget.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/ArgumentsReflector/ArgumentsReflector.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/crossgen.Tests/crossgen.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-build.Tests/dotnet-build.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
	test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
	test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-run.Tests/dotnet-run.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
	test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
	test/dotnet-test.Tests/dotnet-test.Tests.csproj
	test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
	test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
	tools/Archiver/Archiver.csproj
 2017-02-17 02:00:05 -08:00
Livar Cunha
1c409befbe Updating DependencyModel to 1.0.2 2017-02-17 00:29:17 -08:00
Livar Cunha
3eafd9de02 Updating Microsoft.DotNet.PlatformAbstractions version to 1.1.0. 2017-02-16 22:46:04 -08:00
Krzysztof Wicher
ae05e8af1d remove parameterless constructor 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
6f1ea62bc9 rename variable to buildCommand 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
531b0136eb add tests for checking filename, working dir and validation of presence of environmental variables 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
8ebc06da46 add more unit tests 2017-02-16 14:22:02 -08:00
Krzysztof Wicher
9c00966956 preview of single unit test for dotnet build 2017-02-16 14:22:02 -08:00
Shayne Boyer
14f43ef896 fix camelcasing 2017-02-16 17:14:54 -05:00
Shayne Boyer
c9fa9be412 Fixes 5740 2017-02-16 16:11:11 -05:00
Shayne Boyer
4edbcb06ee misspelling of targeting 2017-02-16 16:10:19 -05:00
Piotr Puszkiewicz
d3d6bdebd1 Merge pull request #5618 from jonsequitur/remove-incorrect-localizations 
Remove incorrect localizations
 2017-02-16 11:05:36 -08:00
Piotr Puszkiewicz
4feaf3f124 Remove dotnet-restore-projectjson 2017-02-16 01:01:32 -08:00
Krzysztof Wicher
9d589668c0 more locks 2017-02-15 17:49:40 -08:00
Krzysztof Wicher
1f07e1e2e3 attempt to fix intermittent failures 2017-02-15 17:49:40 -08:00
Livar
47c16b271e Merge branch 'rel/1.0.0' into ignore_case_tools 2017-02-15 15:35:53 -08:00
Krzysztof Wicher
a6bc22e499 Remove TAM (#5670) 
* remove reference to TestAssetsManager in dotnet-add-reference

* remove TestAssetsManager dependency from dotnet-build

* remove TAM ref from dotnet-list-reference

* remove TAM dependency from dotnet-msbuild

* remove TAM dependency from ProjectJsonMigration tests

* remove TAM dependency from dotnet.Tests

* remove TAM dependency from dotnet-new.Tests

* remove TAM from dotnet-pack.Tests

* remove TAM from dotnet-publish.Tests

* remove TAM from dotnet-restore.Tests

* remove TAM dependency from dotnet-remove-reference.Tests

* remove TAM dependency from dotnet-run.Tests

* remove TAM dependency from dotnet-test.Tests

* remove TAM dependency from Microsoft.DotNet.Cli.Utils.Tests

* remove TAM from TestBase

* remove TAM

* remove newly introduced dependency on TAM
 2017-02-15 15:35:03 -08:00
Livar
d1a844da2c Merge branch 'rel/1.0.0' into dev/jgoshi/dotnetAddDefaultProjectTypeGuid 2017-02-15 14:10:10 -08:00
Livar Cunha
8d38a2a67f Making the tool name comparison with the package case insensitive, so that tools are not required to be declared with the exact casing as the packages that contain them. 2017-02-15 11:33:59 -08:00
Justin Goshi
149a4590b5 Do not add duplicate projects (#5698) 2017-02-14 15:47:06 -08:00
Justin Goshi
4d24ae06bb Default to C# project type guid 2017-02-14 14:57:04 -08:00
Rama Krishnan Raghupathy
c20e106d75 Adding End to End test for cache and filtered publish 2017-02-13 17:56:25 -08:00
Rama Krishnan Raghupathy
4fdc72890a Appending dotnet publish xlf 2017-02-13 16:01:16 -08:00
Rama Krishnan Raghupathy
da2cb43949 Adding xlf for dotnet cache 2017-02-13 16:01:10 -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
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -08:00
jonsequitur
f1bf1d83aa remove calls to DisplayAsError 2017-02-13 13:35:43 -08:00
jonsequitur
bb9cdf5725 make string consistent 2017-02-13 13:35:43 -08:00
jonsequitur
baf1f76b6f undelete some unused localizable strings 2017-02-13 13:35:43 -08:00
jonsequitur
7ce780c59c remove apostrophe 2017-02-13 13:35:41 -08:00
jonsequitur
1a0adcbe5a fix loc text dependent test 2017-02-13 13:35:41 -08:00
jonsequitur
43c9b363b0 remove unused and incorrect localizations 2017-02-13 13:34:20 -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
Piotr Puszkiewicz
3806eeb151 Merge pull request #5660 from krwq/2017-02-10-tamisol 
TestAssets Isolation
 2017-02-13 11:24:43 -08:00
Livar Cunha
02c70abe49 Updating the version of the ASP.NET packages that we migrate to, to the RTM package versions. 2017-02-12 22:09:44 -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
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
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version. 
Fix #5638
 2017-02-10 14:22:07 -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
Krzysztof Wicher
4952a819d4 wip 2017-02-10 09:49:21 -08:00
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
jonsequitur
bee34cc0ff remove redundant word 'create' 2017-02-09 18:28:34 -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
Eric Erhardt
546d62061a Merge branch 'master' into rel100toMaster 2017-02-08 12:30:32 -06:00
Eric Erhardt
56d391caad Fix up the merge so it gets past Prepare and Compile. 2017-02-08 12:26:04 -06:00
Eric Erhardt
8e2a7bfa12 Fix the CLI .sln file to load and build in VS 2017. 2017-02-08 10:03:06 -06:00
Justin Goshi
50c10decf5 Migrate compilationOptions 2017-02-08 00:20:04 -08:00
Eric Erhardt
8bab104956 Remove workaround for https://github.com/dotnet/standard/issues/191. 2017-02-06 14:44:51 -06:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08:00
jonsequitur
182c695275 throw CommandParsingException rather than crash on missing single value 2017-02-03 10:57:57 -08:00
Eric Erhardt
3f3443d2df Workaround "2.0" publish bug when referencing "1.1" security assemblies. 
This hack downgrades the security assemblies to "1.0" versions, so the assets are excluded.  When the underlying bug is fixed (or Roslyn moves to "2.0") we can remove this hack.

See https://github.com/dotnet/standard/issues/191.
 2017-02-02 10:25:03 -06:00
Eric Erhardt
0281fde7d1 Merge branch 'master' into MergeRel10 2017-02-01 18:45:05 -06:00
Eric Erhardt
a2c1a39d07 Fix projects and tests after merge of rel/1.0.0. 2017-02-01 18:35:52 -06:00
Livar
408a0afe8e Merge branch 'rel/1.0.0' into wrong_global_json_folders 2017-02-01 15:53:10 -08:00
Maira Wenzel
b605381165 fixed typos 2017-02-01 15:30:35 -08:00
Satya Madala
fe52fad34a Revert results directory argument changes 2017-02-01 14:55:35 -08:00
jonsequitur
905db127a6 use missing package test to verify correct package feed parsing 2017-02-01 14:13:07 -08:00
jonsequitur
667f1cf018 also escape :// 2017-02-01 14:13:07 -08:00
jonsequitur
2ea3af799d escape semicolons when forwarding RestoreSources to MSBuild 2017-02-01 14:13:07 -08:00
Livar
1af25e0fd9 Merge branch 'rel/1.0.0' into wrong_global_json_folders 2017-02-01 14:07:57 -08:00
Justin Goshi
3e07297525 Migration: Remove System.GC.Server from runtimeconfig.template.json and inject ServerGarbageCollection property into the csproj (#5537) 
* Remove runtimeconfig.template.json from templates

* Inject ServerGarbageCollection property
 2017-02-01 14:05:53 -08:00
Eric Erhardt
9f0bb778a1 Merge rel/1.0.0 into master. 2017-02-01 14:32:59 -06:00
Livar Cunha
6a72ec603e Changing the order in which search paths are added for migration and setting the project file path in the ProjectDependency appropriately in the case of csproj and project.json 2017-02-01 10:33:53 -08:00
Jon Sequeira
6990c71e84 refresh enumerator when moving to next subcommand (#5533) 2017-01-31 21:31:02 -08:00
Justin Goshi
626c8983c2 Migration: embed compiler resources (#5517) 
* Embed compiler resources

* Fix null ref
 2017-01-31 20:30:37 -08:00
Jon Sequeira
3fce02e583 make InvalidOperationException thrown by RunCommand graceful (#5525) 2017-01-31 18:48:14 -08:00
seancpeters
2d93968a88 New3 integration (#5430) 
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.

* new cache initialization

* More lzma changes, and removed a razor ref from templates

* Ephemeral hive flag added to tests that need it

* Updated the template engine version to build against. Minor code cleanup

* Config changes to make template versions separate from template engine versions

* Changed dotnet new versioning to use Product.Version

* Fixing Archiver.csproj

* Fixing dotnet new test.

* Fix LZMA Package Source Condition

* Workaround for newline differences.

* fixed tests with changed template parameters. Added a new3 template non-match test
 2017-01-31 17:31:37 -08:00
Piotr Puszkiewicz
d2035ff036 Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3' 
Conflicts:
	build/Microsoft.DotNet.Cli.DependencyVersions.props
 2017-01-30 23:27:48 -08:00
Faizan2304
3eee54e4f9 Inserting localize testplatform (#5510) 2017-01-30 21:05:16 -08:00
Ryan Stelly
87e2a56393 use correct description string for dotnet build -h: -c (#5507) 2017-01-30 17:15:44 -08:00
Justin Goshi
1c80899909 dotnet migrate uses the correct TreatWarningsAsErrors property (#5492) 2017-01-30 16:34:19 -08:00
Jon Sequeira
e8c5d23c29 display CommandParsingException gracefully (#5493) 
* display CommandParsing gracefully

This set of changes handles CommandParsingException gracefuly (so as not to show the user a stack trace) and generalizes graceful exception display somewhat away from being type-specific.

* fix compile error by inlining constant

* remove unused test logging
 2017-01-30 14:36:44 -08:00
Eric Erhardt
cc8e179bf5 Update "new -t lib" to netstandard2.0 2017-01-29 09:46:46 -06:00
Eric Erhardt
fd65cb03b6 Update dotnet new to generate a "2.0" project. 2017-01-29 09:46:46 -06:00
Justin Goshi
5aded80a7b Migration: excluded files need to be removed (#5485) 
* WIP

* Implement Remove attribute

* Enable tests

* Fix test

* Try a shorter test name

* Try more shortened test names

* Shorten some more

* Merge issues

* Try shortinging names more

* Fix test errors related to test asset renaming
 2017-01-28 17:14:17 -08:00
Livar
e38bc4950c Migrating Microsoft.NetCore.App and NETStandard.Library to RuntimeFrameworkVersion and NetStandardImplicitPackageVersion, respectively. (#5478) 2017-01-27 19:47:57 -08:00
Krzysztof Wicher
d6d39a5c9d fix 5466: explicity including a file causes a build break (#5475) 
* fix 5466: explicity including a file causes a build break

* fix failing unit tests

* Add unit tests and apply fix also to includeFiles

* apply review feedback
 2017-01-27 18:39:44 -08:00
Livar
60f2b2e4ab Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-26 20:46:56 -08:00
Livar
99ed699311 Merge branch 'rel/1.0.0' into migrate_sln_file 2017-01-26 19:51:03 -08:00
Livar
06cd5e8645 Merge branch 'rel/1.0.0' into mstestrc2update 2017-01-26 16:34:27 -08:00
jonsequitur
d55be626a9 netcoreapp1.1 fixes 2017-01-26 14:48:39 -08:00
Eric Erhardt
0073fc8534 Update CLI to run on netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Justin Goshi
2cc4f3f166 Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-26 14:28:37 -08:00
Livar
4e5c5c1864 Merge branch 'rel/1.0.0' into mstestrc2update 2017-01-26 14:21:56 -08:00
Justin Goshi
3821d39d6c Address PR comments 2017-01-26 12:53:29 -08:00
Livar Cunha
85ec8a6f2c Fixing our solution tests so that they go back to building the solution. Seems to work now, at least on OSX. Also, made a change to update solution to update any solutions in the folder where dotnet migrate is executed. 2017-01-26 12:40:55 -08:00
Justin Goshi
037da3fc01 Finish tests 2017-01-26 11:00:50 -08:00
Krzysztof Wicher
7a65922895 apply review feedback 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
000734d1ef Ignore explicit glob **/*.cs 2017-01-26 09:02:28 -08:00
Eric Erhardt
d4153815d5 Update the CLI to netcoreapp2.0. 2017-01-26 07:28:59 -06:00
Justin Goshi
150e3c4313 Add more tests 2017-01-25 17:28:57 -08:00
Justin Goshi
40a19a6160 Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-25 09:55:24 -08:00
Justin Goshi
e17c44eddd WIP 2017-01-25 09:53:59 -08:00
Abhitej Anoop John Bandi
93651da836 Updating the MSTest nugets with the ones shipping in VS for desktop and UWP scenarios. 2017-01-25 19:44:50 +05:30
Piotr Puszkiewicz
38fa2548f6 Merge branch 'rel/1.0.0' into patch-1 2017-01-24 16:49:25 -08:00
Justin Goshi
861d1edfd3 Address PR comments 2017-01-24 15:02:19 -08:00
Piotr Puszkiewicz
900f954075 Merge branch 'rel/1.0.0' into patch-1 2017-01-24 14:57:17 -08:00
Justin Goshi
55e80fa036 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5355 2017-01-24 14:56:38 -08:00
Zlatko Knezevic
d522a97318 Update LocalizableStrings.cs 
Change the migration after-process message with the link.
 2017-01-24 11:40:39 -08:00
Piotr Puszkiewicz
7c62621b8f Merge branch 'rel/1.0.0-rc3' into rel/1.0.0-rc3 2017-01-24 03:07:49 -08:00
Piotr Puszkiewicz
ad8710decc SDK 20170123-1 (#5434) 
* Revert "Merge pull request #5362 from dotnet/ragrawal/updatesdktrial"

This reverts commit 4e0b465093.

* bump SDK to 20170123-1
 2017-01-24 01:14:35 -08:00
Mike Lorbetske
872e96cfe2 Update version of Microsoft.AspNetCore.Mvc 2017-01-23 20:21:58 -08:00
Livar
6c623d9d98 Localizing MigrateCommand and fixing one string for dotnet test. (#5419) 2017-01-23 20:19:53 -08:00
Arun Mahapatra
aa0359cd9a Insert test platform v15.0.0-preview-20170123-02 (#5426) 
* Insert test platform v15.0.0-preview-20160120-03.

Remove OutputType from test project templates since it is
automatically determined by Microsoft.NET.Test.Sdk.

* Update testplatform v15.0.0-preview-20170123-02.
 2017-01-23 13:54:08 -08:00
Justin Goshi
a2088e2641 Refactor and finish the feature 2017-01-23 13:01:58 -08:00
Justin Goshi
3884c90938 Merge from rel/1.0.0 2017-01-23 10:25:16 -08:00
Piotr Puszkiewicz
1dfee9ead8 [WIP] Reduce test target complexity [and running time] (#5403) 
* Reduce test target complexity [and running time]

* WiP

* Enable building tests via solution

Remove deprecated tests
Make Microsoft.DotNet.Tools.Tests.Utilities portable-only
Remove MSI tests from the solution as they are the only  tests that currently require dekstop.

* Enable building of tests

* Move migration tests to TA to allow them to self-restore

* Reduce project nesting and test directory name
 2017-01-22 14:40:00 -08:00
dasMulli
0edee4a373
Fix in German translation for dotnet-add-reference 2017-01-21 17:02:01 +01:00
Dustin Campbell
0a62481cc0 Create backup folder in the directory where 'dotnet migrate' is executed (#5306) 
* Create backup folder in the directory where 'dotnet migrate' is executed

With this change, 'dotnet migrate' will create the backup folder in the workspace directory rather
than the parent of the workspace directory. This solves two problems:

1. It makes it easier for the user where the backup is -- it's in the directory they targeted with
'dotnet migrate'.
2. It solves a problem of file oollisions with global.json files when migrating multiple projects.
Consider the following directory structure:

    root
        |
        project1
            |
            global.json
            |
            src
                |
                project1
        project2
            |
            global.json
            |
            src
                |
                project2

    Prior to this change, running 'dotnet migrate' project1 and then running it again in project2
    would have caused an exception to be thrown because the migration would try to produce a backup
    folder like so:

    root
        |
        backup
        |  |
        |   global.json
        |   |
        |   project1
        |   |
        |   project2
        |
        |
        project1
            |
            src
                |
                project1
        project2
            |
            src
                |
                project2

    Now, we produce the following structure, which has no collisions:

    root
        |
        project1
            |
            backup
            |   |
            |   global.json
            |   |
            |   project1
            |
            src
                |
                project1
        |
        project2
            |
            backup
            |   |
            |   global.json
            |   |
            |   project2
            |
            src
                |
                project2

In addition, to help avoid further collisions, a number is appened to the backup folder's name if
it already exists. So, if the user runs dotnet migrate again for some reason, they'll see backup_1,
backup_2, etc.

* Fix test helper

* Fix foolish bug causing infinite loop

* Fix up a couple more tests

* Rework MigrationBackupPlan to process all projects at once

* Fix up tests

* Still fixing tests

* Compute common root folder of projects to determine where backup folder should be placed

* Fix typo

* Fix test to not look in backup folder now that it's in a better location
 2017-01-21 01:58:28 -08:00
Piotr Puszkiewicz
04a7fca9fc Fixing argument parsing in add package command (#5421) 
* Fixing argument parsing in add package command

* Adding check to throw if extra args were passed

* Removing string and adding test cases for dotnet add package command

* Add new test to test.sln, and fix naming, and clean csproj
 2017-01-21 00:11:18 -08:00
Piotr Puszkiewicz
4bd8344da1 Merge branch 'rel/1.0.0' into add-rd 2017-01-20 18:36:05 -08:00
Justin Goshi
b2c51b7269 Do not add duplicate solution folders or project directories (#5377) 
* Do not add duplicate solution folders or project directories

* Fix the algorithm for removing empty solution folders

* Improving code by adding description methods. To address PR comments.
 2017-01-20 18:34:37 -08:00
Justin Goshi
baecbd8d43 WIP 2017-01-20 17:37:11 -08:00
Piotr Puszkiewicz
fe290f1e26 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-20 14:08:49 -08:00
Piotr Puszkiewicz
26aa05cfea Merge pull request #5394 from livarcocc/migrate_global_json 
Handle dotnet migrate global.json
 2017-01-20 14:07:27 -08:00
Justin Goshi
33c962a481 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-20 12:21:43 -08:00
Justin Goshi
717d0a45fa Moving existing csproj files with same name as migration output to backup 2017-01-20 12:21:04 -08:00
Livar
e63867d324 Merge branch 'rel/1.0.0' into add_help_message_to_migrate 2017-01-19 18:40:55 -08:00
Krzysztof Wicher
8ef670161b isolate exclusive folder access pattern into separate class 2017-01-19 16:43:54 -08:00
Krzysztof Wicher
e271b4a818 InvalidOperationException -> ArgumentException 2017-01-19 15:56:16 -08:00
Livar Cunha
96f64e1708 Updating the help string based on PR feedback. 2017-01-19 13:18:47 -08:00
Justin Goshi
56c3010f72 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-19 13:17:05 -08:00
Livar Cunha
13e9e697c9 Adding an extra message to the migrate result to direct people to a place where they can get help for their migrated projects. 2017-01-19 12:41:48 -08:00
Livar
c4e2c35d25 Merge branch 'rel/1.0.0' into migrate_global_json 2017-01-19 12:25:35 -08:00
Krzysztof Wicher
243f92aa47 fix some flakiness around test assets 2017-01-19 11:37:54 -08:00
Justin Goshi
5bbac55736 Migration: do not add a csproj to the solution if it already exists 2017-01-19 11:23:01 -08:00
Livar Cunha
cdf91f2f30 Fixing dotnet migrate global.json. This was failing because we were turning global.json into an empty string and trying to construct a directory for it. The fix was to detect this and transform it into a . directory. Migrate is already respecting the projects node in global.json. 2017-01-19 10:55:23 -08:00
Satya Madala
44b14f987e Add results directory arg to dotnet test 2017-01-19 11:27:37 +05:30
Piotr Puszkiewicz
05956f6efa Merge branch 'rel/1.0.0-rc3' into ragrawal/updatesdktrial 2017-01-18 13:41:50 -08:00
Krzysztof Wicher
1a20d7f82c Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0 2017-01-18 12:38:11 -08:00
Livar Cunha
7802b957d3 Adding a second workaround for the build failure. Same fix as the other one though. 2017-01-18 10:17:37 -08:00
Livar
073daaf450 Merge branch 'rel/1.0.0' into localization 2017-01-18 10:03:18 -08:00
Justin Goshi
a5fb786228 Ensure we don't downgrade VS version 2017-01-17 14:48:54 -08:00
Justin Goshi
2676682fec Migrate should change the visual studio version 2017-01-17 13:45:48 -08:00
Livar Cunha
f765a02865 Fix compile break. 2017-01-17 13:44:31 -08:00
Livar Cunha
2161364116 Adding a test for a project that has a package dependency whose name is also the name of a folder in the repo. 
Moved the test to dotnet-migrate.Test and modified the code that find possible P2P dependencies to actually check if the folder holds a project.
 2017-01-17 13:14:18 -08:00
Rohit Agrawal (NUGET)
337d579949 update nuget and sdk to run a trial build 2017-01-17 11:08:17 -08:00
Mike Lorbetske
03de88f24b Update dotnet new templates with beta5 xunit (#5339) 
* Pull latest template engine version

* Bump xunit version and take corresponding template engine

* Rollback template engine version bump
 2017-01-16 19:31:33 -08:00
Livar
9095743ff7 Merge pull request #5356 from piotrpMSFT/piotrpMSFT/issues/5345 
Fixes #5345
 2017-01-16 17:12:46 -08:00
Livar
557999a5bd Merge pull request #5352 from livarcocc/skip_project_references 
Skipping project dependencies check when the skip-project-references flag is passed
 2017-01-16 16:20:39 -08:00
Piotr Puszkiewicz
82dcdada50 Fixes #5345 2017-01-16 16:13:58 -08:00
Livar Cunha
e1f355065d Moving the project dependencies construction to after we check for the skip project reference check, so that we really don't look for P2P projects when the flag is passed. 2017-01-16 15:16:31 -08:00
Livar Cunha
b8da3b9a87 Updating the versions of xunit 2.2.0-beta5-build3474 and xunit runner to 2.2.0-beta5-build1225. 2017-01-16 13:08:40 -08:00
Zbyněk Sailer
8dbab0f79a LOC CHECKIN | dotnet/cli | 20170116 2017-01-16 14:52:18 +01:00
Livar Cunha
8c2e7c9f01 Merge branch 'rel/1.0.0-rc3' into merge_rc3 
* rel/1.0.0-rc3:
  Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
  Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
  Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
  Adding a few more packages that were not in the manifest and moving some tests around.
  Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
  Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
  Migration: do not inject built in compile includes that the SDK does
  Update msbuild to 15.1.0-preview-000522-02
  Migration: Do not add RIDs for Library projects (#5279)
  Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
  Fix the download of the LZMA archive on dev machines and in Jenkins CI.
 2017-01-13 14:08:31 -08:00
Justin Goshi
f972cf80a9 Treat /? the same as --help (#5285) 
* Fixes issue 4539

* Support -?
 2017-01-13 01:24:12 -08:00
Livar Cunha
18a3dd60b5 Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped. 2017-01-12 18:23:35 -08:00
Krzysztof Wicher
22e85c2f77 fix stack trace for unhandled exceptions in dotnet-migrate 2017-01-12 16:08:54 -08:00
Krzysztof Wicher
5fea7c3ae6 Remove try catches choking all exceptions (#5206) 
* remove some try catches choking all exceptions

* rename ExceptionExtension to ReportAsWarning, show full stack instead of just message

* dotnet-migrate try catch clean-up

* fix migration test failures
 2017-01-12 15:42:36 -08:00
Livar
a9c5f4e90a Merge pull request #5293 from dotnet/dev/jgoshi/issue5253 
Migration: do not inject built in compile includes that the SDK does
 2017-01-12 15:00:03 -08:00
Pranav K
80c435e6a1 Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation 2017-01-12 13:49:28 -08:00
Livar Cunha
deb50a3cc7 Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list. 2017-01-12 11:38:05 -08:00
Livar Cunha
12abcf7208 Adding a few more packages that were not in the manifest and moving some tests around. 2017-01-12 11:38:05 -08:00
Livar Cunha
a0aa8150de Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one. 2017-01-12 11:38:05 -08:00
Livar Cunha
89fba856e8 Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift. 2017-01-12 11:38:05 -08:00
Justin Goshi
71da7f6a45 Migration: do not inject built in compile includes that the SDK does 2017-01-12 11:22:41 -08:00
Piotr Puszkiewicz
0f9888c11d Merge branch 'rel/1.0.0' into piotrpMSFT/merge/rc3toRTM 2017-01-11 17:15:44 -08:00
Krzysztof Wicher
c9b873caad make dotnet-build show build summary (#5277) 
* make dotnet-build show build summary

* Fix race in some dotnet-migrate (sln) tests
 2017-01-11 17:06:03 -08:00
Justin Goshi
03be0e56d4 Migration: Do not add RIDs for Library projects (#5279) 
* WIP

* Do not add runtime identifiers for libraries

* Reusing an existing test project

* Fix up tests
 2017-01-11 17:05:12 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85 merge RC3 into rel/1.0.0 2017-01-11 13:03:09 -08:00
Mike Lorbetske
ad6fab0a15 Synchronize templates with new3, add global.json (#5244) 
* Synchronize templates with new3, add global.json

* Add runtimeconfig.template.json for web

Removes global.json write during template creation

* Remove global.json check from the test

* making templates the same as new3 templates

* Fix broken PrivateAssets, content update

Sets OutputType as appropriate
Alphabetizes package references

* Rollback browserlink version to 1.0.0

* Downgrade 1.1.0 of browserlink to 1.0.0 as well

* Add newline to the end of the console project
 2017-01-10 22:58:30 -08:00
Eric Erhardt
635c0a192a Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-10 15:35:25 -06:00
Eric Erhardt
6f506b331c Fixing build break with latest NuGet packages. 2017-01-10 13:46:26 -06:00
Eric Erhardt
465655c85a Revert "Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rel/1.0.0" 
This reverts commit 4e951a480b, reversing
changes made to 006fd49e5c.
 2017-01-10 13:36:40 -06:00
seancpeters
4e951a480b Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rel/1.0.0 2017-01-10 10:50:40 -08:00
Livar Cunha
e71c58c156 Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 10:43:05 -08:00
Eric Erhardt
5035320247 Add NuGet version to DependencyVersions.props. 2017-01-10 10:43:14 -06:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -08:00
Nick Guerrera
ea2908504c Update xlf files 2017-01-09 08:58:13 -08:00
Livar
87e9815a25 Merge pull request #5234 from harshjain2/tpv2update 
Updated version of Test Platform
 2017-01-07 14:44:01 -08:00
Livar
f2f37729b8 Merge pull request #5235 from eerhardt/PopulateNuGetCache11 
Populate nuget cache for shared fx and asp.net 1.1
 2017-01-07 11:31:54 -08:00
Harsh Jain
d8a323f146 Removed output type as it is handled through Microsoft.NET.Test.Sdk 2017-01-07 20:51:36 +05:30