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

676 commits

Author SHA1 Message Date
Daniel Plaisted
af9a85fd3f Disable multilevel lookup and fix tests that were depending on .NET Core 1.0 shared framework 2017-04-27 12:56:28 -07:00
Daniel Plaisted
d471037ce3 Show error if tools package doesn't include runtimeconfig file 
For test assets, don't explicitly include the runtimeconfig file, as the pack command does it automatically
 2017-04-27 09:30:41 -07:00
Daniel Plaisted
4bf34512f8 Fix test asset which depends on SdkNuGetVersion property 2017-04-27 09:30:40 -07:00
Daniel Plaisted
cc9e942ede Apply code review feedback 2017-04-27 09:30:40 -07:00
Daniel Plaisted
06c1cc5990 Update test tools that need conflict resolution on 2.0 to target 2.0 2017-04-27 09:30:39 -07:00
Daniel Plaisted
01d3895b24 Add tests for behavior of tools that target previous major version of shared framework 2017-04-27 09:30:39 -07:00
Daniel Plaisted
ea7d84fbca Remove unnecessary RuntimeFrameworkVersion and DotnetCliToolTargetFramework from test assets 2017-04-27 09:30:38 -07:00
Livar Cunha
339bfe0168 Adding a work around for a test failure. 2017-04-26 10:30:04 -07:00
Livar
3f82e11a91 Merge branch 'master' into tp-insert-0414 2017-04-18 21:06:17 -07:00
Livar
78868ad33a Merge pull request #6320 from johnbeisner/CLI-backcompat-tests 
Adding a CLI Test: Execute a 1.0 tool in a netcoreapp1.1 project
 2017-04-17 10:05:40 -07:00
John Beisner
a8eb0d0f50 Changes per PR code review. 2017-04-17 09:27:25 -07:00
faahmad
b98dccb1f7 Fix tests 2017-04-17 07:31:03 -07:00
John Beisner
c51221d2f1 Adding "RequiresSpecificFrameworkFact("netcoreapp1.0")" to the 'ItRunsABackwardsVersionedTool' CLI test. 2017-04-14 13:31:12 -07:00
William Li
def4322783 Fix format 2017-04-14 10:35:36 -07:00
John Beisner
f56306cc62 Adding a CLI Test: Execute a 1.0 tool in a netcoreapp1.1 project 
https://github.com/dotnet/cli/issues/6229
 2017-04-14 09:40:46 -07:00
William Li
83f3a3ec86 Fix dotnet run double dash passing arguments 
When run “dotnet run -- foo”, foo should be the argument passed to the
subject app. After replacing the original parser, dotnet-run did not
utilize the “unparsedtoken” of the parsed result.

To append unparsedtoken to RunCommand’s argument is not straight
forward. RunCommand has an “immutable constructor”, which is a good
thing, so I made update RunCommand’s argument following the immutable
pattern -- create a new object with the original field but only change
the arguments. I also made these filed private set.
 2017-04-13 16:56:57 -07:00
Rama Krishnan Raghupathy
2f5673f953 moving dependecymodel and platformabstraction to preview1-001960 2017-04-11 17:00:50 -07:00
Eric Erhardt
ae78b87587 Update SDK to 2.0.0-alpha-20170410-1. 2017-04-10 14:24:52 -05:00
Livar Cunha
10e743e8e5 Switched to using a FallbackPackagePathResolver to find the tool dll, because now with Fallback folders, we can have the tool dll in the fallback folder but its assets file in the user nuget cache. This happens because Nuget never writes to the fallback folder, including the tool's assets file that it generates during restore. 2017-03-24 12:17:27 -07:00
Matt Ellis
6d25ee1f68 Add OSX.10.12 RID to some test assets 2017-03-24 11:29:10 -07:00
Livar
09f07e8b04 Merge pull request #6090 from eerhardt/Run 
Port #4403 back into the main source code.
 2017-03-21 13:11:02 -07:00
Eric Erhardt
55eb812664 Port #4403 back into the main source code. 
This change was lost when we converted the MSBuild "run3" verb to just "run".

Fix #6076
 2017-03-21 13:46:08 -05:00
