Fix unit tests for VS17.3 (#102)

***NO_CI***

.runsettings

@@ -6,9 +6,11 @@
        <ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
        <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
        <TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
+        <TargetFrameworkVersion>net48</TargetFrameworkVersion>
+       <TargetPlatform>x64</TargetPlatform>
    </RunConfiguration>
    <nanoFrameworkAdapter>
        <Logging>None</Logging>
        <IsRealHardware>False</IsRealHardware>
    </nanoFrameworkAdapter>
-</RunSettings>
+</RunSettings>

Tests/HashtableTests/HashtableTests.nfproj

@@ -25,9 +25,6 @@
     <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="HashtableTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -49,7 +46,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="nano.runsettings" />
     <None Include="packages.config" />
     <None Include="packages.lock.json" />
   </ItemGroup>

Tests/QueueTests/QueueTests.nfproj

@@ -25,9 +25,6 @@
     <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="QueueTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -47,7 +44,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="nano.runsettings" />
     <None Include="packages.config" />
     <None Include="packages.lock.json" />
   </ItemGroup>

Tests/QueueTests/nano.runsettings

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RunSettings>
-   <!-- Configurations that affect the Test Framework -->
-   <RunConfiguration>
-       <MaxCpuCount>1</MaxCpuCount>
-       <ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
-       <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
-       <TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
-   </RunConfiguration>
-   <nanoFrameworkAdapter>
-       <Logging>None</Logging>
-       <IsRealHardware>False</IsRealHardware>
-   </nanoFrameworkAdapter>
-</RunSettings>

Tests/StackTests/StackTests.nfproj

@@ -25,9 +25,6 @@
     <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\QueueTests\TestObjects.cs">
       <Link>TestObjects.cs</Link>
@@ -49,7 +46,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="nano.runsettings" />
     <None Include="packages.config" />
     <None Include="packages.lock.json" />
   </ItemGroup>

Tests/StackTests/nano.runsettings

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RunSettings>
-   <!-- Configurations that affect the Test Framework -->
-   <RunConfiguration>
-       <MaxCpuCount>1</MaxCpuCount>
-       <ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
-       <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
-       <TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
-   </RunConfiguration>
-   <nanoFrameworkAdapter>
-       <Logging>None</Logging>
-       <IsRealHardware>False</IsRealHardware>
-   </nanoFrameworkAdapter>
-</RunSettings>

azure-pipelines.yml

@@ -54,7 +54,7 @@ steps:
   parameters:
     sonarCloudProject: 'nanoframework_lib-nanoFramework.System.Collections'
     runUnitTests: true
-    unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\HashtableTests\nano.runsettings'
+    unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
 
 # update dependencies
 # update dependents

nanoFramework.System.Collections.sln

@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BBE482A2-86B3-4727-84CF-A53319F301CE}"
 	ProjectSection(SolutionItems) = preProject
 		nanoFramework.System.Collections.nuspec = nanoFramework.System.Collections.nuspec
+		.runsettings = .runsettings
 		NuGet.Config = NuGet.Config
 		version.json = version.json
 	EndProjectSection