diff --git a/CrossPlatform.sln b/CrossPlatform.sln index 8867c6ba7d6540818ab3c5130f935c0c699b4b77..4b9821b68014826faa986be7e46f24e0fad56d53 100644 --- a/CrossPlatform.sln +++ b/CrossPlatform.sln @@ -91,6 +91,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSBuildTask", "src\Compiler EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTestUtilities", "src\Scripting\CoreTestUtilities\ScriptingTestUtilities.csproj", "{21A01C2D-2501-4619-8144-48977DD22D9C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interactive", "Interactive", "{FED79E76-76A7-48A1-B0F1-E5E56B5E7FE4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{0F0F4F95-0BEC-4623-9B26-DBD662F1193F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsiCore", "src\Interactive\CsiCore\CsiCore.csproj", "{D1B051A4-F2A1-4E97-9747-C41D13E475FD}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VbiCore", "src\Interactive\VbiCore\VbiCore.vbproj", "{1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4 @@ -130,8 +138,8 @@ Global {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|ARM.Build.0 = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.ActiveCfg = Debug|x64 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.Build.0 = Debug|x64 + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.ActiveCfg = Debug|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.Build.0 = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.ActiveCfg = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.Build.0 = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -140,8 +148,8 @@ Global {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|ARM.Build.0 = Release|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.ActiveCfg = Release|x64 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.Build.0 = Release|x64 + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.ActiveCfg = Release|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.Build.0 = Release|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.ActiveCfg = Release|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.Build.0 = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -150,8 +158,8 @@ Global {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|ARM.Build.0 = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.ActiveCfg = Debug|x64 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.Build.0 = Debug|x64 + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.ActiveCfg = Debug|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.Build.0 = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.ActiveCfg = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.Build.0 = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -160,8 +168,8 @@ Global {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|ARM.Build.0 = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.ActiveCfg = Release|x64 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.Build.0 = Release|x64 + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.ActiveCfg = Release|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.Build.0 = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.ActiveCfg = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.Build.0 = Release|Any CPU {50D26304-0961-4A51-ABF6-6CAD1A56D202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -186,22 +194,22 @@ Global {50D26304-0961-4A51-ABF6-6CAD1A56D202}.Release|x86.Build.0 = Release|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|ARM.ActiveCfg = Debug|ARM - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|ARM.Build.0 = Debug|ARM + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|ARM.Build.0 = Debug|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x64.ActiveCfg = Debug|x64 - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x64.Build.0 = Debug|x64 + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x64.ActiveCfg = Debug|Any CPU + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x64.Build.0 = Debug|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x86.ActiveCfg = Debug|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x86.Build.0 = Debug|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Any CPU.Build.0 = Release|Any CPU - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|ARM.ActiveCfg = Release|ARM - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|ARM.Build.0 = Release|ARM + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|ARM.ActiveCfg = Release|Any CPU + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|ARM.Build.0 = Release|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x64.ActiveCfg = Release|x64 - {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x64.Build.0 = Release|x64 + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x64.ActiveCfg = Release|Any CPU + {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x64.Build.0 = Release|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.ActiveCfg = Release|Any CPU {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.Build.0 = Release|Any CPU {4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -700,6 +708,46 @@ Global {21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x64.Build.0 = Release|Any CPU {21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x86.ActiveCfg = Release|Any CPU {21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x86.Build.0 = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|ARM.Build.0 = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|x64.ActiveCfg = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|x64.Build.0 = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|x86.ActiveCfg = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|x86.Build.0 = Debug|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Any CPU.Build.0 = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|ARM.ActiveCfg = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|ARM.Build.0 = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|x64.ActiveCfg = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|x64.Build.0 = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|x86.ActiveCfg = Release|Any CPU + {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|x86.Build.0 = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|ARM.Build.0 = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|x64.ActiveCfg = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|x64.Build.0 = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|x86.ActiveCfg = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|x86.Build.0 = Debug|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Any CPU.Build.0 = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|ARM.ActiveCfg = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|ARM.Build.0 = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x64.ActiveCfg = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x64.Build.0 = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x86.ActiveCfg = Release|Any CPU + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -743,5 +791,8 @@ Global {C1930979-C824-496B-A630-70F5369A636F} = {A18BACE1-BB66-4156-8E89-81429A5814C6} {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {21A01C2D-2501-4619-8144-48977DD22D9C} = {A6F70573-57FE-49F9-A26C-75B8D202B795} + {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} = {FED79E76-76A7-48A1-B0F1-E5E56B5E7FE4} + {D1B051A4-F2A1-4E97-9747-C41D13E475FD} = {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} + {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD} = {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} EndGlobalSection EndGlobal diff --git a/src/Interactive/CsiCore/CsiCore.csproj b/src/Interactive/CsiCore/CsiCore.csproj index ae395803470b67d54b99e454670b63a678ed75ff..073337565a85140f1e92a3a594e022e3458ff67e 100644 --- a/src/Interactive/CsiCore/CsiCore.csproj +++ b/src/Interactive/CsiCore/CsiCore.csproj @@ -1,4 +1,4 @@ - + @@ -14,7 +14,6 @@ .NETPortable v5.0 true - ExeNonDeployment diff --git a/src/Interactive/VbiCore/VbiCore.vbproj b/src/Interactive/VbiCore/VbiCore.vbproj index 0c05238097212bd39ef51519b4703c3baf3210c8..b207865d08cc3bf795659ec367bd3b42347062ca 100644 --- a/src/Interactive/VbiCore/VbiCore.vbproj +++ b/src/Interactive/VbiCore/VbiCore.vbproj @@ -1,4 +1,4 @@ - + @@ -15,7 +15,6 @@ .NETPortable v5.0 true - ExeNonDeployment diff --git a/src/Tools/CommonNetCoreReferences/project.json b/src/Tools/CommonNetCoreReferences/project.json index 98988a3cefb40a5fb840e948e716aa0f6b2e112a..8bff85f1d4521927847e47d1ce70cffcf3f40416 100644 --- a/src/Tools/CommonNetCoreReferences/project.json +++ b/src/Tools/CommonNetCoreReferences/project.json @@ -34,6 +34,8 @@ "System.Runtime.InteropServices": "4.3.0", "System.Runtime.Loader": "4.3.0", "System.Runtime.Numerics": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Runtime.Serialization.Json": "4.3.0", "System.Security.Cryptography.Algorithms": "4.3.0", "System.Security.Cryptography.Encoding": "4.3.0", "System.Security.Cryptography.X509Certificates": "4.3.0",