Livar Cunha
ec7c81ea84 Disabling intermittent test and fixing assets for windows only tests. 2017-03-17 20:32:52 -07:00
Livar Cunha
bb178a5133 Updated tests to the new appropriate TFM 1.1, since we need a shared runtime besides 2.0 in the new distros. Once we have vstest for 2.0 then we won't need it anymore. 2017-03-17 20:32:51 -07:00
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07: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
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
e40435920d tests for cache taking multiple input files 2017-03-07 14:38:12 -08:00
Livar Cunha
03edcf6cfd Replacing dir.props with testassets.props for other test asset test projects. 2017-03-07 08:35:13 -08:00
Livar Cunha
ab28591c10 Replacing hard coded references to shared framework version. 2017-03-06 21:25:42 -08:00
Rich Lander
489cd753a5 Re-license as MIT (#5925) 2017-03-05 17:33:16 -08: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
5fe182e038 Merge issues 2017-03-03 00:36:11 -08:00
Livar Cunha
89b2785b74 Undoing a change that apparently broke the tests. 2017-03-03 00:20:17 -08:00
Piotr Puszkiewicz
e8d805ee1e Merge remote-tracking branch 'refs/remotes/livarcocc/merge_rel101_into_master' 
Conflicts:
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
 2017-03-02 23:50:15 -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
a97010d589 Fixing windows tests. I was missing the RuntimeFrameworkVersion in a desktop project, which meant that the metapackage version was being inferred as 2.0, which does not exist yet. 2017-03-02 23:48:26 -08:00
Livar Cunha
d20a1d4e2e Fixing failing test. 2017-03-02 23:43:06 -08:00
Piotr Puszkiewicz
ef23038dcd Yet more fixups 2017-03-02 22:35:24 -08:00
Piotr Puszkiewicz
db90fb2796 More Fixups 2017-03-02 21:56:44 -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
23396bdb8f Fixups 2017-03-02 21:33:29 -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
d847963ab7 Fix bad updates 2017-03-02 20:09:37 -08:00
Piotr Puszkiewicz
19e486bcb2 Version as Metadata in TestAssets 2017-03-02 19:52:26 -08:00
Livar Cunha
23e39c10b7 Moving as many of our test assets to netcoreapp2.0 as possible. I believe the only ones missing at the test packages, because tools always target 1.0. And the other ones are VSTestDotNetCore and VSTestXUnitDotNetCore, because we can't run tests on 2.0 yet. Or, when I tried it failed. I may came back to try this out later. 2017-03-02 17:41:21 -08:00
Livar Cunha
792cc7bf2a Fixing a couple of wrong merges. 2017-03-01 22:34:08 -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
Eric Erhardt
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
Piotr Puszkiewicz
3b04278b65 Shorten another Test Asset name 2017-02-28 13:11:34 -08:00
Piotr Puszkiewicz
5d6acc03d1 Fix long path 2017-02-28 11:58:06 -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 Cunha
a6165feec5 Adding an E2E test for pack with content during migration. 2017-02-23 23:07:38 -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
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
Eric Erhardt
8aaffc2238 Fix tests on netcoreapp1.1 only platforms 2017-02-22 21:34:21 -06:00
Livar Cunha
3ff78c64ff Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix. 2017-02-18 22:03:36 -08:00
Justin Goshi
aefdb22ae4 Shorten test folder name 2017-02-17 17:02:15 -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
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
Rama Krishnan Raghupathy
c20e106d75 Adding End to End test for cache and filtered publish 2017-02-13 17:56:25 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647) 
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
 2017-02-13 13:06:30 -08:00
Livar 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
Justin Emgarten
1c256d7c56 Removing extra PackageReference workaround for tests 
Fixes https://github.com/NuGet/Home/issues/4416
 2017-02-07 14:31:27 -08:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08: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
jonsequitur
905db127a6 use missing package test to verify correct package feed parsing 2017-02-01 14:13:07 -08:00
Livar Cunha
0c411e7e1f Adding another global.json to a failing test asset. 2017-02-01 13:58:15 -08:00
Livar Cunha
0c338ced75 Fixing a failing test. Basically, now that global.json paths have precedence, we were using the CLI global.json and finding the wrong project dependencies. 2017-02-01 12:15:00 -08: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
Livar Cunha
64042937cf Creating the half migrated test asset. 2017-02-01 10:33:53 -08: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
Rohit Agrawal
4c55fb6211 update nuget and sdk rtm-2241 (#5447) 
* update nuget and sdk rtm-2241

* Applying the no packagereference workaround.

* Fix merge issue

* add comments for restore related workarounds added in test assets
 2017-01-27 19:12:35 -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
Piotr Puszkiewicz
bbf14163a4 Merge branch 'rel/1.0.0' into PortChange 2017-01-27 02:08:49 -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
jonsequitur
8a79abe4c9 fix conditional 2017-01-26 14:48:42 -08:00
Piotr Puszkiewicz
add5f72573 Simplify desktop test packaging 2017-01-26 14:48:41 -08:00
jonsequitur
f66dbdb4b4 dotnet-desktop-and-portable.csproj to netcoreapp1.1 2017-01-26 14:48:41 -08:00
jonsequitur
25e3395684 dotnet-desktop-and-portable.csproj to netcoreapp1.0 2017-01-26 14:48:40 -08:00
jonsequitur
573c4efea5 test fixes 2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384 move additional tests to netcoreapp1.1 2017-01-26 14:48:40 -08:00
jonsequitur
d55be626a9 netcoreapp1.1 fixes 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 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
Justin Goshi
61ae452fe2 Updating tests 2017-01-26 09:55:09 -08:00
Justin Goshi
8b7c0ad468 Add more tests 2017-01-26 09:15:30 -08:00
Krzysztof Wicher
3fa73a90d4 fix EOL in test asset 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
000734d1ef Ignore explicit glob **/*.cs 2017-01-26 09:02:28 -08:00
Justin Goshi
ddf3261a67 Add more tests 2017-01-26 08:34:36 -08:00
Justin Goshi
150e3c4313 Add more tests 2017-01-25 17:28:57 -08:00
Justin Goshi
b8d4010d85 Handle some of the deprecated properties 2017-01-25 12:30:56 -08:00
Eric Erhardt
15930fac0f Fix build with latest stage0. 2017-01-24 17:53:19 -06: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
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
Livar Cunha
dbf4b5de77 Adding a test that verifies that running dotnet migrate solution.sln will only migrate the projects in the solution file. 2017-01-19 13:59:31 -08:00
Justin Goshi
56c3010f72 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-19 13:17:05 -08:00
Livar
c4e2c35d25 Merge branch 'rel/1.0.0' into migrate_global_json 2017-01-19 12:25:35 -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
Krzysztof Wicher
3e2b28f9eb fix a warning in a test asset causing test failure 2017-01-18 13:41:57 -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
Justin Goshi
a5fb786228 Ensure we don't downgrade VS version 2017-01-17 14:48:54 -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
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
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
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -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
Livar Cunha
8a6faa2dca Fixing windows test. 2017-01-10 14:12:04 -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
Rohit Agrawal
5bbfbfeeed update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214) 
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5

* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.

* add a nuget dependency so migrated project has packageref and generates an assets file on restore
 2017-01-06 16:28:04 -08:00
Livar
5bdbe354b2 Merge pull request #5226 from livarcocc/migrate_full_framework 
Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs
 2017-01-06 14:48:35 -08:00
Livar Cunha
0ebb92f3c4 Renaming a test asset to avoid running into long path issues on Windows. 2017-01-06 11:34:37 -08:00
Livar Cunha
b60b134674 Updating the M.NC.App version to 1.0.3 on a couple of new test assets. 2017-01-05 22:57:16 -08:00
Livar Cunha
7e5f18b584 Fixing full framework tests. 2017-01-05 22:55:43 -08:00
Livar Cunha
b41eb43883 Updating our projects and test assets to work with the latest SDK. 2017-01-05 19:44:52 -08:00
Livar Cunha
abe7641f03 Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs when no RIDs exist in the source PJ. This will allow build/publish etc to continue working in csproj without extra RIDs parameters in the command line. 2017-01-05 16:52:02 -08:00
Justin Goshi
f8de8d5a80 dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218) 
* dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid

* Create ProjectInstanceExtensions per PR comments
 2017-01-05 12:04:57 -10:00
Livar Cunha
205244fb8a Fixing failing test and making it work with the new SDK 2017-01-05 12:31:49 -08:00
Livar Cunha
3b69588db2 Picking up the latest SDK and adding back some named parameters to MigrateBuildOptionsRule for clarity. 
Updating the tool project to use BuiltProjectOutputGroupOutput instead of content because of SDK issue https://github.com/dotnet/sdk/issues/588
 2017-01-05 12:31:49 -08:00
Livar Cunha
3a4e23e373 Updating the SDK to an SDK that includes globing for source and resources implicitly. 2017-01-05 12:31:48 -08:00
Eric Erhardt
639d467c14 Merge pull request #5210 from eerhardt/UpdateSharedFx103 
Update Microsoft.NETCore.App to 1.0.3.
 2017-01-05 12:06:57 -06:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Justin Goshi
d0151a6111 Add/remove solution items based on directory structure (#5197) 
* WIP support solution folders for dotnet add and remove

* Add/remove solution folders based on directory hierarchy

* Fix tests

* Disable the solution building tests

* Address PR comments

* Fix a build break due to a new tool version used in the build

* Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
 2017-01-04 18:32:09 -10:00
Justin Goshi
281eca2f8c Disable tests that fail sporadically (#5192) 2017-01-03 11:06:51 -10:00
Justin Goshi
19b4bad315 Add/remove projects also updates build configurations (#5134) 
* Add/remove projects also updates build configurations

* Fix the algorithm for adding/removing build configurations

* Address PR comments
 2017-01-03 07:18:45 -10:00
Livar
a1a30e35a1 Merge pull request #5174 from livarcocc/no_transitive_dependency_migration 
Stopped doing hoisting of transitive project dependencies and references
 2016-12-28 20:24:12 -08:00
Livar Cunha
ad88058266 Stopped doing hoisting of transitive project dependencies and references. We also don't validate if a dependency exist, since migration strictly speaking does not need it. We move the project.json and the csproj will fail to build just like the project.json would. 2016-12-28 14:48:38 -08:00
Justin Goshi
35f2192f3b Improve Sln reader/writer tests (#5157) 
* WIP improve sln reader/writer tests

* Complete the tests
 2016-12-28 09:40:49 -10:00
Satya Madala
05df71825d Testplatform release 15.0.0-preview-20161227-02 (#5055) 
* Update testplatform packages version

* Refer TestPlatform version from DependencyVersions.props

* Updating the packages with respect to Testplatform release 15.0.0-preview-20161227-02

* Add dit.props to test assets projects
 2016-12-28 10:17:33 -08:00
Livar
b4ef34bc38 Merge pull request #5104 from livarcocc/update_sdks 
Updating the projects files in the repo to use the SDK attribute.
 2016-12-21 15:34:33 -08:00