Skip to content

Commit cacb223

Browse files
committed
Reconfigured test environment
Made some changes so that test cases run successfully from within Visual Studio's test explorer as also via dotnet test in commandline.
1 parent ea42bb0 commit cacb223

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

QRCoder/QRCoder.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWindowsForms>
77
<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWPF>
88
<DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
9+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
910
</PropertyGroup>
1011

1112
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -37,6 +38,7 @@
3738

3839
<PropertyGroup>
3940
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
41+
<AutomaticallyUseReferenceAssemblyPackages Condition=" '$(TargetFramework)' == 'net35' ">false</AutomaticallyUseReferenceAssemblyPackages>
4042
</PropertyGroup>
4143

4244
</Project>

QRCoderTests/QRCoderTests.csproj

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,26 @@
55
<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows'">true</UseWPF>
66
<DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
77
<IsPackable>false</IsPackable>
8-
<IsTestProject>true</IsTestProject>
8+
<IsTestProject>true</IsTestProject>
9+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
910
</PropertyGroup>
10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
12-
</ItemGroup>
13-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' ">
11+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' ">
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1413
<PackageReference Include="xunit" Version="2.4.1" />
1514
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
1615
<PackageReference Include="shouldly" Version="4.0.3" />
17-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
18-
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
1916
</ItemGroup>
2017
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' or '$(TargetFramework)' == 'net452' ">
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
2119
<PackageReference Include="xunit" Version="1.9.2" />
2220
<PackageReference Include="xunit.runner.visualstudio" Version="2.0.1" />
2321
<PackageReference Include="shouldly" Version="2.8.3" />
2422
</ItemGroup>
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
26-
<PackageReference Include="xunit" Version="2.2.0" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
28-
<PackageReference Include="shouldly" Version="2.8.3" />
29-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
30-
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' or '$(TargetFramework)' == 'netcoreapp2.0'">
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
25+
<PackageReference Include="xunit" Version="2.4.1" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
27+
<PackageReference Include="shouldly" Version="3.0.2" />
3128
</ItemGroup>
3229
<ItemGroup>
3330
<ProjectReference Include="..\QRCoder\QRCoder.csproj" />
@@ -42,5 +39,6 @@
4239
</ItemGroup>
4340
<PropertyGroup>
4441
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
42+
<AutomaticallyUseReferenceAssemblyPackages Condition=" '$(TargetFramework)' == 'net35' ">false</AutomaticallyUseReferenceAssemblyPackages>
4543
</PropertyGroup>
4644
</Project>

0 commit comments

Comments
 (0)