Skip to content

Commit 2cc1331

Browse files
oleg-shilooleg-shilo
committed
# Release v4.8.10.0
--- ## Changes ### CLI - Added CLI help for `-new:cmd` command. - Added CLI listing custom commands for `-cmd`. - All dependencies are updated to the latest version - Added `SetEnvironmentVariable("EntryScript",...)` on opening script in VS - Updated -mkshim command script to allow relative path ### CSScriptLib - All dependencies are updated to the latest version - CSScriptLib: Issue #353: NET8: "Microsoft.CodeAnalysis.CSharp" has been changed to "Microsoft.CodeAnalysis.CSharp.Workspaces."
1 parent 4baf634 commit 2cc1331

File tree

22 files changed

+420
-1228
lines changed

22 files changed

+420
-1228
lines changed

‎src/1.build-binaries.cmd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ md "out\Linux\lib"
1818
md "out\Linux\-self"
1919
md "out\Linux\-self\-exe"
2020
md "out\Linux\-self\-test"
21+
md "out\Windows\-mkshim"
2122
md "out\Windows\-self"
2223
md "out\Windows\-self\-exe"
2324
md "out\Windows\-self\-test"
@@ -101,6 +102,8 @@ rd "out\Windows\console" /S /Q
101102
copy "out\static_content\global-usings.cs" "out\Windows\lib\global-usings.cs"
102103
copy "out\static_content\global-usings.cs" "out\Linux\lib\global-usings.cs"
103104

105+
copy "out\static_content\-mkshim\*" "out\Windows\-mkshim\"
106+
104107
copy "out\static_content\-self\*" "out\Windows\-self\"
105108
copy "out\static_content\-self\*" "out\Linux\-self\"
106109

@@ -155,6 +158,10 @@ cd ..\..
155158
cd out\Windows
156159
echo cd: %cd%
157160
..\ci\7z.exe a -r "..\cs-script.win.7z" "*.*"
161+
echo ==========================================
162+
echo .\cscs -l:0 -mkshim css.exe cscs.exe
163+
.\cscs -l:0 -mkshim css.exe cscs.exe
164+
echo ==========================================
158165
..\ci\7z.exe a -r "..\cs-script.win.zip" "*.*"
159166
cd ..\..
160167

‎src/BuildServer/out/build.runtimeconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"version": "8.0.0"
77
},
88
"configProperties": {
9+
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
910
"System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
1011
}
1112
}

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1616
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
17-
<Version>4.8.9.0</Version>
17+
<Version>4.8.10.0</Version>
1818
<Authors>Oleg Shilo</Authors>
1919
<Description>CS-Script engine Class Library for .NET 5 (and higher)</Description>
2020
<Copyright>(C) 2018-2023 Oleg Shilo</Copyright>
@@ -30,21 +30,16 @@
3030

3131
### CLI
3232

33-
v4.8.9.0
34-
- Updated NuGet support for .NET 8.0 packages
35-
36-
v4.8.8.0
37-
- Rebuilt for .NET 8.0
38-
- First WinGet release
39-
- Chocolatey package changed to address shim ambiguity with `css.exe`. Now it is a true shim generated by choco script.
40-
- Fixed problem with the default proj fle for -ng:dotnet always targeting .NET 7
33+
- Added CLI help for `-new:cmd` command.
34+
- Added CLI listing custom commands for `-cmd`.
35+
- All dependencies are updated to the latest version
4136

4237
### CSScriptLib
4338

44-
- no changes</PackageReleaseNotes>
39+
- All dependencies are updated to the latest version</PackageReleaseNotes>
4540
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
46-
<AssemblyVersion>4.8.9.0</AssemblyVersion>
47-
<FileVersion>4.8.9.0</FileVersion>
41+
<AssemblyVersion>4.8.10.0</AssemblyVersion>
42+
<FileVersion>4.8.10.0</FileVersion>
4843
<PackageLicenseExpression>MIT</PackageLicenseExpression>
4944
<PackageIcon>css_logo.png</PackageIcon>
5045
</PropertyGroup>

‎src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/App.config‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,19 @@
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
1123
</dependentAssembly>
1224
</assemblyBinding>
1325
</runtime>

