diff --git a/Directory.Build.targets b/Directory.Build.targets
index 1c0fa0cc0f465091474538ea9e048a7e65615572..e61d55f7abf8e2a159636b0a2bab22ccedab26ee 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -50,24 +50,24 @@
<Copy SourceFiles="@(Net48VECTO)" DestinationFolder="$(DeployPath)net48"/>
<ItemGroup>
- <!-- All files for net5.0 -->
- <Vecto Include="$(SolutionDir)VECTO\bin\Release\net5.0-windows\VECTO.*" Exclude="*.dev.json"/>
- <Vecto Include="$(SolutionDir)VECTO\bin\Release\net5.0-windows\*.dll"/>
- <Vecto Include="$(SolutionDir)VECTO\bin\Release\net5.0-windows\runtimes\**\*.*"/>
- <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net5.0\vectocmd.*" Exclude="*.dev.json"/>
- <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net5.0\*.dll"/>
- <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net5.0\runtimes\**\*.*"/>
- <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net5.0\hashingcmd.*" Exclude="*.dev.json"/>
- <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net5.0\*.dll"/>
- <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net5.0\runtimes\**\*.*"/>
- <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
- <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\*.dll"/>
- <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\runtimes\**\*.*"/>
+ <!-- All files for net6.0 -->
+ <Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\VECTO.*" Exclude="*.dev.json"/>
+ <Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\*.dll"/>
+ <Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\runtimes\**\*.*"/>
+ <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\vectocmd.*" Exclude="*.dev.json"/>
+ <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\*.dll"/>
+ <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\runtimes\**\*.*"/>
+ <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\hashingcmd.*" Exclude="*.dev.json"/>
+ <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\*.dll"/>
+ <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\runtimes\**\*.*"/>
+ <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
+ <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\*.dll"/>
+ <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\runtimes\**\*.*"/>
</ItemGroup>
- <Copy SourceFiles="@(HashingTool)" DestinationFolder="$(DeployPath)net50"/>
- <Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(DeployPath)net50"/>
- <Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(DeployPath)net50"/>
- <Copy SourceFiles="@(Vecto)" DestinationFolder="$(DeployPath)net50"/>
+ <Copy SourceFiles="@(HashingTool)" DestinationFolder="$(DeployPath)net6"/>
+ <Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(DeployPath)net6"/>
+ <Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(DeployPath)net6"/>
+ <Copy SourceFiles="@(Vecto)" DestinationFolder="$(DeployPath)net6"/>
<ItemGroup>
<!-- All files for the VECTO starters -->
diff --git a/HashingCmd/HashingCmd.csproj b/HashingCmd/HashingCmd.csproj
index c9d59a06e4cfe45615e3a218db9bb9a58b1b90fd..4868200609d2647ab12ce9343eb55ce07c4e78c2 100644
--- a/HashingCmd/HashingCmd.csproj
+++ b/HashingCmd/HashingCmd.csproj
@@ -6,7 +6,7 @@
<RootNamespace>HashingCmd</RootNamespace>
<AssemblyName>hashingcmd</AssemblyName>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+ <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
<OutputType>Exe</OutputType>
</PropertyGroup>
diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
index fcef676f339aef78819dcf2a0f0a61305c78a88c..7426ce847c7e001cb3da56e82a9a73293b69b435 100644
--- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
+++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
@@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>DeclarationCycleZip</RootNamespace>
<AssemblyName>DeclarationCycleZip</AssemblyName>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index e26fef0a461607748f47be4df98184b65178c292..fedd980a65886e9f4df4de0c3dce29bc8467ec3d 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>GraphDrawer</RootNamespace>
<AssemblyName>GraphDrawer</AssemblyName>
- <TargetFrameworks>net5.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/Tools/HashingCmdStart/Program.cs b/Tools/HashingCmdStart/Program.cs
index f2b7ce9a75fcc600e171ea34fdd016e4923ea334..4ee38c806d52ec7f2ee2e774945c926e400537ee 100644
--- a/Tools/HashingCmdStart/Program.cs
+++ b/Tools/HashingCmdStart/Program.cs
@@ -18,8 +18,8 @@ namespace TUGraz.VECTO
private static string GetHighestNETVersion()
{
- if (SupportsNet50()) {
- return "net50";
+ if (SupportsNet60()) {
+ return "net60";
}
if (SupportsNet48()) {
@@ -29,7 +29,7 @@ namespace TUGraz.VECTO
return "net45";
}
- private static bool SupportsNet50()
+ private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -41,7 +41,7 @@ namespace TUGraz.VECTO
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+ return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
diff --git a/Tools/HashingToolStart/Program.cs b/Tools/HashingToolStart/Program.cs
index bfcdf003cf209889f0ad5bc0f8dde78cba475be0..c02231108231f8e676d4c49d64708861628ef3af 100644
--- a/Tools/HashingToolStart/Program.cs
+++ b/Tools/HashingToolStart/Program.cs
@@ -19,8 +19,8 @@ namespace TUGraz.VECTO
private static string GetHighestNETVersion()
{
//todo mk2022-02-17 hashing tool currently only works under net45. this has to be fixed.
- //if (SupportsNet50()) {
- // return "net50";
+ //if (SupportsNet60()) {
+ // return "net60";
//}
//if (SupportsNet48()) {
@@ -30,7 +30,7 @@ namespace TUGraz.VECTO
return "net45";
}
- private static bool SupportsNet50()
+ private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -42,7 +42,7 @@ namespace TUGraz.VECTO
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+ return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
diff --git a/Tools/LicenceHeader/LicenceHeader.csproj b/Tools/LicenceHeader/LicenceHeader.csproj
index daf6950908b73103d7f79dd9511f5a551e3313ab..832dd4037d1ee0285597297ff630353f748a7c8f 100644
--- a/Tools/LicenceHeader/LicenceHeader.csproj
+++ b/Tools/LicenceHeader/LicenceHeader.csproj
@@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>LicenceHeader</RootNamespace>
<AssemblyName>LicenceHeader</AssemblyName>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
<ItemGroup>
diff --git a/Tools/VECTOConsoleStart/Program.cs b/Tools/VECTOConsoleStart/Program.cs
index f2b7ce9a75fcc600e171ea34fdd016e4923ea334..4ee38c806d52ec7f2ee2e774945c926e400537ee 100644
--- a/Tools/VECTOConsoleStart/Program.cs
+++ b/Tools/VECTOConsoleStart/Program.cs
@@ -18,8 +18,8 @@ namespace TUGraz.VECTO
private static string GetHighestNETVersion()
{
- if (SupportsNet50()) {
- return "net50";
+ if (SupportsNet60()) {
+ return "net60";
}
if (SupportsNet48()) {
@@ -29,7 +29,7 @@ namespace TUGraz.VECTO
return "net45";
}
- private static bool SupportsNet50()
+ private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -41,7 +41,7 @@ namespace TUGraz.VECTO
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+ return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
diff --git a/Tools/VECTOMultistageStart/Program.cs b/Tools/VECTOMultistageStart/Program.cs
index d200b44ac9db780dc3c801eefe0fa0768a147a1a..2dce9c985988ae71a5b9ae7bff4d3f32ca46718a 100644
--- a/Tools/VECTOMultistageStart/Program.cs
+++ b/Tools/VECTOMultistageStart/Program.cs
@@ -17,14 +17,14 @@ namespace TUGraz.VECTO
private static string GetHighestNETVersion()
{
- if (SupportsNet50()) {
- return "net50";
+ if (SupportsNet60()) {
+ return "net60";
}
return "net48";
}
- private static bool SupportsNet50()
+ private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -36,7 +36,7 @@ namespace TUGraz.VECTO
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+ return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
diff --git a/Tools/VECTOStart/Program.cs b/Tools/VECTOStart/Program.cs
index 0cd67d633c0af56ac581968532f8afb20a43c079..e5896e5d2f72524d42735eed5cff5d2af1143e1e 100644
--- a/Tools/VECTOStart/Program.cs
+++ b/Tools/VECTOStart/Program.cs
@@ -18,8 +18,8 @@ namespace TUGraz.VECTO
private static string GetHighestNETVersion()
{
- if (SupportsNet50()) {
- return "net50";
+ if (SupportsNet60()) {
+ return "net60";
}
if (SupportsNet48()) {
@@ -29,7 +29,7 @@ namespace TUGraz.VECTO
return "net45";
}
- private static bool SupportsNet50()
+ private static bool SupportsNet60()
{
try {
var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -41,7 +41,7 @@ namespace TUGraz.VECTO
p.WaitForExit();
var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+ return output.Contains("Microsoft.WindowsDesktop.App 6");
} catch (Exception e) {
Console.WriteLine(e);
}
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index c2e705429b25d160239cf2fb5ea2750da45b214b..01c0819bc35ce569668ef0897fda460a6210f312 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -8,7 +8,7 @@
<OptionStrict>On</OptionStrict>
<UseWindowsForms>true</UseWindowsForms>
<MyType>WindowsForms</MyType>
- <!--<TargetFrameworks>net45;net48;net5.0-windows</TargetFrameworks>-->
+ <!--<TargetFrameworks>net45;net48;net6.0-windows</TargetFrameworks>-->
<!-- The GUI Editor of Visual Studio 2019 has problems with multitargets.
If you want to change GUI stuff, then only use one target (uncomment the following line): -->
<TargetFrameworks>net45</TargetFrameworks>
@@ -34,7 +34,7 @@
<Reference Include="System.Windows.Forms.DataVisualization" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
<PackageReference Include="System.Data.SqlClient">
<Version>4.8.3</Version>
</PackageReference>
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index 007757b3f5667d997cc95cd818402ec46ba7dc2a..49a079e8ee588fb2c2db90ce38466ea75590eb38 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -10,7 +10,7 @@
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
- <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+ <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 28d399122f5e3c47736429da2b291d609a39c775..709802e110259afb2ea612c12eeab84f033a3b2e 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -7,7 +7,7 @@
<OptionCompare>Binary</OptionCompare>
<OptionStrict>On</OptionStrict>
<OptionInfer>On</OptionInfer>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
index 5c5f2a81a41420b230453450d9c3350b66f14005..101e922cd35337d3af8f5798aebb2386c55f2884 100644
--- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
+++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net5.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index ed662b4f867780a517523d66324d9280a8355bb9..157a10ad21b5f0c50a7fbbe0aeff1af3af72eb44 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCommon</RootNamespace>
<AssemblyName>VectoCommon</AssemblyName>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+ <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj
index 967277c8d796529df42f81bcb8a915ba69a288ad..f833fa86eb34d4986fa7a4a941b5fefba4267658 100644
--- a/VectoCommon/VectoHashing/VectoHashing.csproj
+++ b/VectoCommon/VectoHashing/VectoHashing.csproj
@@ -6,7 +6,7 @@
<RootNamespace>TUGraz.VectoHashing</RootNamespace>
<AssemblyName>VectoHashing</AssemblyName>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+ <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
@@ -21,7 +21,7 @@
</PackageReference>
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Security.Cryptography.Xml">
<Version>6.0.0</Version>
</PackageReference>
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index fea05be9f6d088f78ed5b9d67418c9daca099923..762bdaa894b986a0b04bd057a1156e6ec08b296f 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>VectoHashingTest</RootNamespace>
<AssemblyName>VectoHashingTest</AssemblyName>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs
index 9019335655d7860fd03c48f629bc4363587f2a97..7af3dd2e2c22ea290fe667a63c4259b20ff7de66 100644
--- a/VectoConsole/Program.cs
+++ b/VectoConsole/Program.cs
@@ -146,7 +146,7 @@ Examples:
var config = LogManager.Configuration;
if (config is null) {
- // in .net5.0 the app is exported as dll, therefore the default config lookup of nlog doesn't work.
+ // in .net6.0 the app is exported as dll, therefore the default config lookup of nlog doesn't work.
LogManager.LoadConfiguration($"{Assembly.GetExecutingAssembly().GetName().Name}.dll.config");
config = LogManager.Configuration;
}
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index 7f48f347ae5be890cb3fa022303fcee68cdca42b..cf2935dcb40b6f82b1d797fb0bf8e72cf50e96cf 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -4,7 +4,7 @@
<RootNamespace>VectoConsole</RootNamespace>
<AssemblyName>vectocmd</AssemblyName>
<ApplicationIcon>VECTO.ico</ApplicationIcon>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+ <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index c95a2d9eed184a25ecb845febb21e1160cca065d..b547fa8f6f44ba3421888e9f7153b3617aeea0bc 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace>
<AssemblyName>ModelbasedTests</AssemblyName>
- <TargetFrameworks>net5.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index c1290de9f64efe895a30aff06448a4c3b040bd8e..b12fffd2d0d04bfce81c117c2bb58f13e9c90136 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore</RootNamespace>
<AssemblyName>VectoCore</AssemblyName>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+ <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
<ItemGroup>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index c7cfb795a38b03b75a40aed7d5e2a17444b9ee94..2d2271a7187577126581344c79abc78d16ffefad 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore.Tests</RootNamespace>
<AssemblyName>VectoCoreTest</AssemblyName>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>