diff --git a/src/CS-Script.sln b/src/CS-Script.sln index 0910f3e1..3d44672b 100644 --- a/src/CS-Script.sln +++ b/src/CS-Script.sln @@ -1,13 +1,31 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 +# Visual Studio Version 18 +VisualStudioVersion = 18.2.11415.280 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildServer", "BuildServer", "{B88CA45B-B3E9-4B93-A5B2-07136ED6B83C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildServer", "BuildServer\BuildServer.csproj", "{E1531A93-F78D-406D-B3F6-06367908F619}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassLib", "ClassLib", "{AD647B83-35A2-4B81-B2BF-82CCD7E55C2C}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSScriptLib", "CSScriptLib\src\CSScriptLib\CSScriptLib.csproj", "{55C76AC3-5FD6-4974-AF40-E4966126D09F}" ProjectSection(ProjectDependencies) = postProject {E1531A93-F78D-406D-B3F6-06367908F619} = {E1531A93-F78D-406D-B3F6-06367908F619} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{067A70CC-5214-43E0-AED8-908C710459FC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.NET", "CSScriptLib\src\Client.NET\Client.NET.csproj", "{C6172C46-BC09-47A5-B8DC-2987EDDE45EB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.NET472 (CodeDom)", "CSScriptLib\src\Client.NET472 (CodeDom)\Client.NET472 (CodeDom).csproj", "{737D212F-67D8-4695-BE1C-C98243ADE993}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.NET472 (Roslyn+CodeDom)", "CSScriptLib\src\Client.NET472 (Roslyn+CodeDom)\Client.NET472 (Roslyn+CodeDom).csproj", "{4EB601D3-3643-464E-90C6-A49F97420CDF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.WPF", "CSScriptLib\src\Client.WPF\Client.WPF.csproj", "{67314C02-51A5-48CF-A4F1-43307928F372}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLI", "CLI", "{6004D708-5D76-4CE2-A243-91F5D296C59B}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cscs", "cscs\cscs.csproj", "{847D3D48-443D-42F6-BB42-9467EC22994B}" ProjectSection(ProjectDependencies) = postProject {856DEA01-07B4-472D-9B82-73B37BBD1A25} = {856DEA01-07B4-472D-9B82-73B37BBD1A25} @@ -19,30 +37,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "csws", "csws\csws.csproj", {E1531A93-F78D-406D-B3F6-06367908F619} = {E1531A93-F78D-406D-B3F6-06367908F619} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildServer", "BuildServer\BuildServer.csproj", "{E1531A93-F78D-406D-B3F6-06367908F619}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3191C2A2-697D-434A-8C94-CF1694DD649B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.CLI", "Tests.cscs\Tests.CLI.csproj", "{52B0AD60-8BA7-40EB-B07B-5661057DBBBA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.CSScriptLib", "Tests.CSScriptLib\Tests.CSScriptLib.csproj", "{D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.NET-CLI", "CSScriptLib\src\Client.NET-Core\Client.NET-CLI.csproj", "{C6172C46-BC09-47A5-B8DC-2987EDDE45EB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{067A70CC-5214-43E0-AED8-908C710459FC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3191C2A2-697D-434A-8C94-CF1694DD649B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.NET_Framework (CodeDom)", "CSScriptLib\src\Client.NET-Framework (CodeDom)\Client.NET_Framework (CodeDom).csproj", "{737D212F-67D8-4695-BE1C-C98243ADE993}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.NET_Framework (Roslyn+CodeDom)", "CSScriptLib\src\Client.NET-Framework (Roslyn+CodeDom)\Client.NET_Framework (Roslyn+CodeDom).csproj", "{4EB601D3-3643-464E-90C6-A49F97420CDF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLI", "CLI", "{6004D708-5D76-4CE2-A243-91F5D296C59B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassLib", "ClassLib", "{AD647B83-35A2-4B81-B2BF-82CCD7E55C2C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.NET-WPF", "CSScriptLib\src\Client.WPF\Client.NET-WPF.csproj", "{67314C02-51A5-48CF-A4F1-43307928F372}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildServer", "BuildServer", "{B88CA45B-B3E9-4B93-A5B2-07136ED6B83C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{607BCC73-452D-4807-8DF8-13BF8140C841}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -56,6 +56,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E1531A93-F78D-406D-B3F6-06367908F619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1531A93-F78D-406D-B3F6-06367908F619}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1531A93-F78D-406D-B3F6-06367908F619}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1531A93-F78D-406D-B3F6-06367908F619}.Release|Any CPU.Build.0 = Release|Any CPU {55C76AC3-5FD6-4974-AF40-E4966126D09F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55C76AC3-5FD6-4974-AF40-E4966126D09F}.Debug|Any CPU.Build.0 = Debug|Any CPU {55C76AC3-5FD6-4974-AF40-E4966126D09F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -68,18 +72,6 @@ Global {856DEA01-07B4-472D-9B82-73B37BBD1A25}.Debug|Any CPU.Build.0 = Debug|Any CPU {856DEA01-07B4-472D-9B82-73B37BBD1A25}.Release|Any CPU.ActiveCfg = Release|Any CPU {856DEA01-07B4-472D-9B82-73B37BBD1A25}.Release|Any CPU.Build.0 = Release|Any CPU - {E1531A93-F78D-406D-B3F6-06367908F619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1531A93-F78D-406D-B3F6-06367908F619}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1531A93-F78D-406D-B3F6-06367908F619}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1531A93-F78D-406D-B3F6-06367908F619}.Release|Any CPU.Build.0 = Release|Any CPU - {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Release|Any CPU.Build.0 = Release|Any CPU - {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Release|Any CPU.Build.0 = Release|Any CPU {C6172C46-BC09-47A5-B8DC-2987EDDE45EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6172C46-BC09-47A5-B8DC-2987EDDE45EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6172C46-BC09-47A5-B8DC-2987EDDE45EB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -96,6 +88,14 @@ Global {67314C02-51A5-48CF-A4F1-43307928F372}.Debug|Any CPU.Build.0 = Debug|Any CPU {67314C02-51A5-48CF-A4F1-43307928F372}.Release|Any CPU.ActiveCfg = Release|Any CPU {67314C02-51A5-48CF-A4F1-43307928F372}.Release|Any CPU.Build.0 = Release|Any CPU + {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Release|Any CPU.Build.0 = Release|Any CPU + {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A}.Release|Any CPU.Build.0 = Release|Any CPU {ABB37908-97F9-4FEF-B63F-4785755D219D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ABB37908-97F9-4FEF-B63F-4785755D219D}.Debug|Any CPU.Build.0 = Debug|Any CPU {ABB37908-97F9-4FEF-B63F-4785755D219D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -105,17 +105,17 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {E1531A93-F78D-406D-B3F6-06367908F619} = {B88CA45B-B3E9-4B93-A5B2-07136ED6B83C} {55C76AC3-5FD6-4974-AF40-E4966126D09F} = {AD647B83-35A2-4B81-B2BF-82CCD7E55C2C} {847D3D48-443D-42F6-BB42-9467EC22994B} = {6004D708-5D76-4CE2-A243-91F5D296C59B} {856DEA01-07B4-472D-9B82-73B37BBD1A25} = {6004D708-5D76-4CE2-A243-91F5D296C59B} - {E1531A93-F78D-406D-B3F6-06367908F619} = {B88CA45B-B3E9-4B93-A5B2-07136ED6B83C} - {52B0AD60-8BA7-40EB-B07B-5661057DBBBA} = {3191C2A2-697D-434A-8C94-CF1694DD649B} - {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A} = {3191C2A2-697D-434A-8C94-CF1694DD649B} - {C6172C46-BC09-47A5-B8DC-2987EDDE45EB} = {067A70CC-5214-43E0-AED8-908C710459FC} {067A70CC-5214-43E0-AED8-908C710459FC} = {AD647B83-35A2-4B81-B2BF-82CCD7E55C2C} + {C6172C46-BC09-47A5-B8DC-2987EDDE45EB} = {067A70CC-5214-43E0-AED8-908C710459FC} {737D212F-67D8-4695-BE1C-C98243ADE993} = {067A70CC-5214-43E0-AED8-908C710459FC} {4EB601D3-3643-464E-90C6-A49F97420CDF} = {067A70CC-5214-43E0-AED8-908C710459FC} {67314C02-51A5-48CF-A4F1-43307928F372} = {067A70CC-5214-43E0-AED8-908C710459FC} + {52B0AD60-8BA7-40EB-B07B-5661057DBBBA} = {3191C2A2-697D-434A-8C94-CF1694DD649B} + {D28BEA4E-4680-4CFF-B13C-9BAE7AF1FE4A} = {3191C2A2-697D-434A-8C94-CF1694DD649B} {ABB37908-97F9-4FEF-B63F-4785755D219D} = {067A70CC-5214-43E0-AED8-908C710459FC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/CSScriptLib/CSScriptLib.sln b/src/CSScriptLib/CSScriptLib.sln deleted file mode 100644 index d5d0b835..00000000 --- a/src/CSScriptLib/CSScriptLib.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28B71453-90FA-48A7-8539-5A7805FC57A6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{931E155B-9F45-4E16-9DD7-06195895D778}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSScriptLib", "src\CSScriptLib\CSScriptLib.csproj", "{7CEA89C9-E906-4852-BA40-16BE33BCC2D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSScriptLib.Client", "src\CSScriptLib.Client\CSScriptLib.Client.csproj", "{CF94C31D-0DA0-4FDB-BF43-14CAECBD4824}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSScriptLib.Client461", "src\CSScriptLib.Client461\CSScriptLib.Client461.csproj", "{6010C75C-D3DC-426C-8622-D74A6B1581C6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7CEA89C9-E906-4852-BA40-16BE33BCC2D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CEA89C9-E906-4852-BA40-16BE33BCC2D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CEA89C9-E906-4852-BA40-16BE33BCC2D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CEA89C9-E906-4852-BA40-16BE33BCC2D1}.Release|Any CPU.Build.0 = Release|Any CPU - {CF94C31D-0DA0-4FDB-BF43-14CAECBD4824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF94C31D-0DA0-4FDB-BF43-14CAECBD4824}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF94C31D-0DA0-4FDB-BF43-14CAECBD4824}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF94C31D-0DA0-4FDB-BF43-14CAECBD4824}.Release|Any CPU.Build.0 = Release|Any CPU - {6010C75C-D3DC-426C-8622-D74A6B1581C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6010C75C-D3DC-426C-8622-D74A6B1581C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6010C75C-D3DC-426C-8622-D74A6B1581C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6010C75C-D3DC-426C-8622-D74A6B1581C6}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {7CEA89C9-E906-4852-BA40-16BE33BCC2D1} = {28B71453-90FA-48A7-8539-5A7805FC57A6} - {CF94C31D-0DA0-4FDB-BF43-14CAECBD4824} = {28B71453-90FA-48A7-8539-5A7805FC57A6} - {6010C75C-D3DC-426C-8622-D74A6B1581C6} = {28B71453-90FA-48A7-8539-5A7805FC57A6} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F7F5C618-7B9E-4998-83C0-F9F9B9405A24} - EndGlobalSection -EndGlobal diff --git a/src/CSScriptLib/src/CSScriptLib/IEvaluator.cs b/src/CSScriptLib/src/CSScriptLib/IEvaluator.cs index ecaf30a6..a03d819d 100644 --- a/src/CSScriptLib/src/CSScriptLib/IEvaluator.cs +++ b/src/CSScriptLib/src/CSScriptLib/IEvaluator.cs @@ -255,7 +255,7 @@ public interface IEvaluator /// an accidental referencing of the assembly or . Meaning that if you are planing to /// use assembly unloading you need to use interface based scripting. See `Test_Unloading` - /// (https://github.com/oleg-shilo/cs-script/blob/master/src/CSScriptLib/src/Client.NET-Core/Program.cs) + /// (https://github.com/oleg-shilo/cs-script/blob/master/src/CSScriptLib/src/Client.NET/Program.cs) /// sample for details. /// /// diff --git a/src/CSScriptLib/src/Client.NET-Core/Client.NET-CLI.csproj b/src/CSScriptLib/src/Client.NET/Client.NET.csproj similarity index 83% rename from src/CSScriptLib/src/Client.NET-Core/Client.NET-CLI.csproj rename to src/CSScriptLib/src/Client.NET/Client.NET.csproj index 47eeaae3..b77d2a3a 100644 --- a/src/CSScriptLib/src/Client.NET-Core/Client.NET-CLI.csproj +++ b/src/CSScriptLib/src/Client.NET/Client.NET.csproj @@ -3,7 +3,7 @@ Exe net10.0 - Client_NET_5_CLI + Client.NET diff --git a/src/CSScriptLib/src/Client.NET-Core/Program.cs b/src/CSScriptLib/src/Client.NET/Program.cs similarity index 99% rename from src/CSScriptLib/src/Client.NET-Core/Program.cs rename to src/CSScriptLib/src/Client.NET/Program.cs index db6551a7..9c0296b5 100644 --- a/src/CSScriptLib/src/Client.NET-Core/Program.cs +++ b/src/CSScriptLib/src/Client.NET/Program.cs @@ -7,7 +7,7 @@ using CSScripting; using CSScriptLib; -namespace ConsoleApp1 +namespace Client.NET { public class Program { diff --git a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/App.config b/src/CSScriptLib/src/Client.NET472 (CodeDom)/App.config similarity index 100% rename from src/CSScriptLib/src/Client.NET-Framework (CodeDom)/App.config rename to src/CSScriptLib/src/Client.NET472 (CodeDom)/App.config diff --git a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Client.NET_Framework (CodeDom).csproj b/src/CSScriptLib/src/Client.NET472 (CodeDom)/Client.NET472 (CodeDom).csproj similarity index 98% rename from src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Client.NET_Framework (CodeDom).csproj rename to src/CSScriptLib/src/Client.NET472 (CodeDom)/Client.NET472 (CodeDom).csproj index 68031882..6c69707d 100644 --- a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Client.NET_Framework (CodeDom).csproj +++ b/src/CSScriptLib/src/Client.NET472 (CodeDom)/Client.NET472 (CodeDom).csproj @@ -6,8 +6,8 @@ AnyCPU {737D212F-67D8-4695-BE1C-C98243ADE993} Exe - ConsoleApp2 - ConsoleApp2 + Client.NET472 + Client.NET472 v4.7.2 512 true diff --git a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/NetCompiler.cs b/src/CSScriptLib/src/Client.NET472 (CodeDom)/NetCompiler.cs similarity index 100% rename from src/CSScriptLib/src/Client.NET-Framework (CodeDom)/NetCompiler.cs rename to src/CSScriptLib/src/Client.NET472 (CodeDom)/NetCompiler.cs diff --git a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Program.cs b/src/CSScriptLib/src/Client.NET472 (CodeDom)/Program.cs similarity index 99% rename from src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Program.cs rename to src/CSScriptLib/src/Client.NET472 (CodeDom)/Program.cs index 310ea50d..1408d751 100644 --- a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Program.cs +++ b/src/CSScriptLib/src/Client.NET472 (CodeDom)/Program.cs @@ -10,7 +10,7 @@ using CSScripting; using CSScriptLib; -namespace ConsoleApp1 +namespace Client.NET472 { class Program { diff --git a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Properties/AssemblyInfo.cs b/src/CSScriptLib/src/Client.NET472 (CodeDom)/Properties/AssemblyInfo.cs similarity index 90% rename from src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Properties/AssemblyInfo.cs rename to src/CSScriptLib/src/Client.NET472 (CodeDom)/Properties/AssemblyInfo.cs index 9bf8016e..f3ea6830 100644 --- a/src/CSScriptLib/src/Client.NET-Framework (CodeDom)/Properties/AssemblyInfo.cs +++ b/src/CSScriptLib/src/Client.NET472 (CodeDom)/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ConsoleApp1")] +[assembly: AssemblyTitle("Client.NET472")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConsoleApp1")] -[assembly: AssemblyCopyright("Copyright © 2023")] +[assembly: AssemblyProduct("Client.NET472")] +[assembly: AssemblyCopyright("Copyright © 2026")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/App.config b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/App.config similarity index 100% rename from src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/App.config rename to src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/App.config diff --git a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Client.NET_Framework (Roslyn+CodeDom).csproj b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Client.NET472 (Roslyn+CodeDom).csproj similarity index 97% rename from src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Client.NET_Framework (Roslyn+CodeDom).csproj rename to src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Client.NET472 (Roslyn+CodeDom).csproj index 53410c41..092fd1d0 100644 --- a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Client.NET_Framework (Roslyn+CodeDom).csproj +++ b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Client.NET472 (Roslyn+CodeDom).csproj @@ -6,8 +6,8 @@ AnyCPU {4EB601D3-3643-464E-90C6-A49F97420CDF} Exe - ConsoleApp2 - ConsoleApp2 + Client.NET472 + Client.NET472 v4.7.2 512 true @@ -84,7 +84,7 @@ - + NetCompiler.cs diff --git a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/NetCompiler.cs b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/NetCompiler.cs similarity index 100% rename from src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/NetCompiler.cs rename to src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/NetCompiler.cs diff --git a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Program.cs b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Program.cs similarity index 99% rename from src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Program.cs rename to src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Program.cs index a0570046..011373a7 100644 --- a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Program.cs +++ b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Program.cs @@ -5,7 +5,7 @@ using CSScripting; using CSScriptLib; -namespace ConsoleApp1 +namespace Client.NET472 { class Program { diff --git a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Properties/AssemblyInfo.cs b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Properties/AssemblyInfo.cs similarity index 90% rename from src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Properties/AssemblyInfo.cs rename to src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Properties/AssemblyInfo.cs index e611eb13..a1b53649 100644 --- a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Properties/AssemblyInfo.cs +++ b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ConsoleApp2")] +[assembly: AssemblyTitle("Client.NET472")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConsoleApp2")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyProduct("Client.NET472")] +[assembly: AssemblyCopyright("Copyright © 2026")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/packages.config b/src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/packages.config similarity index 100% rename from src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/packages.config rename to src/CSScriptLib/src/Client.NET472 (Roslyn+CodeDom)/packages.config diff --git a/src/CSScriptLib/src/Client.WPF/Client.NET-WPF.csproj b/src/CSScriptLib/src/Client.WPF/Client.WPF.csproj similarity index 85% rename from src/CSScriptLib/src/Client.WPF/Client.NET-WPF.csproj rename to src/CSScriptLib/src/Client.WPF/Client.WPF.csproj index c1083bcc..24c2d7bf 100644 --- a/src/CSScriptLib/src/Client.WPF/Client.NET-WPF.csproj +++ b/src/CSScriptLib/src/Client.WPF/Client.WPF.csproj @@ -4,7 +4,7 @@ WinExe net10.0-windows true - Client.NET_6_WPF + Client.WPF diff --git a/src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs b/src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs index 65e5d4cb..5019d37a 100644 --- a/src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs +++ b/src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs @@ -31,7 +31,7 @@ public void call_UnloadAssembly() { // There is something strange happening under xUnit runtime. This very test runs fine // from a console app but under a test runner the assembly stays in the memory. Possibly - // because xUnit uses dynamic types. See "Test_Unloading" method for details (https://github.com/oleg-shilo/cs-script/blob/master/src/CSScriptLib/src/Client.NET-Core/Program.cs) + // because xUnit uses dynamic types. See "Test_Unloading" method for details (https://github.com/oleg-shilo/cs-script/blob/master/src/CSScriptLib/src/Client.NET/Program.cs) int? count = null; diff --git a/src/cscs/CodeDom/CompilerError.cs b/src/cscs/CodeDom/CompilerError.cs index 40ca8dcc..4942ddad 100644 --- a/src/cscs/CodeDom/CompilerError.cs +++ b/src/cscs/CodeDom/CompilerError.cs @@ -114,7 +114,7 @@ public static CompilerError Parse(string compilerOutput) result.ErrorText = description_items.Last(); // #error: 'this is the error...' result.ErrorNumber = description_items.First().Split(' ').Last(); // CS1029 result.IsWarning = isWarning; - result.FileName = match.Value.Substring(0, m.Index); // cript.cs + result.FileName = match.Value.Substring(0, m.Index); // script.cs result.Line = int.Parse(location_items[0]); // 11 result.Column = int.Parse(location_items[1]); // 8 diff --git a/src/cscs/Utils/ReflectionExtensions.cs b/src/cscs/Utils/ReflectionExtensions.cs index 97d09a1b..24864695 100644 --- a/src/cscs/Utils/ReflectionExtensions.cs +++ b/src/cscs/Utils/ReflectionExtensions.cs @@ -46,7 +46,7 @@ public static class AssemblyUnloadingExtensions /// an accidental referencing of the assembly or . Meaning that if you are planing to /// use assembly unloading you need to use interface based scripting. See `Test_Unloading` - /// (https://github.com/oleg-shilo/cs-script/blob/master/src/CSScriptLib/src/Client.NET-Core/Program.cs) + /// (https://github.com/oleg-shilo/cs-script/blob/master/src/CSScriptLib/src/Client.NET/Program.cs) /// sample for details. /// ///