From 88bb46faa14772388233e13d833048bae68ac3ac Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 14 Feb 2022 08:16:30 +0100
Subject: [PATCH] Updgraded Test Projects to net5.0, and also added net5.0 as
TargetFramework to the other projects
---
Tools/GraphDrawer/GraphDrawer.csproj | 2 +-
.../VectoAuxiliariesTests.vbproj | 21 +------------------
Vecto3GUI2020Test/Vecto3GUI2020Test.csproj | 13 +++++++-----
VectoCommon/VectoCommon/VectoCommon.csproj | 8 +++----
.../ModelbasedTests/ModelbasedTests.csproj | 2 +-
VectoCore/VectoCoreTest/VectoCoreTest.csproj | 18 +---------------
6 files changed, 15 insertions(+), 49 deletions(-)
diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index e80d684440..bb6e27dacb 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -5,7 +5,7 @@
<RootNamespace>GraphDrawer</RootNamespace>
<AssemblyName>GraphDrawer</AssemblyName>
<DefineConstants />
- <TargetFrameworks>net48</TargetFrameworks>
+ <TargetFrameworks>net5.0-windows</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index b00e17fb0c..27998e2d08 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -9,28 +9,9 @@
<OptionCompare>Binary</OptionCompare>
<OptionStrict>On</OptionStrict>
<OptionInfer>On</OptionInfer>
- <TargetFrameworks>net48</TargetFrameworks>
+ <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Data" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.Transactions" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Threading.Tasks.Extensions" />
- <Reference Include="System.Core" />
- </ItemGroup>
-
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
index e20ae0764e..bc35a1a0bc 100644
--- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
+++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net48</TargetFrameworks>
+ <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
@@ -16,13 +16,10 @@
<ItemGroup>
<ProjectReference Include="..\VECTO3GUI2020\VECTO3GUI2020.csproj" />
+ <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
- <ItemGroup>
- <Reference Include="PresentationFramework" />
- </ItemGroup>
-
<ItemGroup>
<Folder Include="HelperTests\" />
<Folder Include="Testdata\bugreports\" />
@@ -122,4 +119,10 @@
</None>
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="PresentationFramework">
+ <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationFramework.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+
</Project>
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index bdaf868a08..c9c87b749a 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -8,16 +8,14 @@
<RootNamespace>TUGraz.VectoCommon</RootNamespace>
<AssemblyName>VectoCommon</AssemblyName>
<DefineConstants />
+ <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
</PropertyGroup>
- <ItemGroup>
- <Reference Include="System.ComponentModel.DataAnnotations" />
- </ItemGroup>
-
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog" Version="4.7.13" />
- <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+ <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+ <PackageReference Condition="'$(TargetFramework)'=='net45'" Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index 5526f6a2b3..20da342968 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -4,7 +4,7 @@
<RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace>
<AssemblyName>ModelbasedTests</AssemblyName>
<DefineConstants />
- <TargetFrameworks>net48</TargetFrameworks>
+ <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 360c39b540..0580331a0e 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -4,25 +4,9 @@
<RootNamespace>TUGraz.VectoCore.Tests</RootNamespace>
<AssemblyName>VectoCoreTest</AssemblyName>
<DefineConstants />
- <TargetFrameworks>net48</TargetFrameworks>
+ <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Data" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.Transactions" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- </ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
--
GitLab