Skip to content

Commit 46a43ae

Browse files
oleg-shilooleg-shilo
committed
Pre-Release v4.8.4-pre
--- ## Changes ### CLI - no changes ### CSScriptLib - Issue #343: Publish to single file gives an empty Assembly.Location which crashes Roslyn Evaluator Added support for single-file publishing with runtime dependency
1 parent 1e264ac commit 46a43ae

File tree

11 files changed

+33
-26
lines changed

11 files changed

+33
-26
lines changed

‎help.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C# Script execution engine (.NET Core). Version 4.8.3.0.
1+
C# Script execution engine (.NET Core). Version 4.8.4.0.
22
Copyright (C) 2004-2020 Oleg Shilo.
33

44

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"framework": {
55
"name": "Microsoft.NETCore.App",
66
"version": "7.0.0"
7+
},
8+
"configProperties": {
9+
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
710
}
811
}
912
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1515
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1616
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
17-
<Version>4.8.3.0</Version>
17+
<Version>4.8.4.0</Version>
1818
<Authors>Oleg Shilo</Authors>
1919
<Description>CS-Script engine Class Library for .NET 5 (and higher)</Description>
20-
<Copyright>(C) 2018-2022 Oleg Shilo</Copyright>
20+
<Copyright>(C) 2018-2023 Oleg Shilo</Copyright>
2121
<PackageLicenseUrl></PackageLicenseUrl>
2222
<PackageProjectUrl>https://github.com/oleg-shilo/cs-script</PackageProjectUrl>
2323
<PackageIconUrl></PackageIconUrl>
@@ -30,15 +30,15 @@
3030

3131
### CLI
3232

33-
- Issue #336 (further optimization)
33+
- no changes
3434

3535
### CSScriptLib
3636

3737
- Issue #343: Publish to single file gives an empty Assembly.Location which crashes Roslyn Evaluator
38-
- Added support for single-file published host applications</PackageReleaseNotes>
38+
Added support for single-file publishing with runtime dependency</PackageReleaseNotes>
3939
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
40-
<AssemblyVersion>4.8.3.0</AssemblyVersion>
41-
<FileVersion>4.8.3.0</FileVersion>
40+
<AssemblyVersion>4.8.4.0</AssemblyVersion>
41+
<FileVersion>4.8.4.0</FileVersion>
4242
<PackageLicenseExpression>MIT</PackageLicenseExpression>
4343
<PackageIcon>css_logo.png</PackageIcon>
4444
</PropertyGroup>

‎src/CSScriptLib/src/Client.SingleFileBuild/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using CSScriptLib;
44
using Microsoft.CodeAnalysis;
55

6+
// publishing as a single-file with and without runtime dependency
7+
// dotnet publish --configuration Release --output .\publish --self-contained false
68
// dotnet publish --configuration Release --output .\publish --self-contained true
79

810
// ---------------------------

‎src/cscs/Utils/ReflectionExtensions.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public static string Location(this Assembly asm)
190190
else
191191
return asm.Location;
192192
}
193+
#pragma warning disable CS0168
193194
catch (Exception ex)
194195
{
195196
#if class_lib
@@ -200,6 +201,7 @@ public static string Location(this Assembly asm)
200201
return null;
201202
#endif
202203
throw;
204+
#pragma warning restore CS0168
203205
}
204206
}
205207

‎src/cscs/cscs.csproj‎

Lines changed: 5 additions & 5 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.8.3.0</Version>
9+
<Version>4.8.4.0</Version>
1010
<Authors>Oleg Shilo</Authors>
1111
<Product>CS-Script</Product>
1212
<Copyright>(C) 2004-2023 Oleg Shilo</Copyright>
@@ -17,20 +17,20 @@
1717
<RepositoryUrl>https://github.com/oleg-shilo/cs-script</RepositoryUrl>
1818
<RepositoryType>git</RepositoryType>
1919
<PackageTags>C# script dynamic</PackageTags>
20-
<AssemblyVersion>4.8.3.0</AssemblyVersion>
21-
<FileVersion>4.8.3.0</FileVersion>
20+
<AssemblyVersion>4.8.4.0</AssemblyVersion>
21+
<FileVersion>4.8.4.0</FileVersion>
2222
<PackageReleaseNotes>---
2323

