Code development platform for open source projects from the European Union institutions

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

Updgraded Test Projects to net5.0, and also added net5.0 as TargetFramework to the other projects

parent eca7d11c
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<RootNamespace>GraphDrawer</RootNamespace> <RootNamespace>GraphDrawer</RootNamespace>
<AssemblyName>GraphDrawer</AssemblyName> <AssemblyName>GraphDrawer</AssemblyName>
<DefineConstants /> <DefineConstants />
<TargetFrameworks>net48</TargetFrameworks> <TargetFrameworks>net5.0-windows</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -9,28 +9,9 @@ ...@@ -9,28 +9,9 @@
<OptionCompare>Binary</OptionCompare> <OptionCompare>Binary</OptionCompare>
<OptionStrict>On</OptionStrict> <OptionStrict>On</OptionStrict>
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
<TargetFrameworks>net48</TargetFrameworks> <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup> </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> <ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net48</TargetFrameworks> <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
...@@ -16,13 +16,10 @@ ...@@ -16,13 +16,10 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VECTO3GUI2020\VECTO3GUI2020.csproj" /> <ProjectReference Include="..\VECTO3GUI2020\VECTO3GUI2020.csproj" />
<ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="HelperTests\" /> <Folder Include="HelperTests\" />
<Folder Include="Testdata\bugreports\" /> <Folder Include="Testdata\bugreports\" />
...@@ -122,4 +119,10 @@ ...@@ -122,4 +119,10 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="PresentationFramework">
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationFramework.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>
...@@ -8,16 +8,14 @@ ...@@ -8,16 +8,14 @@
<RootNamespace>TUGraz.VectoCommon</RootNamespace> <RootNamespace>TUGraz.VectoCommon</RootNamespace>
<AssemblyName>VectoCommon</AssemblyName> <AssemblyName>VectoCommon</AssemblyName>
<DefineConstants /> <DefineConstants />
<TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog" Version="4.7.13" /> <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>
<ItemGroup> <ItemGroup>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace> <RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace>
<AssemblyName>ModelbasedTests</AssemblyName> <AssemblyName>ModelbasedTests</AssemblyName>
<DefineConstants /> <DefineConstants />
<TargetFrameworks>net48</TargetFrameworks> <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -4,25 +4,9 @@ ...@@ -4,25 +4,9 @@
<RootNamespace>TUGraz.VectoCore.Tests</RootNamespace> <RootNamespace>TUGraz.VectoCore.Tests</RootNamespace>
<AssemblyName>VectoCoreTest</AssemblyName> <AssemblyName>VectoCoreTest</AssemblyName>
<DefineConstants /> <DefineConstants />
<TargetFrameworks>net48</TargetFrameworks> <TargetFrameworks>net5.0</TargetFrameworks>
</PropertyGroup> </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> <ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit" Version="3.13.2" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment