From 2d08b5523a2fbe32f47cafca23f4cee5919e9b79 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 1 Mar 2017 14:54:07 -0800 Subject: [PATCH 1/2] Let VS2017 do its thing to the sln file --- Microsoft.DotNet.Cli.sln | 272 ++++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 129 deletions(-) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 227cdc110..5375bc42f 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +VisualStudioVersion = 15.0.26228.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -25,8 +24,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}" ProjectSection(SolutionItems) = preProject build\AzureInfo.props = build\AzureInfo.props - build\Branding.props = build\Branding.props build\BranchInfo.props = build\BranchInfo.props + build\Branding.props = build\Branding.props build\BuildDefaults.props = build\BuildDefaults.props build\BundledRuntimes.props = build\BundledRuntimes.props build\BundledSdks.proj = build\BundledSdks.proj @@ -45,10 +44,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\InputDirectories.props = build\InputDirectories.props build\InstallerInfo.props = build\InstallerInfo.props build\MSBuildExtensions.props = build\MSBuildExtensions.props - build\ProjectsToPublish.props = build\ProjectsToPublish.props build\OutputDirectories.props = build\OutputDirectories.props build\Package.targets = build\Package.targets build\Prepare.targets = build\Prepare.targets + build\ProjectsToPublish.props = build\ProjectsToPublish.props build\Publish.targets = build\Publish.targets build\Run.targets = build\Run.targets build\Signing.proj = build\Signing.proj @@ -85,14 +84,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B12960-ABB0-4903-9C60-5E9157E659C8}" ProjectSection(SolutionItems) = preProject - build\publish\FinishBuild.targets = build\publish\FinishBuild.targets build\publish\Badge.targets = build\publish\Badge.targets build\publish\Checksum.targets = build\publish\Checksum.targets + build\publish\FinishBuild.targets = build\publish\FinishBuild.targets build\publish\PublishContent.targets = build\publish\PublishContent.targets build\publish\PublishDebian.targets = build\publish\PublishDebian.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}" ProjectSection(SolutionItems) = preProject @@ -102,113 +101,113 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC build\prepare\UbuntuCoreclrAndCoreFxDependencies.props = build\prepare\UbuntuCoreclrAndCoreFxDependencies.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-dependency-context-test", "TestAssets\TestPackages\dotnet-dependency-context-test\dotnet-dependency-context-test.csproj", "{48A62BA4-D798-46A2-AB49-8A8471CF8165}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dependency-context-test", "TestAssets\TestPackages\dotnet-dependency-context-test\dotnet-dependency-context-test.csproj", "{48A62BA4-D798-46A2-AB49-8A8471CF8165}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-dependency-tool-invoker", "TestAssets\TestPackages\dotnet-dependency-tool-invoker\dotnet-dependency-tool-invoker.csproj", "{7C3D62C6-1D71-4C45-872F-7583F2AB304A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dependency-tool-invoker", "TestAssets\TestPackages\dotnet-dependency-tool-invoker\dotnet-dependency-tool-invoker.csproj", "{7C3D62C6-1D71-4C45-872F-7583F2AB304A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-desktop-and-portable", "TestAssets\TestPackages\dotnet-desktop-and-portable\dotnet-desktop-and-portable.csproj", "{79B4932C-3D57-494B-95AF-E5624F9D2F01}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-desktop-and-portable", "TestAssets\TestPackages\dotnet-desktop-and-portable\dotnet-desktop-and-portable.csproj", "{79B4932C-3D57-494B-95AF-E5624F9D2F01}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-desktop-binding-redirects", "TestAssets\TestPackages\dotnet-desktop-binding-redirects\dotnet-desktop-binding-redirects.csproj", "{1FC7922B-489D-42BF-81CD-31A37DD17E5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-desktop-binding-redirects", "TestAssets\TestPackages\dotnet-desktop-binding-redirects\dotnet-desktop-binding-redirects.csproj", "{1FC7922B-489D-42BF-81CD-31A37DD17E5D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v1", "v1", "{6BC1E4BF-7291-478A-ACF7-A0ED6F5A26D6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v2", "v2", "{590CF173-498A-4687-82FD-2649AA87274B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v1\dotnet-hello\dotnet-hello.csproj", "{AA831686-C4EB-4250-9EC3-D252303B36A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v1\dotnet-hello\dotnet-hello.csproj", "{AA831686-C4EB-4250-9EC3-D252303B36A2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v2\dotnet-hello\dotnet-hello.csproj", "{DED9654E-74A5-4BCB-83A4-05D4B78D7833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v2\dotnet-hello\dotnet-hello.csproj", "{DED9654E-74A5-4BCB-83A4-05D4B78D7833}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{2E852476-0B95-4A5B-9C29-53A950D1278F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{2E852476-0B95-4A5B-9C29-53A950D1278F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-prefercliruntime", "TestAssets\TestPackages\dotnet-prefercliruntime\dotnet-prefercliruntime.csproj", "{736BF068-7389-41B9-BF63-D4E49B9BC833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-prefercliruntime", "TestAssets\TestPackages\dotnet-prefercliruntime\dotnet-prefercliruntime.csproj", "{736BF068-7389-41B9-BF63-D4E49B9BC833}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageWithFakeNativeDep", "TestAssets\TestPackages\PackageWithFakeNativeDep\PackageWithFakeNativeDep.csproj", "{48408A19-CCC5-4C85-990B-0A9F827BF29A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageWithFakeNativeDep", "TestAssets\TestPackages\PackageWithFakeNativeDep\PackageWithFakeNativeDep.csproj", "{48408A19-CCC5-4C85-990B-0A9F827BF29A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolWithOutputName", "TestAssets\TestPackages\ToolWithOutputName\ToolWithOutputName.csproj", "{8FB83810-5A4C-4097-9A79-8E687E4981CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolWithOutputName", "TestAssets\TestPackages\ToolWithOutputName\ToolWithOutputName.csproj", "{8FB83810-5A4C-4097-9A79-8E687E4981CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-archive", "src\dotnet-archive\dotnet-archive.csproj", "{F0CB08B6-2809-4D37-B1DD-A9B7F1B0D95D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-archive", "src\dotnet-archive\dotnet-archive.csproj", "{F0CB08B6-2809-4D37-B1DD-A9B7F1B0D95D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet", "src\dotnet\dotnet.csproj", "{203F0362-DAFC-4679-A01E-7FBC331D8647}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\dotnet\dotnet.csproj", "{203F0362-DAFC-4679-A01E-7FBC331D8647}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.csproj", "{F8C66E8A-FC59-40B3-AC0F-58CA22526F76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.csproj", "{F8C66E8A-FC59-40B3-AC0F-58CA22526F76}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Utils", "src\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj", "{73ACEB34-D22C-43EA-87BE-EFC0E83D0126}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Utils", "src\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj", "{73ACEB34-D22C-43EA-87BE-EFC0E83D0126}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{ABB81DAE-0D26-483C-BE3B-0F9ACD812A62}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{ABB81DAE-0D26-483C-BE3B-0F9ACD812A62}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.InternalAbstractions", "src\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj", "{570950AD-A080-4F32-980C-F50E312910DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.InternalAbstractions", "src\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj", "{570950AD-A080-4F32-980C-F50E312910DF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.csproj", "{A8E6EFEB-027A-4C4B-A73C-C193A0F00569}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.csproj", "{A8E6EFEB-027A-4C4B-A73C-C193A0F00569}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{6592A22C-2386-4E83-A4D3-FC08075C723A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{6592A22C-2386-4E83-A4D3-FC08075C723A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{C3845C85-1F59-4552-BE52-32F513CE795F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{C3845C85-1F59-4552-BE52-32F513CE795F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Msi.Tests", "test\Installer\Microsoft.DotNet.Cli.Msi.Tests\Microsoft.DotNet.Cli.Msi.Tests.csproj", "{7F115EF9-1827-4175-B50E-F214A490093E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Msi.Tests", "test\Installer\Microsoft.DotNet.Cli.Msi.Tests\Microsoft.DotNet.Cli.Msi.Tests.csproj", "{7F115EF9-1827-4175-B50E-F214A490093E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Utils.Tests", "test\Microsoft.DotNet.Cli.Utils.Tests\Microsoft.DotNet.Cli.Utils.Tests.csproj", "{FC9A1FF2-86AC-4DBE-B045-1A8EE6E9B3F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Utils.Tests", "test\Microsoft.DotNet.Cli.Utils.Tests\Microsoft.DotNet.Cli.Utils.Tests.csproj", "{FC9A1FF2-86AC-4DBE-B045-1A8EE6E9B3F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.csproj", "{F228580D-9373-4A60-AB88-76DF58D11580}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.csproj", "{F228580D-9373-4A60-AB88-76DF58D11580}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProjectJsonMigration.Tests", "test\Microsoft.DotNet.ProjectJsonMigration.Tests\Microsoft.DotNet.ProjectJsonMigration.Tests.csproj", "{53F4CC00-72B3-4049-8888-FC05F622A9AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ProjectJsonMigration.Tests", "test\Microsoft.DotNet.ProjectJsonMigration.Tests\Microsoft.DotNet.ProjectJsonMigration.Tests.csproj", "{53F4CC00-72B3-4049-8888-FC05F622A9AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{48E260F4-6F3F-4387-B61F-D15BABD06D9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{48E260F4-6F3F-4387-B61F-D15BABD06D9A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Build.Framework", "build_projects\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.csproj", "{AA744891-5209-4335-8457-37EC347DF833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Build.Framework", "build_projects\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.csproj", "{AA744891-5209-4335-8457-37EC347DF833}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shared-build-targets-utils", "build_projects\shared-build-targets-utils\shared-build-targets-utils.csproj", "{DA3595A8-35DE-42B9-97A4-4A2461BAD554}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shared-build-targets-utils", "build_projects\shared-build-targets-utils\shared-build-targets-utils.csproj", "{DA3595A8-35DE-42B9-97A4-4A2461BAD554}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Sln.Internal", "src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj", "{C98C7C2E-2C29-4A40-958C-60561ED77791}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal", "src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj", "{C98C7C2E-2C29-4A40-958C-60561ED77791}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}" EndProject Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-cache.Tests", "test\dotnet-cache.Tests\dotnet-cache.Tests.csproj", "{CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}" EndProject @@ -230,27 +229,28 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.Build.0 = Debug|x86 + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x64.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x64.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {48A62BA4-D798-46A2-AB49-8A8471CF8165}.Debug|Any CPU.ActiveCfg = Release|Any CPU {48A62BA4-D798-46A2-AB49-8A8471CF8165}.Debug|Any CPU.Build.0 = Release|Any CPU {48A62BA4-D798-46A2-AB49-8A8471CF8165}.Debug|x64.ActiveCfg = Release|Any CPU @@ -1453,62 +1453,76 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.Build.0 = Debug|x86 + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x64.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x64.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.Build.0 = Debug|x86 + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x64.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x64.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.ActiveCfg = Debug|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.Build.0 = Debug|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.ActiveCfg = Debug|x86 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.Build.0 = Debug|x86 + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.ActiveCfg = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.Build.0 = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.ActiveCfg = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.Build.0 = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x64.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x86.Build.0 = Release|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|Any CPU.Build.0 = Release|Any CPU - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.ActiveCfg = Release|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.Build.0 = Release|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.ActiveCfg = Release|x86 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.Build.0 = Release|x86 + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From b28ec60ed0f24c9e00c458b158cea50a8bed03f3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 1 Mar 2017 14:55:12 -0800 Subject: [PATCH 2/2] Remove MigrationDefaultsConstructor --- Microsoft.DotNet.Cli.sln | 27 --- .../MigrationDefaultsConstructor.csproj | 19 -- tools/MigrationDefaultsConstructor/Program.cs | 193 ------------------ tools/MigrationDefaultsConstructor/README.md | 7 - tools/MigrationDefaultsConstructor/run.sh | 22 -- 5 files changed, 268 deletions(-) delete mode 100644 tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj delete mode 100755 tools/MigrationDefaultsConstructor/Program.cs delete mode 100644 tools/MigrationDefaultsConstructor/README.md delete mode 100755 tools/MigrationDefaultsConstructor/run.sh diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 5375bc42f..fa47e7ccf 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -151,8 +151,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuge EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" @@ -803,30 +801,6 @@ Global {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {3E28672F-F4E4-44D5-AEFB-1F425DECC57E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E28672F-F4E4-44D5-AEFB-1F425DECC57E}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E28672F-F4E4-44D5-AEFB-1F425DECC57E}.Debug|x64.ActiveCfg = Release|Any CPU @@ -1555,7 +1529,6 @@ Global {D82A3246-9831-4024-A9B2-1932EEF3D56F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {BE4C655A-DC54-4408-B739-743456D34111} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2} = {0722D325-24C8-4E83-B5AF-0A083E7F0749} - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42} = {0722D325-24C8-4E83-B5AF-0A083E7F0749} {3E28672F-F4E4-44D5-AEFB-1F425DECC57E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {A5CA696F-585E-40AB-912C-6316BC330C5E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {4EF497BF-D717-4E03-90B1-932C7F51B918} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj deleted file mode 100644 index bc9389356..000000000 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - netcoreapp2.0 - portable - Exe - $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - $(CLI_SharedFrameworkVersion) - - - $(CLI_MSBuild_Version) - - - \ No newline at end of file diff --git a/tools/MigrationDefaultsConstructor/Program.cs b/tools/MigrationDefaultsConstructor/Program.cs deleted file mode 100755 index d5c05de11..000000000 --- a/tools/MigrationDefaultsConstructor/Program.cs +++ /dev/null @@ -1,193 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Collections.Generic; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Newtonsoft.Json; -using System.Threading; -using Microsoft.Build.Construction; -using Microsoft.DotNet.ProjectJsonMigration.Models; - -namespace MigrationDefaultsConstructor -{ - public class Program - { - private const string c_temporaryDotnetNewMSBuildProjectName = "p"; - - static void Main(string[] args) - { - var sdkRootPath=args[0]; - - var beforeCommonSdkTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.BeforeCommon.targets"); - var commonSdkTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.Common.targets"); - var sdkTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.targets"); - var sdkPropsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.props"); - var csharpTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.CSharp.targets"); - var csharpPropsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.CSharp.props"); - - var beforeCommonSdkTargetsFile = ProjectRootElement.Open(beforeCommonSdkTargetsFilePath); - var commonSdkTargetsFile = ProjectRootElement.Open(commonSdkTargetsFilePath); - var sdkTargetsFile = ProjectRootElement.Open(sdkTargetsFilePath); - var sdkPropsFile = ProjectRootElement.Open(sdkPropsFilePath); - var csharpPropsFile = ProjectRootElement.Open(csharpPropsFilePath); - var csharpTargetsFile = ProjectRootElement.Open(csharpTargetsFilePath); - - var allProperties = new List(); - var allItems = new List(); - - AddPropertyDefault(allProperties, sdkPropsFile, "OutputType"); - AddPropertyDefault(allProperties, sdkPropsFile, "Configuration", ignoreConditions: true); - AddPropertyDefault(allProperties, sdkPropsFile, "Platform"); - AddPropertyDefault(allProperties, sdkPropsFile, "FileAlignment"); - AddPropertyDefault(allProperties, sdkPropsFile, "PlatformTarget"); - AddPropertyDefault(allProperties, sdkPropsFile, "ErrorReport"); - AddPropertyDefault(allProperties, sdkPropsFile, "AssemblyName"); - AddPropertyDefault(allProperties, sdkPropsFile, "RootNamespace"); - AddPropertyDefault(allProperties, sdkPropsFile, "Deterministic"); - - AddPropertyDefault(allProperties, csharpPropsFile, "WarningLevel"); - AddPropertyDefault(allProperties, csharpPropsFile, "NoWarn"); - - AddHardcodedPropertyDefault(allProperties, "PackageRequireLicenseAcceptance", "false"); - - AddConfigurationPropertyDefaults(allProperties, sdkPropsFile, "Debug"); - AddConfigurationPropertyDefaults(allProperties, sdkPropsFile, "Release"); - - AddConfigurationPropertyDefaults(allProperties, csharpPropsFile, "Debug"); - AddConfigurationPropertyDefaults(allProperties, csharpPropsFile, "Release"); - - AddPropertyDefault(allProperties, commonSdkTargetsFile, "VersionPrefix", ignoreConditions: true); - AddPropertyDefault(allProperties, commonSdkTargetsFile, "AssemblyTitle", ignoreConditions: true); - AddPropertyDefault(allProperties, commonSdkTargetsFile, "Product", ignoreConditions: true); - AddPropertyDefault(allProperties, commonSdkTargetsFile, "NeutralLanguage", ignoreConditions: true); - - AddPropertyDefault(allProperties, beforeCommonSdkTargetsFile, "AutoUnifyAssemblyReferences", ignoreConditions: true); - AddPropertyDefault(allProperties, beforeCommonSdkTargetsFile, "DesignTimeAutoUnify", ignoreConditions: true); - AddPropertyDefault(allProperties, beforeCommonSdkTargetsFile, "TargetExt", ignoreConditions: true); - - AddCompileAndEmbeddedResourceDefaults(allItems, sdkTargetsFile); - - var wrapper = new SerializableMigrationDefaultsInfo() - { - Items = allItems, - Properties = allProperties - }; - - var output = Path.Combine(Directory.GetCurrentDirectory(), "sdkdefaults.json"); - string json = JsonConvert.SerializeObject(wrapper, Formatting.Indented); - File.WriteAllText(output, json); - } - - private static void AddHardcodedPropertyDefault(List allProperties, - string name, - string value, - string condition="", - string parentCondition="") - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = name, - Value = value, - Condition = condition, - ParentCondition = parentCondition - }; - - allProperties.Add(propertyInfo); - } - - private static void AddCompileAndEmbeddedResourceDefaults(List allItems, ProjectRootElement msbuild) - { - var exclude = msbuild.Properties.Where(p=>p.Name == "DefaultExcludes").First().Value; - - var compileInclude = msbuild.Items.Where(i => i.ItemType == "Compile").First().Include; - if (string.IsNullOrEmpty(compileInclude)) - { - compileInclude = "**\\*.cs"; - } - - var embedInclude = msbuild.Items.Where(i => i.ItemType == "EmbeddedResource").First().Include; - if (string.IsNullOrEmpty(embedInclude)) - { - embedInclude = "**\\*.resx"; - } - - allItems.Add(new DefaultProjectItemInfo - { - ItemType = "Compile", - Include=compileInclude, - Exclude=exclude - }); - - allItems.Add(new DefaultProjectItemInfo - { - ItemType = "EmbeddedResource", - Include=embedInclude, - Exclude=exclude - }); - } - - private static void AddConfigurationPropertyDefaults(List allProperties, ProjectRootElement msbuild, string config) - { - var configPropertyGroup = msbuild.PropertyGroups.Where(p => p.Condition.Contains("$(Configuration)") && p.Condition.Contains(config)).First(); - - configPropertyGroup.Condition = $" '$(Configuration)' == '{config}' "; - - foreach (var property in configPropertyGroup.Properties) - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = property.Name, - Value = property.Value, - Condition = property.Condition, - ParentCondition = property.Parent.Condition - }; - - allProperties.Add(propertyInfo); - } - } - - private static void AddPropertyDefault(List allProperties, ProjectRootElement msbuild, string propertyName, int? index=null, bool ignoreConditions=false) - { - var properties = msbuild.Properties.Where(p => p.Name == propertyName).ToList(); - if (!properties.Any()) - { - throw new Exception("property not found:" + propertyName); - } - - if (properties.Count() > 1 && index == null) - { - throw new Exception("More than one property found but index is null:" + propertyName); - } - - var property = properties[index ?? 0]; - - if (ignoreConditions) - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = property.Name, - Value = property.Value, - Condition = null, - ParentCondition = null - }; - - allProperties.Add(propertyInfo); - } - else - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = property.Name, - Value = property.Value, - Condition = property.Condition, - ParentCondition = property.Parent.Condition - }; - - allProperties.Add(propertyInfo); - } - } - } -} diff --git a/tools/MigrationDefaultsConstructor/README.md b/tools/MigrationDefaultsConstructor/README.md deleted file mode 100644 index a3ad7f386..000000000 --- a/tools/MigrationDefaultsConstructor/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Migration Defaults Constructor - -This pulls the migration property and item defaults from a clone of the dotnet/sdk repo. - -Run `./run.sh` to generate an sdkdefaults.json - -Move it to the Microsoft.DotNet.ProjectJsonMigration project under `src` to override the defaults in dotnet (it's embedded as a resource). \ No newline at end of file diff --git a/tools/MigrationDefaultsConstructor/run.sh b/tools/MigrationDefaultsConstructor/run.sh deleted file mode 100755 index 77e4c0877..000000000 --- a/tools/MigrationDefaultsConstructor/run.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - -rm -rf bin obj -dotnet publish -o bin -f netcoreapp1.0 -cp -a "$DIR/bin/runtimes/any/native/." "$DIR/bin" - -sdkRevision="cc1fc023e3375b3944dbedfdd4ba2b5d2cbd01f0" -sdkRoot="$DIR/bin/sdk" -(cd bin && \ - git clone https://github.com/dotnet/sdk.git && \ - cd sdk && \ - git reset --hard $sdkRevision) - -dotnet "$DIR/bin/MigrationDefaultsConstructor.dll" "$sdkRoot" \ No newline at end of file