‎src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/Client.NET_Framework (Roslyn+CodeDom).csproj‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,46 +35,43 @@
3635
<WarningLevel>4</WarningLevel>
3736
</PropertyGroup>
3837
<ItemGroup>
39-
<Reference Include="Microsoft.CodeAnalysis, Version=3.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.4.1.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
38+
<Reference Include="Microsoft.CodeAnalysis, Version=4.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.4.8.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
4240
</Reference>
43-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=3.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.4.1.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
41+
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.4.8.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
4643
</Reference>
47-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=3.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.4.1.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
44+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=4.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.4.8.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
5046
</Reference>
51-
<Reference Include="Microsoft.CodeAnalysis.Scripting">
52-
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.4.1.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
47+
<Reference Include="Microsoft.CodeAnalysis.Scripting, Version=4.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.4.8.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
5349
</Reference>
5450
<Reference Include="System" />
5551
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5652
<HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
5753
</Reference>
58-
<Reference Include="System.Collections.Immutable, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59-
<HintPath>..\..\..\packages\System.Collections.Immutable.5.0.0\lib\net461\System.Collections.Immutable.dll</HintPath>
54+
<Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
55+
<HintPath>..\..\..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
6056
</Reference>
6157
<Reference Include="System.Core" />
6258
<Reference Include="System.IO.Compression" />
6359
<Reference Include="System.IO.Compression.FileSystem" />
64-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
65-
<HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
60+
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
61+
<HintPath>..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
6662
</Reference>
6763
<Reference Include="System.Numerics" />
6864
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6965
<HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
7066
</Reference>
71-
<Reference Include="System.Reflection.Metadata, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<HintPath>..\..\..\packages\System.Reflection.Metadata.5.0.0\lib\net461\System.Reflection.Metadata.dll</HintPath>
67+
<Reference Include="System.Reflection.Metadata, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
68+
<HintPath>..\..\..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll</HintPath>
7369
</Reference>
74-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
70+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
7672
</Reference>
77-
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78-
<HintPath>..\..\..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
73+
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\..\..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
7975
</Reference>
8076
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
8177
<HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -105,16 +101,8 @@
105101
</ProjectReference>
106102
</ItemGroup>
107103
<ItemGroup>
108-
<Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
109-
<Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
104+
<Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
105+
<Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
110106
</ItemGroup>
111107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
113-
<PropertyGroup>
114-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
115-
</PropertyGroup>
116-
<Error Condition="!Exists('..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
117-
<Error Condition="!Exists('..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
118-
</Target>
119-
<Import Project="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
120108
</Project>

‎src/CSScriptLib/src/Client.NET-Framework (Roslyn+CodeDom)/packages.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
4-
<package id="Microsoft.CodeAnalysis.Common" version="3.11.0" targetFramework="net472" />
5-
<package id="Microsoft.CodeAnalysis.CSharp" version="3.11.0" targetFramework="net472" />
6-
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="3.11.0" targetFramework="net472" />
7-
<package id="Microsoft.CodeAnalysis.Scripting" version="3.11.0" targetFramework="net472" />
8-
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="3.11.0" targetFramework="net472" />
9-
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="net472" />
3+
<package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.4" targetFramework="net472" developmentDependency="true" />
4+
<package id="Microsoft.CodeAnalysis.Common" version="4.8.0" targetFramework="net472" />
5+
<package id="Microsoft.CodeAnalysis.CSharp" version="4.8.0" targetFramework="net472" />
6+
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.8.0" targetFramework="net472" />
7+
<package id="Microsoft.CodeAnalysis.Scripting" version="4.8.0" targetFramework="net472" />
8+
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="4.8.0" targetFramework="net472" />
9+
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
1010
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
11-
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net472" />
12-
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
11+
<package id="System.Collections.Immutable" version="8.0.0" targetFramework="net472" />
12+
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
1313
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
14-
<package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net472" />
15-
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
16-
<package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net472" />
14+
<package id="System.Reflection.Metadata" version="8.0.0" targetFramework="net472" />
15+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
16+
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net472" />
1717
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
1818
</packages>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.BPerf.Dia2Lib" Version="1.0.2" />
17-
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.42" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
17+
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.6" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1919
<PackageReference Include="Mono.Reflection.Core" Version="1.1.1" />
20-
<PackageReference Include="xunit" Version="2.4.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
20+
<PackageReference Include="xunit" Version="2.6.2" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

‎src/Tests.cscs/Tests.CLI.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.42" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
31-
<PackageReference Include="xunit" Version="2.4.1" />
32-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
29+
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.6" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
31+
<PackageReference Include="xunit" Version="2.6.2" />
32+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>

0 commit comments

Comments
 (0)