Fixed test case dependencies

Author: codebude

QRCoderTests/CategoryDiscoverer.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if !NET35
+#if !NET35 && !NET452
 using Xunit.Abstractions;
 #endif
 using Xunit.Sdk;
 
 namespace QRCoderTests.XUnitExtenstions
 {
-#if NET35
+#if NET35 || NET452
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
     public class CategoryAttribute : Attribute
     {

QRCoderTests/QRCodeRendererTests.cs

@@ -44,7 +44,7 @@ private string GetAssemblyPath()
 #if NET5_0
                 System.Reflection.Assembly.GetExecutingAssembly().Location;
 #else
-                System.Reflection.Assembly.GetExecutingAssembly().CodeBase.Replace("file:\\", "");
+                Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:\\", "");
 #endif
         }
 

QRCoderTests/QRCoderTests.csproj

@@ -8,18 +8,27 @@
 		<IsTestProject>true</IsTestProject>		
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' != 'net35' ">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />		
+	</ItemGroup>	
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' ">
 		<PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-		<PackageReference Include="shouldly" Version="3.0.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+		<PackageReference Include="shouldly" Version="4.0.3" />
+		<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net35' or '$(TargetFramework)' == 'net452' ">
 		<PackageReference Include="xunit" Version="1.9.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.0.1" />
 		<PackageReference Include="shouldly" Version="2.8.3" />
 	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+		<PackageReference Include="xunit" Version="2.2.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+		<PackageReference Include="shouldly" Version="2.8.3" />
+		<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
+	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\QRCoder\QRCoder.csproj" />
 	</ItemGroup>

QRCoderTests/SvgQRCodeRendererTests.cs

@@ -15,9 +15,18 @@ namespace QRCoderTests
     public class SvgQRCodeRendererTests
     {
 
-
 #if !NETCOREAPP1_1 && !NETCOREAPP2_0
 
+        private string GetAssemblyPath()
+        {
+            return
+#if NET5_0
+                System.Reflection.Assembly.GetExecutingAssembly().Location;
+#else
+                Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:\\", "");
+#endif
+        }
+
         [Fact]
         [Category("QRRenderer/SvgQRCode")]
         public void can_render_svg_qrcode()
@@ -59,7 +68,7 @@ public void can_render_svg_qrcode_with_png_logo()
             var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
 
             //Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909346
-            var logoBitmap = (Bitmap)Bitmap.FromFile(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:\\", "") + "\\assets\\noun_software engineer_2909346.png");
+            var logoBitmap = (Bitmap)Bitmap.FromFile(GetAssemblyPath() + "\\assets\\noun_software engineer_2909346.png");
             var logoObj = new SvgQRCode.SvgLogo(logoBitmap, 15);
 
             var svg = new SvgQRCode(data).GetGraphic(10, Color.DarkGray, Color.White, logo: logoObj);
@@ -80,7 +89,7 @@ public void can_render_svg_qrcode_with_svg_logo()
             var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
 
             //Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909361
-            var logoSvg = File.ReadAllText(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).Replace("file:\\", "") + "\\assets\\noun_Scientist_2909361.svg");
+            var logoSvg = File.ReadAllText(GetAssemblyPath() + "\\assets\\noun_Scientist_2909361.svg");
             var logoObj = new SvgQRCode.SvgLogo(logoSvg, 30);
 
             var svg = new SvgQRCode(data).GetGraphic(10, Color.DarkGray, Color.White, logo: logoObj);