Piotr Puszkiewicz
5fe182e038
Merge issues
2017-03-03 00:36:11 -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
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
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
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
Eric Erhardt
ab887ec024
Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101
2017-02-25 14:30:53 -06: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
Justin Goshi
aefdb22ae4
Shorten test folder name
2017-02-17 17:02:15 -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
Livar
60f2b2e4ab
Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ
2017-01-26 20:46:56 -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
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
Justin Goshi
3884c90938
Merge from rel/1.0.0
2017-01-23 10:25:16 -08:00
Justin Goshi
baecbd8d43
WIP
2017-01-20 17:37:11 -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
Justin Goshi
5bbac55736
Migration: do not add a csproj to the solution if it already exists
2017-01-19 11:23:01 -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
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
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
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
a80e8fa636
Update Microsoft.NETCore.App to 1.0.3.
2017-01-05 08:57:53 -06:00
Justin Goshi
281eca2f8c
Disable tests that fail sporadically ( #5192 )
2017-01-03 11:06:51 -10: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
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
Krzysztof Wicher
a65d857f73
Merge pull request #5102 from krwq/i1494tools
...
fix tools when restoring with --packages
2016-12-20 18:20:25 -08:00
Livar Cunha
fadacc0aac
Updating the projects files in the repo to use the SDK attribute.
2016-12-20 15:52:50 -08:00
Justin Goshi
89f0b05958
Improve sln migration tests ( #5066 )
...
* WIP Improve sln migration tests
* Simple migration test
* Improve the test
* WIP update test assets
* Update test
* Test a bug fix
* Add another migrate sln test
* Fix FilePath related tests
* Finish the migrate sln tests
* Fix tests
* Fix another path issue
2016-12-20 13:04:01 -10:00
Krzysztof Wicher
59ae0e2d3d
fix tools when restoring with --packages
2016-12-20 12:18:55 -08:00
Krzysztof Wicher
ccfb4135c4
Add error message when tool is not restored
2016-12-19 14:12:04 -08:00
Krzysztof Wicher
8eaec8715b
Merge pull request #4972 from krwq/p2p-compat-check
...
add compat checks to dotnet add
2016-12-09 15:32:15 -08:00
Krzysztof Wicher
524fe3cb6b
apply review feedback
2016-12-09 12:11:11 -08:00
Livar Cunha
9bddb5bac7
Addressing code review comments.
2016-12-08 20:06:55 -08:00