Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions src/CS-Script.sln
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
46 changes: 0 additions & 46 deletions src/CSScriptLib/CSScriptLib.sln

This file was deleted.

2 changes: 1 addition & 1 deletion src/CSScriptLib/src/CSScriptLib/IEvaluator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public interface IEvaluator
/// an accidental referencing of the assembly or <see
/// cref="System.Runtime.Loader.AssemblyLoadContext"/>. 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.
/// </para>
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>Client_NET_5_CLI</RootNamespace>
<RootNamespace>Client.NET</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using CSScripting;
using CSScriptLib;

namespace ConsoleApp1
namespace Client.NET
{
public class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{737D212F-67D8-4695-BE1C-C98243ADE993}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>ConsoleApp2</RootNamespace>
<AssemblyName>ConsoleApp2</AssemblyName>
<RootNamespace>Client.NET472</RootNamespace>
<AssemblyName>Client.NET472</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using CSScripting;
using CSScriptLib;

namespace ConsoleApp1
namespace Client.NET472
{
class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4EB601D3-3643-464E-90C6-A49F97420CDF}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>ConsoleApp2</RootNamespace>
<AssemblyName>ConsoleApp2</AssemblyName>
<RootNamespace>Client.NET472</RootNamespace>
<AssemblyName>Client.NET472</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
Expand Down Expand Up @@ -84,7 +84,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Client.NET-Framework %28CodeDom%29\NetCompiler.cs">
<Compile Include="..\Client.NET472 %28CodeDom%29\NetCompiler.cs">
<Link>NetCompiler.cs</Link>
</Compile>
<Compile Include="Program.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using CSScripting;
using CSScriptLib;

namespace ConsoleApp1
namespace Client.NET472
{
class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<RootNamespace>Client.NET_6_WPF</RootNamespace>
<RootNamespace>Client.WPF</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/cscs/CodeDom/CompilerError.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/cscs/Utils/ReflectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static class AssemblyUnloadingExtensions
/// an accidental referencing of the assembly or <see
/// cref="System.Runtime.Loader.AssemblyLoadContext"/>. 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.
/// </para>
/// </summary>
Expand Down
Loading