From aa319b5fe6e47ab1aecbb077b4e69e690a21307f Mon Sep 17 00:00:00 2001
From: Thando Moeketsi Ndlovu <45040537+thando-ndlovu@users.noreply.github.com>
Date: Mon, 6 Jul 2026 16:40:16 +0200
Subject: [PATCH 1/2] [fix] fix build failure from package vulnerability
packageid:Tmds.DBus.Protocol Added
Warning As Error: Package 'Tmds.DBus.Protocol' 0.21.2 has a known high severity vulnerability, https://github.com/advisories/GHSA-xrw6-gwf8-vvr9
---
JavaToCSharpGui/JavaToCSharpGui.csproj | 1 +
JavaToCSharpGui/ViewModels/MainWindowViewModel.cs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/JavaToCSharpGui/JavaToCSharpGui.csproj b/JavaToCSharpGui/JavaToCSharpGui.csproj
index 334d7f4..ab8b3ba 100644
--- a/JavaToCSharpGui/JavaToCSharpGui.csproj
+++ b/JavaToCSharpGui/JavaToCSharpGui.csproj
@@ -29,6 +29,7 @@
+
diff --git a/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs b/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs
index ac05870..e25a095 100644
--- a/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs
+++ b/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs
@@ -184,7 +184,7 @@ await Task.Run(async () =>
outDir.Create();
string outDirFullName = outDir.FullName;
- int subStartIndex = dir.FullName.Length;
+ int subStartIndex = dir.FullName.Length - 1;
foreach (var jFile in FolderInputFiles.Where(static x => x.Directory is not null))
{
From 29355974c711c0211025c53e1da9268fc253ba33 Mon Sep 17 00:00:00 2001
From: Thando M Ndlovu <45040537+thando-ndlovu@users.noreply.github.com>
Date: Sat, 15 Aug 2026 21:20:23 +0200
Subject: [PATCH 2/2] Refactor output path calculation for Java files
---
JavaToCSharpGui/ViewModels/MainWindowViewModel.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs b/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs
index e25a095..ac59db7 100644
--- a/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs
+++ b/JavaToCSharpGui/ViewModels/MainWindowViewModel.cs
@@ -184,13 +184,13 @@ await Task.Run(async () =>
outDir.Create();
string outDirFullName = outDir.FullName;
- int subStartIndex = dir.FullName.Length - 1;
foreach (var jFile in FolderInputFiles.Where(static x => x.Directory is not null))
{
// ! null checked above
string jPath = jFile.Directory!.FullName;
- string jOutPath = $"{outDirFullName}{jPath[subStartIndex..]}";
+ string relativePath = Path.GetRelativePath(dir.FullName, jPath);
+ string jOutPath = Path.Combine(outDirFullName, relativePath);
string jOutFileName = Path.GetFileNameWithoutExtension(jFile.Name) + ".cs";
string jOutFileFullName = Path.Combine(jOutPath, jOutFileName);