Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
[submodule "CodeGen"]
path = CodeGen
url = https://github.com/Synergex/CodeGen.git
branch = hcnet6
[submodule "Terminal.Gui"]
path = Terminal.Gui
url = https://github.com/gui-cs/Terminal.Gui.git
branch = hc_version_upgrade
2 changes: 1 addition & 1 deletion CodeGen
Submodule CodeGen updated 215 files
84 changes: 0 additions & 84 deletions GroupByShaperExpression.cs

This file was deleted.

4 changes: 2 additions & 2 deletions Harmony.AspNetCore/Harmony.AspNetCore.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations">
<Version>5.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion Harmony.Core.AspNetCore.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<repository type="git" url="https://github.com/Synergex/HarmonyCore" commit="$Build.SourceVersion$" />
<dependencies>
<dependency id="Harmony.Core" version="$version$" include="All"/>
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1005,13)" />
<dependency id="System.ComponentModel.Annotations" version="[5.0.0,6)" include="All"/>
</dependencies>
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions Harmony.Core.Codegen.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<dependency id="Microsoft.Build.Locator" version="[1.10.2,2)" include="All"/>
<dependency id="Microsoft.Build.Tasks.Core" version="[17.14.28,18)" include="All"/>
<dependency id="Newtonsoft.Json" version="[13.0.4, 14.0.0)" include="All"/>
<dependency id="Synergex.SynergyDE.ddlib" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.synxml" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.ddlib" version="[12.4.1.1005,13)" />
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1005,13)" />
<dependency id="Synergex.SynergyDE.synxml" version="[12.4.1.1005,13)" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion Harmony.Core.EF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency id="Microsoft.EntityFrameworkCore" version="[10.0.5,11)" include="All"/>
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="[10.0.0,11)" include="All"/>
<dependency id="SSH.NET" version="[2025.0.0,2026)" include="All"/>
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1005,13)" />
<dependency id="System.ComponentModel.Annotations" version="[5.0.0,6)" include="All"/>
<dependency id="System.Linq.Dynamic.Core" version="[1.6.10,2)" include="All"/>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Harmony.Core.OData.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency id="Microsoft.OData.Core" version="[8.4.2,9)" include="All"/>
<dependency id="Microsoft.OData.Edm" version="[8.4.2,9)" include="All"/>
<dependency id="Microsoft.Spatial" version="[8.4.2,9)" include="All"/>
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1005,13)" />
<dependency id="System.ComponentModel.Annotations" version="[5.0.0,6)" include="All"/>
</dependencies>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion Harmony.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<description>HarmonyCore package that provides base runtime functionality</description>
<projectUrl>https://www.github.com/Synergex/HarmonyCore</projectUrl>
<dependencies>
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1003,13)" />
<dependency id="Synergex.SynergyDE.synrnt" version="[12.4.1.1005,13)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="[10.0.0, 11.0.0)" include="All"/>
<dependency id="Microsoft.Extensions.DependencyInjection" version="[10.0.0, 11.0.0)" include="All"/>
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="[10.0.0, 11.0.0)" include="All"/>
Expand Down
4 changes: 2 additions & 2 deletions Harmony.OData/Harmony.OData.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
<Version>9.0.6</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations">
<Version>5.0.0</Version>
Expand Down
5 changes: 4 additions & 1 deletion HarmonyCore.CliTool/HarmonyCore.CliTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<PackageId>Harmony.Core.CliTool</PackageId>
<PackageVersion>6.0.148</PackageVersion>
<Version>6.0.148</Version>
<!-- .NET tool packs RID-agnostic; pin AnyCPU so an injected RID (e.g. win-x86 from the
build agent's Synergy/VS environment) doesn't trip NETSDK1032 vs PlatformTarget during pack -->
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(BUILD_BUILDNUMBER) ' != ' '">
Expand All @@ -30,7 +33,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Octokit" Version="13.0.1" />
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.4.1.1003" />
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.4.1.1005" />
<PackageReference Include="System.CodeDom" Version="9.0.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="Terminal.Gui" Version="1.17.1" />
Expand Down
4 changes: 2 additions & 2 deletions HarmonyCore.NetCore/HarmonyCore.NetCore.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<Version>10.0.0</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\25.10.2527\build\rps\Synergex.SynergyDE.Build.targets" Condition="Exists('$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\25.10.2527\build\rps\Synergex.SynergyDE.Build.targets')" />
<Import Project="$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\26.5.1464\build\rps\Synergex.SynergyDE.Build.targets" Condition="Exists('$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\26.5.1464\build\rps\Synergex.SynergyDE.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\25.10.2527\build\rps\Synergex.SynergyDE.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\25.10.2527\build\rps\Synergex.SynergyDE.Build.targets'))" />
<Error Condition="!Exists('$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\26.5.1464\build\rps\Synergex.SynergyDE.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(USERPROFILE)\.nuget\packages\synergex.synergyde.build\26.5.1464\build\rps\Synergex.SynergyDE.Build.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions HarmonyCore.Test/HarmonyCore.Test.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
<Version>3.6.1</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations">
<Version>5.0.0</Version>
Expand Down
9 changes: 7 additions & 2 deletions HarmonyCore/HarmonyCore.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,16 @@
<PackageReference Include="StreamJsonRpc">
<Version>2.22.23</Version>
</PackageReference>
<!-- Transitive pin: StreamJsonRpc pulls MessagePack 2.5.192, which carries security
advisories GHSA-vh6j-jc39-fggf / GHSA-2f33-pr97-265q; 2.5.301 is the patched 2.5.x -->
<PackageReference Include="MessagePack">
<Version>2.5.301</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations">
<Version>5.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion HarmonyCoreEF/HarmonyCoreEF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.4.1.1003" />
<PackageReference Include="Synergex.SynergyDE.synrnt" Version="12.4.1.1005" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.10" />
<PackageReference Include="SSH.NET" Version="2025.0.0" />
Expand Down
8 changes: 8 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!-- ignore machine/user-level sources so restore is deterministic on any agent -->
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
4 changes: 2 additions & 2 deletions Services.Controllers/Services.Controllers.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
<Version>9.0.6</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Services.Host/Services.Host.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
<Version>5.1.2</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
<PackageReference Include="System.Linq.Dynamic.Core">
<Version>1.6.10</Version>
Expand Down
4 changes: 2 additions & 2 deletions Services.Isolated/Services.Isolated.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Services.Models/Services.Models.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<Version>10.0.5</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Services.Test.GenerateValues/GenerateTestValues.dbl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace Services.Test.GenerateValues
private mTestcarowner3FileSpec, string, "DAT:testcarowner3.ism"

partial method GetCustomFileSpec, void
required inout aFileSpec, string
required in aFileSpec, string
endmethod

public method SerializeValues, void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<Version>17.11.1</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions Services.Test/Services.Test.synproj
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,16 @@ rem xcopy /I /Y $(SolutionDir)SampleData $(OutDir)SampleData</PreBuildEvent>
<PackageReference Include="StreamJsonRpc">
<Version>2.22.23</Version>
</PackageReference>
<!-- Transitive pin: StreamJsonRpc pulls MessagePack 2.5.192, which carries security
advisories GHSA-vh6j-jc39-fggf / GHSA-2f33-pr97-265q; 2.5.301 is the patched 2.5.x -->
<PackageReference Include="MessagePack">
<Version>2.5.301</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.Build">
<Version>25.10.2527</Version>
<Version>26.5.1464</Version>
</PackageReference>
<PackageReference Include="Synergex.SynergyDE.synrnt">
<Version>12.4.1.1003</Version>
<Version>12.4.1.1005</Version>
</PackageReference>
<PackageReference Include="System.Linq.Dynamic.Core">
<Version>1.6.10</Version>
Expand Down
18 changes: 2 additions & 16 deletions Services.Test/UnitTestEnvironment.dbl
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,12 @@ namespace Services.Test
if(string.IsNullOrEmpty(wwwroot) && Directory.Exists(wwwroot)) then
begin
;;Create a test host for the Web API services
_host = Host.CreateDefaultBuilder()
& .ConfigureWebHostDefaults(lambda(webBuilder)
& begin
& webBuilder.UseTestServer()
& webBuilder.UseStartup<Startup>()
& end)
& .Start()
_host = Host.CreateDefaultBuilder().ConfigureWebHostDefaults(lambda(webBuilder) { webBuilder.UseTestServer().UseStartup<Startup>() }).Start()
end
else
begin
;;Create a test host for the Web API services
_host = Host.CreateDefaultBuilder()
& .ConfigureWebHostDefaults(lambda(webBuilder)
& begin
& webBuilder.UseTestServer()
& webBuilder.UseContentRoot(AppContext.BaseDirectory)
& webBuilder.UseWebRoot(wwwroot)
& webBuilder.UseStartup<Startup>()
& end)
& .Start()
_host = Host.CreateDefaultBuilder().ConfigureWebHostDefaults(lambda(webBuilder) { webBuilder.UseTestServer().UseContentRoot(AppContext.BaseDirectory).UseWebRoot(wwwroot).UseStartup<Startup>() }).Start()
end

Server = _host.GetTestServer()
Expand Down
Loading
Loading