Skip to content

Commit adbfe2b

Browse files
oleg-shilooleg-shilo
committed
Bump version to 4.14.5.0, fix tuple issue, cleanup sln
1 parent 1e21659 commit adbfe2b

12 files changed

Lines changed: 235 additions & 267 deletions

File tree

‎help.txt‎

Lines changed: 194 additions & 210 deletions
Large diffs are not rendered by default.

‎src/CS-Script.sln‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 18.2.11415.280
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSScriptLib", "CSScriptLib\src\CSScriptLib\CSScriptLib.csproj", "{55C76AC3-5FD6-4974-AF40-E4966126D09F}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{E1531A93-F78D-406D-B3F6-06367908F619} = {E1531A93-F78D-406D-B3F6-06367908F619}
9-
EndProjectSection
107
EndProject
118
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cscs", "cscs\cscs.csproj", "{847D3D48-443D-42F6-BB42-9467EC22994B}"
129
ProjectSection(ProjectDependencies) = postProject
1310
{856DEA01-07B4-472D-9B82-73B37BBD1A25} = {856DEA01-07B4-472D-9B82-73B37BBD1A25}
14-
{E1531A93-F78D-406D-B3F6-06367908F619} = {E1531A93-F78D-406D-B3F6-06367908F619}
1511
EndProjectSection
1612
EndProject
1713
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "csws", "csws\csws.csproj", "{856DEA01-07B4-472D-9B82-73B37BBD1A25}"
18-
ProjectSection(ProjectDependencies) = postProject
19-
{E1531A93-F78D-406D-B3F6-06367908F619} = {E1531A93-F78D-406D-B3F6-06367908F619}
20-
EndProjectSection
21-
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildServer", "BuildServer\BuildServer.csproj", "{E1531A93-F78D-406D-B3F6-06367908F619}"
2314
EndProject
2415
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.CLI", "Tests.cscs\Tests.CLI.csproj", "{52B0AD60-8BA7-40EB-B07B-5661057DBBBA}"
2516
EndProject
@@ -39,8 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLI", "CLI", "{6004D708-5D7
3930
EndProject
4031
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassLib", "ClassLib", "{AD647B83-35A2-4B81-B2BF-82CCD7E55C2C}"
4132
EndProject
42-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildServer", "BuildServer", "{B88CA45B-B3E9-4B93-A5B2-07136ED6B83C}"
43-
EndProject
4433
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{607BCC73-452D-4807-8DF8-13BF8140C841}"
4534
ProjectSection(SolutionItems) = preProject
4635
.editorconfig = .editorconfig
@@ -66,10 +55,6 @@ Global
6655
{856DEA01-07B4-472D-9B82-73B37BBD1A25}.Debug|Any CPU.Build.0 = Debug|Any CPU
6756
{856DEA01-07B4-472D-9B82-73B37BBD1A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
6857
{856DEA01-07B4-472D-9B82-73B37BBD1A25}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{E1531A93-F78D-406D-B3F6-06367908F619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{E1531A93-F78D-406D-B3F6-06367908F619}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{E1531A93-F78D-406D-B3F6-06367908F619}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{E1531A93-F78D-406D-B3F6-06367908F619}.Release|Any CPU.Build.0 = Release|Any CPU
7358
{52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7459
{52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
7560
{52B0AD60-8BA7-40EB-B07B-5661057DBBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -102,7 +87,6 @@ Global
10287
{55C76AC3-5FD6-4974-AF40-E4966126D09F} = {AD647B83-35A2-4B81-B2BF-82CCD7E55C2C}
10388
{847D3D48-443D-42F6-BB42-9467EC22994B} = {6004D708-5D76-4CE2-A243-91F5D296C59B}
10489
{856DEA01-07B4-472D-9B82-73B37BBD1A25} = {6004D708-5D76-4CE2-A243-91F5D296C59B}
105-
{E1531A93-F78D-406D-B3F6-06367908F619} = {B88CA45B-B3E9-4B93-A5B2-07136ED6B83C}
10690
{52B0AD60-8BA7-40EB-B07B-5661057DBBBA} = {3191C2A2-697D-434A-8C94-CF1694DD649B}
10791
{C6172C46-BC09-47A5-B8DC-2987EDDE45EB} = {067A70CC-5214-43E0-AED8-908C710459FC}
10892
{737D212F-67D8-4695-BE1C-C98243ADE993} = {067A70CC-5214-43E0-AED8-908C710459FC}

‎src/CSScriptLib/src/CSScriptLib/CSScriptLib.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1717
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
18-
<Version>4.14.5.0</Version>
18+
<Version>4.14.5.0-pre</Version>
1919
<Authors>Oleg Shilo</Authors>
2020
<Description>CS-Script engine Class Library for .NET</Description>
2121
<Copyright>(C) 2018-2026 Oleg Shilo</Copyright>
@@ -31,16 +31,16 @@
3131

3232
### CLI
3333

34-
- Added multi-file and symbol support to Roslyn build pipeline
34+
- &amp;lt;no changes&amp;gt;
3535

3636

3737
### CSScriptLib
3838

39-
- Minor improvements: CompileInfo.CodeKind default is changed to `Regular` (related to #461)</PackageReleaseNotes>
39+
- #462: Predefined type 'System.Int32' is not defined or imported starting in v4.14.4</PackageReleaseNotes>
4040
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
4141
<AssemblyVersion>4.14.5.0</AssemblyVersion>
4242
<FileVersion>4.14.5.0</FileVersion>
43-
<PackageVersion>4.14.5.0</PackageVersion>
43+
<PackageVersion>4.14.5.0-pre</PackageVersion>
4444
<PackageLicenseExpression>MIT</PackageLicenseExpression>
4545
<PackageIcon>css_logo.png</PackageIcon>
4646
<SignAssembly>True</SignAssembly>

‎src/Tests.CSScriptLib/Evaluator.Roslyn.Tests.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Diagnostics;
4+
using System.Drawing;
45
using System.IO;
56
using System.Linq;
67
using System.Reflection;
@@ -423,6 +424,27 @@ public class Script
423424
CSScript.RoslynEvaluator.CompileAssemblyFromFile(scriptFile, calcAsm);
424425
}
425426

427+
[Fact]
428+
public void issue_462()
429+
{
430+
var scriptFile = testTempFile("script.cs");
431+
432+
var scriptCode = @"using System;
433+
public class Script
434+
{
435+
public (int, int) CreatePoint(int x, int y)
436+
{
437+
return (x, y);
438+
}
439+
}";
440+
441+
dynamic script = CSScript.Evaluator
442+
.LoadCode(scriptCode);
443+
444+
// Call method
445+
var p = script.CreatePoint(3, 5);
446+
}
447+
426448
[Fact]
427449
public void issue_417()
428450
{

‎src/chocolatey/cs-script.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>cs-script</id>
5-
<version>4.14.5.0</version>
5+
<version>4.14.5.0-pre</version>
66
<title>CS-Script</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>
@@ -30,12 +30,12 @@
3030

3131
### CLI
3232

33-
- Added multi-file and symbol support to Roslyn build pipeline
33+
- &amp;lt;no changes&amp;gt;
3434

3535

3636
### CSScriptLib
3737

38-
- Minor improvements: CompileInfo.CodeKind default is changed to `Regular` (related to #461)</releaseNotes>
38+
- #462: Predefined type 'System.Int32' is not defined or imported starting in v4.14.4</releaseNotes>
3939
<copyright>Oleg Shilo</copyright>
4040
<tags>cs-script C# script dynamic hosting</tags>
4141
<dependencies>

‎src/cscs/cscs.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>cscs</AssemblyName>
77
<RootNamespace>CSScripting</RootNamespace>
88
<StartupObject />
9-
<Version>4.14.5.0</Version>
9+
<Version>4.14.5.0-pre</Version>
1010
<Authors>Oleg Shilo</Authors>
1111
<Product>CS-Script</Product>
1212
<Copyright>(C) 2004-2026 Oleg Shilo</Copyright>
@@ -24,12 +24,12 @@
2424

2525
### CLI
2626

27-
- Added multi-file and symbol support to Roslyn build pipeline
27+
- &amp;lt;no changes&amp;gt;
2828

2929

3030
### CSScriptLib
3131

32-
- Minor improvements: CompileInfo.CodeKind default is changed to `Regular` (related to #461)</PackageReleaseNotes>
32+
- #462: Predefined type 'System.Int32' is not defined or imported starting in v4.14.4</PackageReleaseNotes>
3333
<PackageLicenseExpression>MIT</PackageLicenseExpression>
3434
<PackageIcon>css_logo.png</PackageIcon>
3535
<ApplicationIcon>css_logo.ico</ApplicationIcon>
@@ -166,4 +166,4 @@
166166
</None>
167167
</ItemGroup>
168168
<Target Name="PreBuild" BeforeTargets="PreBuildEvent"></Target>
169-
</Project>
169+
</Project>

‎src/csws/csws.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<UseWindowsForms>true</UseWindowsForms>
99
<RootNamespace>CSScripting</RootNamespace>
1010
<StartupObject />
11-
<Version>4.14.5.0</Version>
11+
<Version>4.14.5.0-pre</Version>
1212
<Authors>Oleg Shilo</Authors>
1313
<Product>CS-Script</Product>
1414
<Copyright>(C) 2004-2026 Oleg Shilo</Copyright>
@@ -27,12 +27,12 @@
2727

2828
### CLI
2929

30-
- Added multi-file and symbol support to Roslyn build pipeline
30+
- &amp;lt;no changes&amp;gt;
3131

3232

3333
### CSScriptLib
3434

35-
- Minor improvements: CompileInfo.CodeKind default is changed to `Regular` (related to #461)</PackageReleaseNotes>
35+
- #462: Predefined type 'System.Int32' is not defined or imported starting in v4.14.4</PackageReleaseNotes>
3636
<PackageLicenseExpression>MIT</PackageLicenseExpression>
3737
<ApplicationIcon>css_logo.ico</ApplicationIcon>
3838
<PackageIcon>..\logo\css_logo.png</PackageIcon>

‎src/out/Windows/csws.runtimeconfig.json‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/out/static_content/-self/-install/1.0.0.version renamed to src/out/static_content/-self/-install/1.0.1.version

File renamed without changes.

‎src/out/static_content/-self/-update/-run.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
5252
{
53+
WriteLine("Executing a shadow copy of css -self-update (to avoid locking)");
5354
Process.Start(new ProcessStartInfo
5455
{
5556
FileName = "cmd.exe",
@@ -132,8 +133,6 @@ void update(string css, string pm, string cmdExe, string cmdArgs, string noUpdat
132133
}
133134
}
134135

135-
Exit(0);
136-
137136
string Run(string app, string arguments, bool inExternalConsole = false)
138137
{
139138
StringBuilder sb = new();
@@ -166,7 +165,7 @@ string Run(string app, string arguments, bool inExternalConsole = false)
166165
errorThread.Start();
167166

168167
Thread inputThread = new Thread(() => HandleInput(process));
169-
inputThread.IsBackground = false;
168+
inputThread.IsBackground = true;
170169
inputThread.Start();
171170

172171
process.WaitForExit();

0 commit comments

Comments
 (0)