diff --git a/Directory.Build.props b/Directory.Build.props
index 66aad6e011287d7d8d5410ddfd21a658c71c572d..6d1a5ba1ad669c0c10261e3fca9446657ac13594 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -12,7 +12,7 @@
<!-- The following settings are used as default values for ALL projects -->
<PropertyGroup>
- <TargetFrameworks>net45;net48</TargetFrameworks>
+ <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
<VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix>
<Authors>Graz University of Technology</Authors>
<Company>European Union</Company>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index ea10e09d417edc72bd23e20ae2535b92fcb725cd..1c0fa0cc0f465091474538ea9e048a7e65615572 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,8 +37,6 @@
<!-- All files for net48 -->
<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe*"/>
<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.dll*"/>
- <Net48HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net48\*.exe*"/>
- <Net48HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net48\*.dll*"/>
<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe*"/>
<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.dll*"/>
<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.exe*"/>
@@ -59,9 +57,6 @@
<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)HashingTool\bin\Release\net5.0-windows\HashingTool.*" Exclude="*.dev.json"/>
- <HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net5.0-windows\*.dll"/>
- <HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net5.0-windows\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\**\*.*"/>
@@ -122,6 +117,5 @@
<Target Name="CleanVectoDeploy" AfterTargets="Clean">
<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
- <Delete Files="$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip" Condition="Exists('$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip')"/>
</Target>
</Project>
\ No newline at end of file
diff --git a/HashingCmd/HashingCmd.csproj b/HashingCmd/HashingCmd.csproj
index d34ec17f0ecaf0ed79ce5f6f213b0ca26d0b4116..12a133623a15000b4e1e68e81a9655243c6d247b 100644
--- a/HashingCmd/HashingCmd.csproj
+++ b/HashingCmd/HashingCmd.csproj
@@ -8,7 +8,6 @@
<AssemblyName>hashingcmd</AssemblyName>
<DefineConstants />
<OutputType>Exe</OutputType>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/HashingTool/HashingTool.csproj b/HashingTool/HashingTool.csproj
index 4b0aa5e3bfcb0aaa66a9a901512695cff1d300bf..3880f9060eeec75bfda89899aba0d9a4064054af 100644
--- a/HashingTool/HashingTool.csproj
+++ b/HashingTool/HashingTool.csproj
@@ -7,9 +7,10 @@
<OutputType>WinExe</OutputType>
<RootNamespace>HashingTool</RootNamespace>
<AssemblyName>HashingTool</AssemblyName>
- <DefineConstants />
<UseWPF>true</UseWPF>
- <TargetFrameworks>net45;net48;net5.0-windows</TargetFrameworks>
+ <TargetFrameworks>net45</TargetFrameworks>
+ <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+ <ApplicationIcon>HashingIcon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
@@ -27,5 +28,4 @@
<Resource Include="HashingIcon.ico" />
<Resource Include="Resources\EuropeanCommission.jpg" />
</ItemGroup>
-
</Project>
\ No newline at end of file
diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
index 28a25cca5b648205913e8332e085440e1c5adc42..4dd1b4be5a17f171263720d5b659ff4af5119c7a 100644
--- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
+++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
@@ -3,7 +3,6 @@
<OutputType>Exe</OutputType>
<RootNamespace>DeclarationCycleZip</RootNamespace>
<AssemblyName>DeclarationCycleZip</AssemblyName>
- <DefineConstants />
<TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index 7a235d36146952bea8804f7ed29379690db98adb..b398622c09e94fed8779dae793f70347ebeb17bd 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -3,7 +3,6 @@
<OutputType>Exe</OutputType>
<RootNamespace>GraphDrawer</RootNamespace>
<AssemblyName>GraphDrawer</AssemblyName>
- <DefineConstants />
<TargetFrameworks>net5.0-windows</TargetFrameworks>
</PropertyGroup>
diff --git a/Tools/HashingCmdStart/HashingCmdStart.csproj b/Tools/HashingCmdStart/HashingCmdStart.csproj
index 013a946dd3d53283987ca56f629d0986c0658944..272012b2fe2a77575e888666f59bb69e463d8889 100644
--- a/Tools/HashingCmdStart/HashingCmdStart.csproj
+++ b/Tools/HashingCmdStart/HashingCmdStart.csproj
@@ -2,14 +2,9 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFrameworks />
- <TargetFramework>net45</TargetFramework>
+ <TargetFrameworks>net45</TargetFrameworks>
<AssemblyName>hashingcmd</AssemblyName>
- <ApplicationIcon></ApplicationIcon>
- <PackageIconUrl />
<RootNamespace>TUGraz.VECTO</RootNamespace>
- <ApplicationIcon>Icon2.ico</ApplicationIcon>
- <StartupObject />
</PropertyGroup>
</Project>
diff --git a/Tools/HashingCmdStart/Icon2.ico b/Tools/HashingCmdStart/Icon2.ico
deleted file mode 100644
index 6de7e5cd7ef1e97f70d64cb3eeaa2b7fcc8d604f..0000000000000000000000000000000000000000
Binary files a/Tools/HashingCmdStart/Icon2.ico and /dev/null differ
diff --git a/Tools/HashingToolStart/HashingIcon.ico b/Tools/HashingToolStart/HashingIcon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2b8e38c609d9e7b192eae4a8abfe7eb2b72c42fa
Binary files /dev/null and b/Tools/HashingToolStart/HashingIcon.ico differ
diff --git a/Tools/HashingToolStart/HashingToolStart.csproj b/Tools/HashingToolStart/HashingToolStart.csproj
index e1ab2b9c979c018f53bf7777cef43762b1d4c60d..be8119c94731e107f98ff3dc5d2509d542bd4522 100644
--- a/Tools/HashingToolStart/HashingToolStart.csproj
+++ b/Tools/HashingToolStart/HashingToolStart.csproj
@@ -2,13 +2,10 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFrameworks />
- <TargetFramework>net45</TargetFramework>
+ <TargetFrameworks>net45</TargetFrameworks>
<AssemblyName>HashingTool</AssemblyName>
- <ApplicationIcon>Icon2.ico</ApplicationIcon>
- <PackageIconUrl />
+ <ApplicationIcon>HashingIcon.ico</ApplicationIcon>
<RootNamespace>TUGraz.VECTO</RootNamespace>
- <StartupObject />
</PropertyGroup>
</Project>
diff --git a/Tools/HashingToolStart/Icon2.ico b/Tools/HashingToolStart/Icon2.ico
deleted file mode 100644
index 6de7e5cd7ef1e97f70d64cb3eeaa2b7fcc8d604f..0000000000000000000000000000000000000000
Binary files a/Tools/HashingToolStart/Icon2.ico and /dev/null differ
diff --git a/Tools/HashingToolStart/Program.cs b/Tools/HashingToolStart/Program.cs
index f2b7ce9a75fcc600e171ea34fdd016e4923ea334..bfcdf003cf209889f0ad5bc0f8dde78cba475be0 100644
--- a/Tools/HashingToolStart/Program.cs
+++ b/Tools/HashingToolStart/Program.cs
@@ -18,13 +18,14 @@ namespace TUGraz.VECTO
private static string GetHighestNETVersion()
{
- if (SupportsNet50()) {
- return "net50";
- }
+ //todo mk2022-02-17 hashing tool currently only works under net45. this has to be fixed.
+ //if (SupportsNet50()) {
+ // return "net50";
+ //}
- if (SupportsNet48()) {
- return "net48";
- }
+ //if (SupportsNet48()) {
+ // return "net48";
+ //}
return "net45";
}
diff --git a/Tools/LicenceHeader/LicenceHeader.csproj b/Tools/LicenceHeader/LicenceHeader.csproj
index ee0d830f574cc3bfd751929288189b62cc0c07e4..15169b3dd958ad353787255d033e23cfe7606f72 100644
--- a/Tools/LicenceHeader/LicenceHeader.csproj
+++ b/Tools/LicenceHeader/LicenceHeader.csproj
@@ -3,7 +3,6 @@
<OutputType>Exe</OutputType>
<RootNamespace>LicenceHeader</RootNamespace>
<AssemblyName>LicenceHeader</AssemblyName>
- <DefineConstants />
<TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj b/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
index 982de63cbee3d26c830d20db16f7b8e4d74dd93a..5905b875e5a9543bbab7874ae1c15e4ed135f893 100644
--- a/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
+++ b/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
@@ -2,13 +2,10 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFrameworks />
- <TargetFramework>net45</TargetFramework>
+ <TargetFrameworks>net45</TargetFrameworks>
<AssemblyName>vectocmd</AssemblyName>
<ApplicationIcon>Icon2.ico</ApplicationIcon>
- <PackageIconUrl />
<RootNamespace>TUGraz.VECTO</RootNamespace>
- <StartupObject />
</PropertyGroup>
</Project>
diff --git a/Tools/VECTOMultistageStart/VECTOMultistage.csproj b/Tools/VECTOMultistageStart/VECTOMultistage.csproj
index 54da44a4285db2c2d8b57e5163f55f2d4526a7f0..4096c354401d41127a32be38752211a31da76d6c 100644
--- a/Tools/VECTOMultistageStart/VECTOMultistage.csproj
+++ b/Tools/VECTOMultistageStart/VECTOMultistage.csproj
@@ -2,13 +2,10 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFrameworks />
- <TargetFramework>net45</TargetFramework>
+ <TargetFrameworks>net45</TargetFrameworks>
<AssemblyName>VECTOMultistage</AssemblyName>
<ApplicationIcon>Icon2.ico</ApplicationIcon>
- <PackageIconUrl />
<RootNamespace>TUGraz.VECTO</RootNamespace>
- <StartupObject />
</PropertyGroup>
</Project>
diff --git a/Tools/VECTOStart/VECTOStart.csproj b/Tools/VECTOStart/VECTOStart.csproj
index b9d120f92629d486212300e9d1cce29d81fb482f..d9cc86bd1f6db09d26f585c6d530c62a9d81a69b 100644
--- a/Tools/VECTOStart/VECTOStart.csproj
+++ b/Tools/VECTOStart/VECTOStart.csproj
@@ -2,14 +2,11 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFrameworks />
- <TargetFramework>net45</TargetFramework>
+ <TargetFrameworks>net45</TargetFrameworks>
<AssemblyName>VECTO</AssemblyName>
<ApplicationIcon>Icon2.ico</ApplicationIcon>
- <PackageIconUrl />
<RootNamespace>TUGraz.VECTO</RootNamespace>
<Configurations>Debug;Release;Deploy</Configurations>
- <StartupObject />
</PropertyGroup>
</Project>
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 19652facf471cb411afeb185f14f3db0c625cd44..531c29986e06bf75732f1930b13773b495059cc5 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -4,14 +4,13 @@
<StartupObject>Sub Main</StartupObject>
<RootNamespace>TUGraz.VECTO</RootNamespace>
<AssemblyName>VECTO</AssemblyName>
- <DefineConstants />
<ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
<OptionStrict>On</OptionStrict>
<UseWindowsForms>true</UseWindowsForms>
<MyType>WindowsForms</MyType>
- <DefineDebug>false</DefineDebug>
- <DefineTrace>false</DefineTrace>
<TargetFrameworks>net45;net48;net5.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>net5.0-windows</TargetFrameworks>-->
</PropertyGroup>
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index 1cef03dafb2f70af757407626ee3ffdf42244045..1dd2db3d072a3735abd0eacf679a22e976a744fa 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -6,7 +6,6 @@
<OutputType>WinExe</OutputType>
<RootNamespace>VECTO3GUI2020</RootNamespace>
<AssemblyName>VECTOMultistage</AssemblyName>
- <DefineConstants />
<ApplicationIcon>Resources\Icons\Icon2.ico</ApplicationIcon>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 4aaaad408cf38c19dff680b1c54d826bc7ee92f9..d36b7b4a19564f84b921102c047e34d78aee9a6d 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -2,7 +2,6 @@
<PropertyGroup>
<RootNamespace>VectoAuxiliariesTests</RootNamespace>
<AssemblyName>VectoAuxiliariesTests</AssemblyName>
- <DefineConstants />
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
<OptionExplicit>On</OptionExplicit>
<OptionCompare>Binary</OptionCompare>
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 2a1bc6f2730214fc5762f3a35064c545f5812369..7df554ef00b285181a6edb4c316c9469433d1ee8 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -1,14 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <!-- Version Information (only needed if it differs from Global VECTO Version)-->
- <!--<MainProductVersion>0.0.0</MainProductVersion>-->
- <!--<VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix>-->
-
<RootNamespace>TUGraz.VectoCommon</RootNamespace>
<AssemblyName>VectoCommon</AssemblyName>
- <DefineConstants />
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
- <TargetFramework />
</PropertyGroup>
<ItemGroup>
diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj
index dabece5c129dd65b4be83a8ca3b89afcbf839769..29db4f97a161d0f3a4d501a69d8fe7616ce4cfc2 100644
--- a/VectoCommon/VectoHashing/VectoHashing.csproj
+++ b/VectoCommon/VectoHashing/VectoHashing.csproj
@@ -6,9 +6,6 @@
<RootNamespace>TUGraz.VectoHashing</RootNamespace>
<AssemblyName>VectoHashing</AssemblyName>
- <DefineConstants />
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
- <TargetFramework />
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index c2b2c7dfb85d804b7dd1bc9115a7ba538865de91..8e9a098b36b35f5f95c186200c359358503352e6 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <!-- Version Information (only needed if it differs from Global VECTO Version)-->
- <!--<MainProductVersion>0.0.0</MainProductVersion>-->
- <!--<VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix>-->
-
<RootNamespace>VectoHashingTest</RootNamespace>
<AssemblyName>VectoHashingTest</AssemblyName>
<DefineConstants />
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index 1d2988adcd96bd447a0f6400d6138d02fe3b71f2..dde969ad1dbf9d2493d05ef905edc21d74fcc5e1 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -3,9 +3,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>VectoConsole</RootNamespace>
<AssemblyName>vectocmd</AssemblyName>
- <DefineConstants />
<ApplicationIcon>VECTO.ico</ApplicationIcon>
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index e8fe7d4cfbfe9cc225778fabb05dadb5d726f62c..28a6433011423a6726d0f75aed665a8f7a2df2b6 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -2,7 +2,6 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace>
<AssemblyName>ModelbasedTests</AssemblyName>
- <DefineConstants />
<TargetFrameworks>net5.0-windows</TargetFrameworks>
</PropertyGroup>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index e7c3e722fe2929fc30df532496800372d5f88598..9571bb4c76b86e41411a23d47dd739a2fc512a37 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -2,8 +2,6 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore</RootNamespace>
<AssemblyName>VectoCore</AssemblyName>
- <DefineConstants />
- <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 6db352d3efa033db93011bdab104763fb8e75121..6bb864a96bed691946d134fe8b930dbfc6626925 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2,7 +2,6 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore.Tests</RootNamespace>
<AssemblyName>VectoCoreTest</AssemblyName>
- <DefineConstants />
<TargetFrameworks>net5.0-windows</TargetFrameworks>
</PropertyGroup>