Copy bundled Runtime\bin JRE to output so MfApi finds java.exe.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -28,6 +28,9 @@ x86/
|
|||||||
[Aa][Rr][Mm]64/
|
[Aa][Rr][Mm]64/
|
||||||
bld/
|
bld/
|
||||||
[Bb]in/
|
[Bb]in/
|
||||||
|
# Bundled JRE for MfApi
|
||||||
|
!ZA.CoreService.ESBCertificateManager/Runtime/bin/
|
||||||
|
!ZA.CoreService.ESBCertificateManager/Runtime/bin/**
|
||||||
[Oo]bj/
|
[Oo]bj/
|
||||||
[Oo]ut/
|
[Oo]ut/
|
||||||
[Ll]og/
|
[Ll]og/
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public sealed class DatabaseSettings
|
|||||||
public sealed class RuntimeSettings
|
public sealed class RuntimeSettings
|
||||||
{
|
{
|
||||||
public string JavaExecutablePath { get; set; } =
|
public string JavaExecutablePath { get; set; } =
|
||||||
@"C:\Program Files (x86)\Java\jre1.8.0_481\bin\java.exe";
|
@"Runtime\bin\java.exe";
|
||||||
|
|
||||||
public string SonicClientLibraryPath { get; set; } =
|
public string SonicClientLibraryPath { get; set; } =
|
||||||
@"Runtime\SonicClient\lib";
|
@"Runtime\SonicClient\lib";
|
||||||
|
|||||||
@@ -34,12 +34,22 @@ public static class JavaRuntimeLocator
|
|||||||
yield return configuredPath.Trim();
|
yield return configuredPath.Trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Relativ zum App-Output (bin\Debug\...\Runtime\bin\java.exe)
|
||||||
|
yield return Path.Combine(
|
||||||
|
AppContext.BaseDirectory,
|
||||||
|
"Runtime",
|
||||||
|
"bin",
|
||||||
|
"java.exe");
|
||||||
|
|
||||||
yield return
|
yield return
|
||||||
@"C:\Program Files (x86)\Java\jre1.8.0_481\bin\java.exe";
|
@"C:\Program Files (x86)\Java\jre1.8.0_481\bin\java.exe";
|
||||||
|
|
||||||
yield return
|
yield return
|
||||||
@"C:\Program Files (x86)\Java\jre1.8.0_501\bin\java.exe";
|
@"C:\Program Files (x86)\Java\jre1.8.0_501\bin\java.exe";
|
||||||
|
|
||||||
|
yield return
|
||||||
|
@"C:\Program Files (x86)\Java\jre1.8.0_501\bin\java.exe";
|
||||||
|
|
||||||
yield return
|
yield return
|
||||||
@"C:\Program Files\Java\jre1.8.0_481\bin\java.exe";
|
@"C:\Program Files\Java\jre1.8.0_481\bin\java.exe";
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,11 @@
|
|||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<!-- SDK schließt **/bin/** aus – die gebündelte JRE unter Runtime\bin muss mit. -->
|
||||||
|
<DefaultItemExcludes>$(DefaultItemExcludes);Docs\**</DefaultItemExcludes>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Update="Assets\**\*">
|
<None Update="Assets\**\*">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
@@ -29,6 +34,12 @@
|
|||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
|
||||||
|
<!-- Explizit: DefaultItemExcludes enthält **/bin/** und würde Runtime\bin sonst nie kopieren -->
|
||||||
|
<None Include="Runtime\bin\**\*">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
<Link>Runtime\bin\%(RecursiveDir)%(Filename)%(Extension)</Link>
|
||||||
|
</None>
|
||||||
|
|
||||||
<None Update="appsettings.json">
|
<None Update="appsettings.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
"ConnectionString": "Server=VWEBDEV01;Database=EsbZertifikatManager;Integrated Security=True;Encrypt=True;Column Encryption Setting=Enabled;Application Name=ZA.CoreService.ESBCertificateManager;TrustServerCertificate=True;"
|
"ConnectionString": "Server=VWEBDEV01;Database=EsbZertifikatManager;Integrated Security=True;Encrypt=True;Column Encryption Setting=Enabled;Application Name=ZA.CoreService.ESBCertificateManager;TrustServerCertificate=True;"
|
||||||
},
|
},
|
||||||
"Runtime": {
|
"Runtime": {
|
||||||
"JavaExecutablePath": "C:\\Program Files (x86)\\Java\\jre1.8.0_481\\bin\\java.exe",
|
"JavaExecutablePath": "Runtime\\bin\\java.exe",
|
||||||
"SonicClientLibraryPath": "Runtime\\SonicClient\\lib",
|
"SonicClientLibraryPath": "Runtime\\SonicClient\\lib",
|
||||||
"SetupCompleted": true
|
"SetupCompleted": true
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user