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
|
e617376bc7
|
Trailing newlines + standardize tabs -> spaces
|
2017-03-02 20:35:20 -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
|
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
|
14a7dd7ef1
|
Migrate now moves all file copies to the None element.
|
2017-02-23 18:47:17 -08:00 |
|
Livar Cunha
|
71aa93b164
|
Merging metadata with different values by setting the metadata values to be string joined and semi-column separated. This fixes the problem of having multiple mappings for the same file in a include/mappings.
|
2016-10-25 15:26:04 -07:00 |
|
Livar Cunha
|
883eb2e82f
|
Removing a test that is not necessary.
|
2016-10-20 15:53:31 -07:00 |
|
Livar Cunha
|
095105f2ec
|
Addressing code review comments.
|
2016-10-20 14:35:45 -07:00 |
|
Livar Cunha
|
dc0d87c826
|
Adding an additional test to validate mappings to the root of the package.
|
2016-10-20 11:56:30 -07:00 |
|
Livar Cunha
|
ddef1fc424
|
Adding pack files migration.
|
2016-10-20 11:56:07 -07:00 |
|
Livar Cunha
|
768e289f0c
|
Adding migrate PackOptions capabilities.
|
2016-09-22 16:14:27 -07:00 |
|