2424
## Changes
2525

2626
### CLI
2727

28-
- Issue #336 (further optimization)
28+
- no changes
2929

3030
### CSScriptLib
3131

3232
- Issue #343: Publish to single file gives an empty Assembly.Location which crashes Roslyn Evaluator
33-
- Added support for single-file published host applications</PackageReleaseNotes>
33+
Added support for single-file publishing with runtime dependency</PackageReleaseNotes>
3434
<PackageLicenseExpression>MIT</PackageLicenseExpression>
3535
<PackageIcon>css_logo.png</PackageIcon>
3636
<ApplicationIcon>css_logo.ico</ApplicationIcon>

‎src/css/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("4.8.3.0")]
35-
[assembly: AssemblyFileVersion("4.8.3.0")]
34+
[assembly: AssemblyVersion("4.8.4.0")]
35+
[assembly: AssemblyFileVersion("4.8.4.0")]

‎src/csws/csws.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyName>csws</AssemblyName>
88
<RootNamespace>CSScripting</RootNamespace>
99
<StartupObject />
10-
<Version>4.8.3.0</Version>
10+
<Version>4.8.4.0</Version>
1111
<Authors>Oleg Shilo</Authors>
1212
<Product>CS-Script</Product>
1313
<Copyright>(C) 2004-2022 Oleg Shilo</Copyright>
@@ -18,20 +18,20 @@
1818
<RepositoryUrl>https://github.com/oleg-shilo/cs-script</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<PackageTags>C# script dynamic</PackageTags>
21-
<AssemblyVersion>4.8.3.0</AssemblyVersion>
22-
<FileVersion>4.8.3.0</FileVersion>
21+
<AssemblyVersion>4.8.4.0</AssemblyVersion>
22+
<FileVersion>4.8.4.0</FileVersion>
2323
<PackageReleaseNotes>---
2424

2525
## Changes
2626

2727
### CLI
2828

29-
- Issue #336 (further optimization)
29+
- no changes
3030

3131
### CSScriptLib
3232

3333
- Issue #343: Publish to single file gives an empty Assembly.Location which crashes Roslyn Evaluator
34-
- Added support for single-file published host applications</PackageReleaseNotes>
34+
Added support for single-file publishing with runtime dependency</PackageReleaseNotes>
3535
<PackageLicenseExpression>MIT</PackageLicenseExpression>
3636
<ApplicationIcon>css_logo.ico</ApplicationIcon>
3737
<PackageIcon>..\logo\css_logo.png</PackageIcon>

‎src/out/Windows/cscs.deps.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"compilationOptions": {},
77
"targets": {
88
".NETCoreApp,Version=v7.0": {
9-
"cscs/4.8.3.0": {
9+
"cscs/4.8.4.0": {
1010
"dependencies": {
1111
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.10.0"
1212
},
@@ -468,7 +468,7 @@
468468
}
469469
},
470470
"libraries": {
471-
"cscs/4.8.3.0": {
471+
"cscs/4.8.4.0": {
472472
"type": "project",
473473
"serviceable": false,
474474
"sha512": ""

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"compilationOptions": {},
77
"targets": {
88
".NETCoreApp,Version=v7.0": {
9-
"csws/4.8.3.0": {
9+
"csws/4.8.4.0": {
1010
"dependencies": {
1111
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.10.0"
1212
},
@@ -468,7 +468,7 @@
468468
}
469469
},
470470
"libraries": {
471-
"csws/4.8.3.0": {
471+
"csws/4.8.4.0": {
472472
"type": "project",
473473
"serviceable": false,
474474
"sha512": ""

0 commit comments

Comments
 (0)