Skip to content

Commit 296f30a

Browse files
oleg-shilooleg-shilo
committed
CLI:
- updated `dotnet tool` packaging - republished `dotnet tool` as v4.12.0.1
1 parent 16d3d76 commit 296f30a

File tree

9 files changed

+63
-43
lines changed

9 files changed

+63
-43
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.12.0.0.
1+
C# Script execution engine (.NET Core). Version 4.12.0.1.
22
Copyright (C) 2004-2023 Oleg Shilo.
33

44
Usage: cscs <switch 1> <switch 2> <file> [params] [//x]

‎src/1.build-binaries.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ del "out\cs-script.linux.7z"
2929

3030
if defined CSSCRIPT_ROOT (
3131
echo Updating NuGet Tool package spec...
32-
css .\out\ci\update_static_content.cs
32+
css .\out\ci\update_static_content.cs %target%
3333
)
3434

3535
rem goto:exit

‎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.12.0.0</Version>
18+
<Version>4.12.0.1</Version>
1919
<Authors>Oleg Shilo</Authors>
2020
<Description>CS-Script engine Class Library for .NET 5 (and higher)</Description>
2121
<Copyright>(C) 2018-2023 Oleg Shilo</Copyright>
@@ -46,9 +46,9 @@
4646
- #428: Script.Evaluator.Eval() exception
4747
- Added `/shared` option for CodeDomEvaluator. To dramatically speedup "next" compilation.</PackageReleaseNotes>
4848
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
49-
<AssemblyVersion>4.12.0.0</AssemblyVersion>
50-
<FileVersion>4.12.0.0</FileVersion>
51-
<PackageVersion>4.12.0.0</PackageVersion>
49+
<AssemblyVersion>4.12.0.1</AssemblyVersion>
50+
<FileVersion>4.12.0.1</FileVersion>
51+
<PackageVersion>4.12.0.1</PackageVersion>
5252
<PackageLicenseExpression>MIT</PackageLicenseExpression>
5353
<PackageIcon>css_logo.png</PackageIcon>
5454
<SignAssembly>True</SignAssembly>

‎src/chocolatey/cs-script.nuspec‎

Lines changed: 1 addition & 1 deletion
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.12.0.0</version>
5+
<version>4.12.0.1</version>
66
<title>CS-Script</title>
77
<authors>Oleg Shilo</authors>
88
<owners>Oleg Shilo</owners>

‎src/cscs/cscs.csproj‎

Lines changed: 28 additions & 28 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.12.0.0</Version>
9+
<Version>4.12.0.1</Version>
1010
<Authors>Oleg Shilo</Authors>
1111
<Product>CS-Script</Product>
1212
<Copyright>(C) 2004-2023 Oleg Shilo</Copyright>
@@ -16,8 +16,8 @@
1616
<RepositoryUrl>https://github.com/oleg-shilo/cs-script</RepositoryUrl>
1717
<RepositoryType>git</RepositoryType>
1818
<PackageTags>C# script dynamic</PackageTags>
19-
<AssemblyVersion>4.12.0.0</AssemblyVersion>
20-
<FileVersion>4.12.0.0</FileVersion>
19+
<AssemblyVersion>4.12.0.1</AssemblyVersion>
20+
<FileVersion>4.12.0.1</FileVersion>
2121
<PackageReleaseNotes>---
2222

2323
## Changes
@@ -57,9 +57,9 @@
5757
<Description>C# Script engine .NET8.0 CLI executable</Description>
5858
<ProductName>C# Script (.NET8.0)</ProductName>
5959
</PropertyGroup>
60-
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
61-
<Description>C# Script engine .NET9.0 CLI executable</Description>
62-
<ProductName>C# Script (.NET9.0)</ProductName>
60+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
61+
<Description>C# Script engine .NET10.0 CLI executable</Description>
62+
<ProductName>C# Script (.NET10.0)</ProductName>
6363
</PropertyGroup>
6464
<!-- Apply the description -->
6565
<PropertyGroup>
@@ -110,54 +110,54 @@
110110
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
111111
<NoWarn>CA1701;CA1702;CA1860;IDE0130;IDE0057;CA1829;IDE0062;NU5119</NoWarn>
112112
</PropertyGroup>
113-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0|AnyCPU'">
113+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0|AnyCPU'">
114114
<NoWarn>CA1701;CA1702;CA1860;IDE0130;IDE0057;CA1829;IDE0062;NU5119</NoWarn>
115115
</PropertyGroup>
116116
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
117117
<NoWarn>CA1701;CA1702;CA1860;IDE0130;IDE0057;CA1829;IDE0062;NU5119</NoWarn>
118118
</PropertyGroup>
119-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0|AnyCPU'">
119+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net10.0|AnyCPU'">
120120
<NoWarn>CA1701;CA1702;CA1860;IDE0130;IDE0057;CA1829;IDE0062;NU5119</NoWarn>
121121
</PropertyGroup>
122122
<ItemGroup>
123123
<!-- start: nuget tool package custom commands (keep this line here, it is a marker for automation) -->
124-
<Content Include="..\out\static_content\-csproj\**\*" Link="ToolPackage/-csproj" Pack="true" PackagePath="tools/net9.0/any/-csproj" />
124+
<Content Include="..\out\static_content\-csproj\**\*" Link="ToolPackage/-csproj" Pack="true" PackagePath="tools/net10.0/any/-csproj" />
125125
<Content Include="..\out\static_content\-csproj\**\*" Link="ToolPackage/-csproj" Pack="true" PackagePath="tools/net8.0/any/-csproj" />
126-
<Content Include="..\out\static_content\-edit\**\*" Link="ToolPackage/-edit" Pack="true" PackagePath="tools/net9.0/any/-edit" />
126+
<Content Include="..\out\static_content\-edit\**\*" Link="ToolPackage/-edit" Pack="true" PackagePath="tools/net10.0/any/-edit" />
127127
<Content Include="..\out\static_content\-edit\**\*" Link="ToolPackage/-edit" Pack="true" PackagePath="tools/net8.0/any/-edit" />
128-
<Content Include="..\out\static_content\-mkshim\**\*" Link="ToolPackage/-mkshim" Pack="true" PackagePath="tools/net9.0/any/-mkshim" />
128+
<Content Include="..\out\static_content\-mkshim\**\*" Link="ToolPackage/-mkshim" Pack="true" PackagePath="tools/net10.0/any/-mkshim" />
129129
<Content Include="..\out\static_content\-mkshim\**\*" Link="ToolPackage/-mkshim" Pack="true" PackagePath="tools/net8.0/any/-mkshim" />
130-
<Content Include="..\out\static_content\-pkill\**\*" Link="ToolPackage/-pkill" Pack="true" PackagePath="tools/net9.0/any/-pkill" />
130+
<Content Include="..\out\static_content\-pkill\**\*" Link="ToolPackage/-pkill" Pack="true" PackagePath="tools/net10.0/any/-pkill" />
131131
<Content Include="..\out\static_content\-pkill\**\*" Link="ToolPackage/-pkill" Pack="true" PackagePath="tools/net8.0/any/-pkill" />
132-
<Content Include="..\out\static_content\-runas\**\*" Link="ToolPackage/-runas" Pack="true" PackagePath="tools/net9.0/any/-runas" />
132+
<Content Include="..\out\static_content\-runas\**\*" Link="ToolPackage/-runas" Pack="true" PackagePath="tools/net10.0/any/-runas" />
133133
<Content Include="..\out\static_content\-runas\**\*" Link="ToolPackage/-runas" Pack="true" PackagePath="tools/net8.0/any/-runas" />
134-
<Content Include="..\out\static_content\-scramble\**\*" Link="ToolPackage/-scramble" Pack="true" PackagePath="tools/net9.0/any/-scramble" />
134+
<Content Include="..\out\static_content\-scramble\**\*" Link="ToolPackage/-scramble" Pack="true" PackagePath="tools/net10.0/any/-scramble" />
135135
<Content Include="..\out\static_content\-scramble\**\*" Link="ToolPackage/-scramble" Pack="true" PackagePath="tools/net8.0/any/-scramble" />
136-
<Content Include="..\out\static_content\-self\**\*" Link="ToolPackage/-self" Pack="true" PackagePath="tools/net9.0/any/-self" />
136+
<Content Include="..\out\static_content\-self\**\*" Link="ToolPackage/-self" Pack="true" PackagePath="tools/net10.0/any/-self" />
137137
<Content Include="..\out\static_content\-self\**\*" Link="ToolPackage/-self" Pack="true" PackagePath="tools/net8.0/any/-self" />
138-
<Content Include="..\out\static_content\-set\**\*" Link="ToolPackage/-set" Pack="true" PackagePath="tools/net9.0/any/-set" />
138+
<Content Include="..\out\static_content\-set\**\*" Link="ToolPackage/-set" Pack="true" PackagePath="tools/net10.0/any/-set" />
139139
<Content Include="..\out\static_content\-set\**\*" Link="ToolPackage/-set" Pack="true" PackagePath="tools/net8.0/any/-set" />
140-
<Content Include="..\out\static_content\-unlock\**\*" Link="ToolPackage/-unlock" Pack="true" PackagePath="tools/net9.0/any/-unlock" />
140+
<Content Include="..\out\static_content\-unlock\**\*" Link="ToolPackage/-unlock" Pack="true" PackagePath="tools/net10.0/any/-unlock" />
141141
<Content Include="..\out\static_content\-unlock\**\*" Link="ToolPackage/-unlock" Pack="true" PackagePath="tools/net8.0/any/-unlock" />
142-
<Content Include="..\out\static_content\-wdbg\**\*" Link="ToolPackage/-wdbg" Pack="true" PackagePath="tools/net9.0/any/-wdbg" />
143-
<Content Include="..\out\static_content\-web\**\*" Link="ToolPackage/-web" Pack="true" PackagePath="tools/net9.0/any/-web" />
142+
<Content Include="..\out\static_content\-wdbg\**\*" Link="ToolPackage/-wdbg" Pack="true" PackagePath="tools/net10.0/any/-wdbg" />
143+
<Content Include="..\out\static_content\-web\**\*" Link="ToolPackage/-web" Pack="true" PackagePath="tools/net10.0/any/-web" />
144144
<Content Include="..\out\static_content\-web\**\*" Link="ToolPackage/-web" Pack="true" PackagePath="tools/net8.0/any/-web" />
145-
<Content Include="..\out\static_content\-which\**\*" Link="ToolPackage/-which" Pack="true" PackagePath="tools/net9.0/any/-which" />
145+
<Content Include="..\out\static_content\-which\**\*" Link="ToolPackage/-which" Pack="true" PackagePath="tools/net10.0/any/-which" />
146146
<Content Include="..\out\static_content\-which\**\*" Link="ToolPackage/-which" Pack="true" PackagePath="tools/net8.0/any/-which" />
147-
<Content Include="..\out\static_content\-who\**\*" Link="ToolPackage/-who" Pack="true" PackagePath="tools/net9.0/any/-who" />
147+
<Content Include="..\out\static_content\-who\**\*" Link="ToolPackage/-who" Pack="true" PackagePath="tools/net10.0/any/-who" />
148148
<Content Include="..\out\static_content\-who\**\*" Link="ToolPackage/-who" Pack="true" PackagePath="tools/net8.0/any/-who" />
149149
<!-- end: nuget tool package custom commands (keep this line here, it is a marker for automation) -->
150150
<!-- adding csws, which is not part of the default package content since this project file is does not build csws binaries
151151
adding csws for the .NET 9 only -->
152-
<Content Include="..\out\windows\csws.runtimeconfig.json" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net9.0/any/csws.runtimeconfig.json" />
153-
<Content Include="..\out\windows\csws.dll" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net9.0/any/csws.dll" />
154-
<Content Include="..\out\windows\csws.exe" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net9.0/any/csws.exe" />
155-
<Content Include="..\out\windows\csws.deps.json" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net9.0/any/csws.deps.json" />
152+
<Content Include="..\out\windows\csws.runtimeconfig.json" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net10.0/any/csws.runtimeconfig.json" />
153+
<Content Include="..\out\windows\csws.dll" Link="ToolPackage/net.10" Pack="true" PackagePath="tools/net10.0/any/csws.dll" />
154+
<Content Include="..\out\windows\csws.exe" Link="ToolPackage/net.10" Pack="true" PackagePath="tools/net10.0/any/csws.exe" />
155+
<Content Include="..\out\windows\csws.deps.json" Link="ToolPackage/net.10" Pack="true" PackagePath="tools/net10.0/any/csws.deps.json" />
156156
<!-- adding cscs.exe, because for some reason it's not included in the package by default even though it is the output of this very project. -->
157-
<Content Include="..\out\windows\cscs.exe" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net9.0/any/cscs.exe" />
157+
<Content Include="..\out\windows\cscs.exe" Link="ToolPackage/net.9" Pack="true" PackagePath="tools/net10.0/any/cscs.exe" />
158158
<Content Include="..\out\win.net8\cscs.exe" Link="ToolPackage/net.8" Pack="true" PackagePath="tools/net8.0/any/cscs.exe" />
159-
<Content Include="..\out\static_content\global-usings.cs" Pack="true" PackagePath="tools/net9.0/any/lib" />
160-
<Content Include="..\out\static_content\lib\**\*" Link="ToolPackage/lib" Pack="true" PackagePath="tools/net9.0/any/lib" />
159+
<Content Include="..\out\static_content\global-usings.cs" Pack="true" PackagePath="tools/net10.0/any/lib" />
160+
<Content Include="..\out\static_content\lib\**\*" Link="ToolPackage/lib" Pack="true" PackagePath="tools/net10.0/any/lib" />
161161
<Content Include="..\out\static_content\lib\**\*" Link="ToolPackage/lib" Pack="true" PackagePath="tools/net8.0/any/lib" />
162162
</ItemGroup>
163163
<ItemGroup>

‎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.12.0.0")]
35-
[assembly: AssemblyFileVersion("4.12.0.0")]
34+
[assembly: AssemblyVersion("4.12.0.1")]
35+
[assembly: AssemblyFileVersion("4.12.0.1")]

‎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.12.0.0</Version>
11+
<Version>4.12.0.1</Version>
1212
<Authors>Oleg Shilo</Authors>
1313
<Product>CS-Script</Product>
1414
<Copyright>(C) 2004-2022 Oleg Shilo</Copyright>
@@ -19,8 +19,8 @@
1919
<RepositoryUrl>https://github.com/oleg-shilo/cs-script</RepositoryUrl>
2020
<RepositoryType>git</RepositoryType>
2121
<PackageTags>C# script dynamic</PackageTags>
22-
<AssemblyVersion>4.12.0.0</AssemblyVersion>
23-
<FileVersion>4.12.0.0</FileVersion>
22+
<AssemblyVersion>4.12.0.1</AssemblyVersion>
23+
<FileVersion>4.12.0.1</FileVersion>
2424
<PackageReleaseNotes>---
2525

2626
## Changes

‎src/out/ci/update_static_content.cs‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
string custom_cmd_src = @"..\static_content";
1515
string cscs_proj = @"..\..\cscs\cscs.csproj";
1616

17+
var primaryCrt = args.Any() ? args.First() : "net10.0";
18+
var secondaryCrt = "net8.0";
19+
20+
string[] packagedCrts = [primaryCrt, secondaryCrt];
21+
string[] unpackagedCrts = "6,7,8,9,10,11,12,13,14,15".Split(',').Select(x => $"net{x}.0").Except(packagedCrts).ToArray();
22+
1723
var comamnds = Directory.GetDirectories(custom_cmd_src, "-*");
1824

1925
var nuspecInjection = new List<string>();
@@ -41,14 +47,28 @@
4147

4248
var nuspecTemplate = $" <Content Include=\"..\\out\\static_content\\{name}\\**\\*\" Link=\"ToolPackage/{name}\" Pack=\"true\" PackagePath=\"tools/$[runtime]/any/{name}\" />";
4349

44-
nuspecInjection.Add(nuspecTemplate.Replace("$[runtime]", "net9.0"));
50+
nuspecInjection.Add(nuspecTemplate.Replace("$[runtime]", primaryCrt));
4551

4652
if (name != "-wdbg")
47-
nuspecInjection.Add(nuspecTemplate.Replace("$[runtime]", "net8.0"));
53+
nuspecInjection.Add(nuspecTemplate.Replace("$[runtime]", secondaryCrt));
4854
}
4955

5056
var proj = File.ReadLines(cscs_proj);
5157

58+
foreach (var crt in unpackagedCrts)
59+
{
60+
if (proj.Any(x => x.Contains(crt)))
61+
{
62+
var msg = $"Error: Found unpackaged CRT {crt} in {cscs_proj}!";
63+
64+
Console.ForegroundColor = ConsoleColor.Red;
65+
Console.WriteLine(msg);
66+
Console.ResetColor();
67+
68+
throw new Exception(msg);
69+
}
70+
}
71+
5272
var startMarker = proj.First(x => x.TrimStart().StartsWith("<!-- start: nuget tool package"));
5373
var endMarker = proj.First(x => x.TrimStart().StartsWith("<!-- end: nuget tool package"));
5474

‎src/release_notes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Release v4.12.0.0
1+
# Release v4.12.0.1
22

33
---
44

0 commit comments

Comments
 (0)