diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index b75c5e5e7..c5d0447e1 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26524.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -68,7 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1 build\publish\PublishContent.targets = build\publish\PublishContent.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}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}" ProjectSection(SolutionItems) = preProject @@ -83,119 +83,121 @@ 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_fsc", "src\tool_fsharp\tool_fsc.csproj", "{32E9AEFC-EC97-41FA-84DD-74227A9A7692}" 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_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" 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_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" +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}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" 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}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" 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}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" 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}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" +EndProject +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-add-p2p.Tests", "test\dotnet-add-p2p.Tests\dotnet-add-p2p.Tests.csproj", "{C6BEBDCE-991D-4611-9CDE-9F3914979868}" 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}") = "Kestrel.Tests", "test\Kestrel.Tests\Kestrel.Tests.csproj", "{85296DB1-1999-4137-B6EE-CD417D64699C}" 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}") = "ScriptExecutorTests", "test\ScriptExecutorTests\ScriptExecutorTests.csproj", "{90C8861D-1C4C-4D2A-9715-B217760A1655}" 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -213,28 +215,30 @@ Global RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.ActiveCfg = Debug|x86 - {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|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|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 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Debug|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 @@ -1507,50 +1511,78 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.ActiveCfg = Debug|x86 - {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 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.ActiveCfg = Debug|x86 - {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 + {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|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 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Debug|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|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 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Debug|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 + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x64.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x64.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x86.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x86.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|Any CPU.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x64.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x64.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x86.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x86.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1621,5 +1653,6 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {C98C7C2E-2C29-4A40-958C-60561ED77791} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {32E9AEFC-EC97-41FA-84DD-74227A9A7692} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 9f8802765..f89553f02 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -126,6 +126,12 @@ VersionSuffix="$(VersionSuffix)" ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" /> + + @@ -169,6 +175,7 @@ + @@ -194,7 +201,8 @@ JITPath="$(LibCLRJitPath)" CrossgenPath="$(CrossgenPath)" ReadyToRun="True" - PlatformAssemblyPaths="@(PlatformAssemblies); + PlatformAssemblyPaths="%(CrossgenTargets.RootDir)%(CrossgenTargets.Directory); + @(PlatformAssemblies); @(CompileStageSdkDirectories); $(SharedFrameworkNameVersionPath)" /> diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index ed18c5be0..aaacd1108 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,6 +4,7 @@ 1.1.2 15.3.0-preview-000400-01 2.3.0-beta3-61816-04 + 4.2.0-rc-170621-0 1.1.0-alpha-20170615-3 4.3.0-preview3-4168 1.0.0-alpha-20170516-2-509 diff --git a/src/tool_fsharp/RunFsc.cmd b/src/tool_fsharp/RunFsc.cmd new file mode 100644 index 000000000..3be9b946f --- /dev/null +++ b/src/tool_fsharp/RunFsc.cmd @@ -0,0 +1,6 @@ +@echo off + +REM Copyright (c) .NET Foundation and contributors. All rights reserved. +REM Licensed under the MIT license. See LICENSE file in the project root for full license information. + +"%~dp0..\..\..\dotnet" "%~dp0fsc.exe" %* diff --git a/src/tool_fsharp/RunFsc.sh b/src/tool_fsharp/RunFsc.sh new file mode 100644 index 000000000..5ead81286 --- /dev/null +++ b/src/tool_fsharp/RunFsc.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +set -e + +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 )" + +"$DIR/../../../dotnet" "$DIR/fsc.exe" "$@" diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj new file mode 100644 index 000000000..1e1d45c90 --- /dev/null +++ b/src/tool_fsharp/tool_fsc.csproj @@ -0,0 +1,60 @@ + + + + + + $(CliVersionPrefix) + netcoreapp1.1 + true + + + + + + + + + + PreserveNewest + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +