Skip to content

feat: migrate ScriptBee Default Bundle to dotnet 10 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrei2699 merged 2 commits into from
Apr 4, 2026
Merged

feat: migrate ScriptBee Default Bundle to dotnet 10 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411decc
feat(backend): relocated sample code generator
andrei2699 Apr 4, 2026
8a3d9e3
feat(backend): upgrade default bundle to dotnet 10 with dependencies …
andrei2699 Apr 4, 2026
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
15 changes: 8 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageVersion
Include="Microsoft.Extensions.Options.ConfigurationExtensions"
Version="10.0.5"
/>
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.5" />
<PackageVersion Include="MongoDB.Bson" Version="3.7.1" />
<PackageVersion Include="MongoDB.Driver" Version="3.7.1" />
<PackageVersion Include="OneOf" Version="3.0.271" />
Expand All @@ -29,10 +26,14 @@
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.0" />
<PackageVersion Include="Slugify.Core" Version="5.1.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.5" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
<PackageVersion Include="Westwind.Utilities" Version="5.2.8.1" />
<PackageVersion Include="WireMock.Net" Version="2.0.0" />
<PackageVersion Include="WireMock.Net" Version="2.2.0" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.3.0" />
<PackageVersion Include="CsvHelper" Version="33.1.0" />
<PackageVersion Include="Jint" Version="4.7.1" />
<PackageVersion Include="IronPython" Version="3.4.2" />
</ItemGroup>
<ItemGroup Condition="'$(ProjectName.ToLower().Contains(`test`))' == 'true'">
<PackageVersion Include="VeriJson" Version="1.0.0" />
Expand All @@ -48,4 +49,4 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
</ItemGroup>
</Project>
</Project>
8 changes: 6 additions & 2 deletions ...elperFunctions/DxWorks.ScriptBee.Plugin.HelperFunctions.Default/ConsoleHelperFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ public async Task OnUnloadAsync(CancellationToken cancellationToken = default)
{
var consoleOutput = _consoleStringBuilder.ToString();

await _helperFunctionsResultService.UploadResultAsync("ConsoleOutput", RunResultDefaultTypes.ConsoleType,
consoleOutput, cancellationToken);
await _helperFunctionsResultService.UploadResultAsync(
"ConsoleOutput",
RunResultDefaultTypes.ConsoleType,
consoleOutput,
cancellationToken
);
}

public void ConsoleWrite(object message)
Expand Down
21 changes: 16 additions & 5 deletions ...ns/HelperFunctions/DxWorks.ScriptBee.Plugin.HelperFunctions.Default/CsvHelperFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ public CsvHelperFunctions(IHelperFunctionsResultService helperFunctionsResultSer
_helperFunctionsResultService = helperFunctionsResultService;
}

public async Task ExportCsvAsync<T>(string fileName, IEnumerable<T> records,
CancellationToken cancellationToken = default)
public async Task ExportCsvAsync<T>(
string fileName,
IEnumerable<T> records,
CancellationToken cancellationToken = default
)
{
await using var stream = new MemoryStream();

Expand All @@ -24,8 +27,12 @@ public async Task ExportCsvAsync<T>(string fileName, IEnumerable<T> records,

await csv.WriteRecordsAsync(records, cancellationToken);

await _helperFunctionsResultService.UploadResultAsync(fileName, RunResultDefaultTypes.FileType, stream,
cancellationToken);
await _helperFunctionsResultService.UploadResultAsync(
fileName,
RunResultDefaultTypes.FileType,
stream,
cancellationToken
);
}

public void ExportCsv(string fileName, List<object> records)
Expand All @@ -37,6 +44,10 @@ public void ExportCsv(string fileName, List<object> records)

csv.WriteRecords(records);

_helperFunctionsResultService.UploadResult(fileName, RunResultDefaultTypes.FileType, stream);
_helperFunctionsResultService.UploadResult(
fileName,
RunResultDefaultTypes.FileType,
stream
);
}
}
17 changes: 6 additions & 11 deletions ...ee.Plugin.HelperFunctions.Default/DxWorks.ScriptBee.Plugin.HelperFunctions.Default.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="CsvHelper" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CsvHelper" Version="30.0.1"/>
<PackageReference Include="DxWorks.ScriptBee.Plugin.Api" Version="1.1.0"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\DxWorks.ScriptBee.Plugin.Api\DxWorks.ScriptBee.Plugin.Api.csproj" />
</ItemGroup>
</Project>
41 changes: 32 additions & 9 deletions ...s/HelperFunctions/DxWorks.ScriptBee.Plugin.HelperFunctions.Default/FileHelperFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,47 @@ public FileHelperFunctions(IHelperFunctionsResultService helperFunctionsResultSe

public void FileWrite(string fileName, string fileContent)
{
_helperFunctionsResultService.UploadResult(fileName, RunResultDefaultTypes.FileType, fileContent);
_helperFunctionsResultService.UploadResult(
fileName,
RunResultDefaultTypes.FileType,
fileContent
);
}

public async Task FileWriteAsync(string fileName, string fileContent, CancellationToken cancellationToken = default)
public async Task FileWriteAsync(
string fileName,
string fileContent,
CancellationToken cancellationToken = default
)
{
await _helperFunctionsResultService.UploadResultAsync(fileName, RunResultDefaultTypes.FileType, fileContent,
cancellationToken);
await _helperFunctionsResultService.UploadResultAsync(
fileName,
RunResultDefaultTypes.FileType,
fileContent,
cancellationToken
);
}

public async Task FileWriteStreamAsync(string fileName, Stream stream,
CancellationToken cancellationToken = default)
public async Task FileWriteStreamAsync(
string fileName,
Stream stream,
CancellationToken cancellationToken = default
)
{
await _helperFunctionsResultService.UploadResultAsync(fileName, RunResultDefaultTypes.FileType, stream,
cancellationToken);
await _helperFunctionsResultService.UploadResultAsync(
fileName,
RunResultDefaultTypes.FileType,
stream,
cancellationToken
);
}

public void FileWriteStream(string fileName, Stream stream)
{
_helperFunctionsResultService.UploadResult(fileName, RunResultDefaultTypes.FileType, stream);
_helperFunctionsResultService.UploadResult(
fileName,
RunResultDefaultTypes.FileType,
stream
);
}
}
22 changes: 17 additions & 5 deletions ...s/HelperFunctions/DxWorks.ScriptBee.Plugin.HelperFunctions.Default/JsonHelperFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ public JsonHelperFunctions(IHelperFunctionsResultService helperFunctionsResultSe
_helperFunctionsResultService = helperFunctionsResultService;
}

public async Task ExportJsonAsync<T>(string fileName, T obj, JsonSerializerSettings? settings = default,
CancellationToken cancellationToken = default)
public async Task ExportJsonAsync<T>(
string fileName,
T obj,
JsonSerializerSettings? settings = default,
CancellationToken cancellationToken = default
)
{
var jsonSerializer = JsonSerializer.Create(settings);
await using var stream = new MemoryStream();
Expand All @@ -25,8 +29,12 @@ public async Task ExportJsonAsync<T>(string fileName, T obj, JsonSerializerSetti

await jsonWriter.FlushAsync(cancellationToken);
stream.Position = 0;
await _helperFunctionsResultService.UploadResultAsync(fileName, RunResultDefaultTypes.FileType, stream,
cancellationToken);
await _helperFunctionsResultService.UploadResultAsync(
fileName,
RunResultDefaultTypes.FileType,
stream,
cancellationToken
);
}

public void ExportJson(string fileName, object obj)
Expand All @@ -40,7 +48,11 @@ public void ExportJson(string fileName, object obj)

jsonWriter.Flush();
stream.Position = 0;
_helperFunctionsResultService.UploadResult(fileName, RunResultDefaultTypes.FileType, stream);
_helperFunctionsResultService.UploadResult(
fileName,
RunResultDefaultTypes.FileType,
stream
);
}

public string ConvertJson(object obj)
Expand Down
64 changes: 0 additions & 64 deletions Plugins/ScriptBeeDefaultPlugins.sln
View file
Open in desktop

This file was deleted.

Loading
Loading