Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit a3d10919 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

VECTO Starters: Refactored Methods to avoid code duplication

parent b3d1d285
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 160 additions and 252 deletions
Tools/HashingCmdStart/HashingCmdStart.csproj
+ 4
− 0
View file @ a3d10919
......@@ -8,4 +8,8 @@
<DefineConstants />
</PropertyGroup>
<ItemGroup>
<Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
</ItemGroup>
</Project>
Tools/HashingCmdStart/Program.cs
+ 3
− 61
View file @ a3d10919
using System;
using Microsoft.Win32;
using System.Diagnostics;
using System.Reflection;
using System.IO;
namespace TUGraz.VECTO
namespace TUGraz.VECTO
{
class Program
{
static void Main()
{
var version = GetHighestNETVersion();
Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
WorkingDirectory = Directory.GetCurrentDirectory()
});
}
private static string GetHighestNETVersion()
{
if (SupportsNet60()) {
return "net60";
}
if (SupportsNet48()) {
return "net48";
}
return "net45";
}
private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardError = true,
RedirectStandardOutput = true
});
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
return false;
}
private static bool SupportsNet48()
{
const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
if (ndpKey != null && ndpKey.GetValue("Release") != null) {
var releaseKey = (int)ndpKey.GetValue("Release");
return releaseKey >= 528040;
}
return false;
}
}
static void Main(string[] args) => StarterHelper.StartVECTO(args);
}
}
}
\ No newline at end of file
Tools/HashingToolStart/HashingToolStart.csproj
+ 8
− 0
View file @ a3d10919
......@@ -8,4 +8,12 @@
<TargetFrameworks>net45</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
<ItemGroup>
<Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
</Project>
Tools/HashingToolStart/Program.cs
+ 30
− 5
View file @ a3d10919
......@@ -3,17 +3,42 @@ using Microsoft.Win32;
using System.Diagnostics;
using System.Reflection;
using System.IO;
using System.Windows.Forms;
using System.Linq;
namespace TUGraz.VECTO
{
class Program
{
static void Main()
private static string[] validVersions = { "net45" };
private static void ValidateVersion(string version)
{
var version = GetHighestNETVersion();
Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
WorkingDirectory = Directory.GetCurrentDirectory()
});
if (!validVersions.Contains(version))
throw new Exception($"Invalid .NET Version supplied. Only the following values are valid: {string.Join(", ", validVersions)}");
}
static void Main(string[] args)
{
var path = "No path found.";
string version = "No version found.";
try {
if (args.Length > 0) {
version = args[0].ToLower();
ValidateVersion(version);
} else {
version = GetHighestNETVersion();
}
path = $"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe";
Process.Start(new ProcessStartInfo(path) {
WorkingDirectory = Directory.GetCurrentDirectory()
});
} catch (Exception e) {
var message = $"Error during starting VECTO.\nDetected .NET version: {version}\nTried to open path: {path}\n{e.Message}";
File.AppendAllText("LOG.txt", $"{DateTime.Now} {message}\n");
Console.WriteLine(message);
MessageBox.Show(message);
}
}
private static string GetHighestNETVersion()
......
Tools/VECTOConsoleStart/Program.cs
+ 2
− 60
View file @ a3d10919
using System;
using Microsoft.Win32;
using System.Diagnostics;
using System.Reflection;
using System.IO;
namespace TUGraz.VECTO
namespace TUGraz.VECTO
{
class Program
{
static void Main()
{
var version = GetHighestNETVersion();
Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
WorkingDirectory = Directory.GetCurrentDirectory()
});
}
private static string GetHighestNETVersion()
{
if (SupportsNet60()) {
return "net60";
}
if (SupportsNet48()) {
return "net48";
}
return "net45";
}
private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardError = true,
RedirectStandardOutput = true
});
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
return false;
}
private static bool SupportsNet48()
{
const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
if (ndpKey != null && ndpKey.GetValue("Release") != null) {
var releaseKey = (int)ndpKey.GetValue("Release");
return releaseKey >= 528040;
}
return false;
}
}
static void Main(string[] args) => StarterHelper.StartVECTO(args);
}
}
Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
+ 8
− 0
View file @ a3d10919
......@@ -9,4 +9,12 @@
<DefineConstants />
</PropertyGroup>
<ItemGroup>
<Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
</Project>
Tools/VECTOMultistageStart/Program.cs
+ 2
− 42
View file @ a3d10919
using System;
using System.Diagnostics;
using System.IO;
using System.Reflection;
namespace TUGraz.VECTO
namespace TUGraz.VECTO
{
class Program
{
static void Main()
{
var version = GetHighestNETVersion();
Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
WorkingDirectory = Directory.GetCurrentDirectory()
});
}
private static string GetHighestNETVersion()
{
if (SupportsNet60()) {
return "net60";
}
return "net48";
}
private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardError = true,
RedirectStandardOutput = true
});
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
return false;
}
static void Main(string[] args) => StarterHelper.StartVECTO(args, "net48", "net60");
}
}
Tools/VECTOMultistageStart/VECTOMultistage.csproj
+ 8
− 0
View file @ a3d10919
......@@ -9,4 +9,12 @@
<DefineConstants />
</PropertyGroup>
<ItemGroup>
<Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
</Project>
Tools/VECTOStart/Program.cs
+ 2
− 84
View file @ a3d10919
using System;
using Microsoft.Win32;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Windows.Forms;
namespace TUGraz.VECTO
namespace TUGraz.VECTO
{
class Program
{
static void Main(string[] args) {
var path = "No path found.";
string version = "No version found.";
try {
if (args.Length > 0) {
version = args[0];
ValidateVersion(version);
} else {
version = GetHighestNETVersion();
}
path = $"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe";
Process.Start(new ProcessStartInfo(path) {
WorkingDirectory = Directory.GetCurrentDirectory()
});
} catch (Exception e) {
Console.WriteLine(e);
var message = $"Error during starting VECTO.\nDetected .NET version: {version}\nTried to open path: {path}\n{e.Message}";
File.AppendAllText("LOG.txt", $"{DateTime.Now} {message}\n");
MessageBox.Show(message);
}
}
private static void ValidateVersion(string version)
{
var validVersions = new[] { "net45", "net48", "net60" };
if (!validVersions.Contains(version))
throw new Exception($"Invalid .NET Version supplied. Only the following values are valid: {string.Join(", ", validVersions)}");
}
private static string GetHighestNETVersion()
{
if (SupportsNet60()) {
return "net60";
}
if (SupportsNet48()) {
return "net48";
}
return "net45";
}
private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardError = true,
RedirectStandardOutput = true
});
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
return false;
}
private static bool SupportsNet48()
{
const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
if (ndpKey != null && ndpKey.GetValue("Release") != null) {
var releaseKey = (int)ndpKey.GetValue("Release");
return releaseKey >= 528040;
}
return false;
}
}
static void Main(string[] args) => StarterHelper.StartVECTO(args);
}
}
Tools/VECTOStart/StarterHelper.cs 0 → 100644
+ 93
− 0
View file @ a3d10919
using Microsoft.Win32;
using System;
using System.Collections;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Windows.Forms;
namespace TUGraz.VECTO
{
class StarterHelper
{
public static void StartVECTO(string[] args, params string[] validVersions)
{
var path = "No path found.";
string version = "No version found.";
if (validVersions is null) {
validVersions = new[] { "net45", "net48", "net60" };
}
try {
if (args.Length > 0) {
version = args[0].ToLower();
} else {
version = StarterHelper.GetHighestNETVersion();
}
path = $"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe";
Process.Start(new ProcessStartInfo(path) {
WorkingDirectory = Directory.GetCurrentDirectory()
});
ValidateVersion(version, validVersions);
} catch (Exception e) {
var message = $"Error during starting VECTO.\nDetected .NET version: {version}\nTried to open path: {path}\n{e.Message}";
File.AppendAllText("LOG.txt", $"{DateTime.Now} {message}\n");
Console.WriteLine(message);
MessageBox.Show(message);
}
}
private static void ValidateVersion(string version, params string[] validVersions)
{
if (!((IList)validVersions).Contains(version))
throw new Exception($"Invalid .NET Version supplied. Only the following values are valid: {string.Join(", ", validVersions)}");
}
private static string GetHighestNETVersion()
{
if (SupportsNet60()) {
return "net60";
}
if (SupportsNet48()) {
return "net48";
}
return "net45";
}
private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardError = true,
RedirectStandardOutput = true
});
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
return false;
}
private static bool SupportsNet48()
{
const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
if (ndpKey != null && ndpKey.GetValue("Release") != null) {
var releaseKey = (int)ndpKey.GetValue("Release");
return releaseKey >= 528040;
}
return false;
}
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about