Skip to content

Commit 8069ccd

Browse files
Fix unit tests for VS17.3 (#96)
***NO_CI***
1 parent a31a838 commit 8069ccd

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

Test/SpiHardwareUnitTests/nano.runsettings renamed to .runsettings

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<MaxCpuCount>1</MaxCpuCount>
66
<ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
77
<TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
8-
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
8+
<TargetFrameworkVersion>net48</TargetFrameworkVersion>
9+
<TargetPlatform>x64</TargetPlatform>
910
</RunConfiguration>
1011
<nanoFrameworkAdapter>
1112
<Logging>None</Logging>

System.Device.Spi/System.Device.Spi.nfproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<NF_IsCoreLibrary>True</NF_IsCoreLibrary>
2020
<DocumentationFile>bin\$(Configuration)\System.Device.Spi.xml</DocumentationFile>
2121
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
22-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
2322
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2423
</PropertyGroup>
2524
<PropertyGroup>
@@ -90,4 +89,4 @@
9089
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.5.113\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.5.113\build\Nerdbank.GitVersioning.targets'))" />
9190
</Target>
9291
<Import Project="..\packages\Nerdbank.GitVersioning.3.5.113\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.5.113\build\Nerdbank.GitVersioning.targets')" />
93-
</Project>
92+
</Project>

Test/SpiHardwareUnitTests/SpiHardwareUnitTests.nfproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2626
</PropertyGroup>
2727
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
28-
<PropertyGroup>
29-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
30-
</PropertyGroup>
3128
<PropertyGroup>
3229
<SignAssembly>true</SignAssembly>
3330
</PropertyGroup>
@@ -64,7 +61,6 @@
6461
</Reference>
6562
</ItemGroup>
6663
<ItemGroup>
67-
<None Include="nano.runsettings" />
6864
<None Include="packages.config" />
6965
</ItemGroup>
7066
<ItemGroup>

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ steps:
5050
parameters:
5151
sonarCloudProject: 'nanoframework_System.Device.Spi'
5252
runUnitTests: false
53-
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Test\SpiHardwareUnitTests\nano.runsettings'
53+
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
5454

5555
# step from template @ nf-tools repo
5656
# report error

nanoFramework.System.Device.Spi.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SpiHardwareUnitTests", "Tes
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F590E4F6-965B-4148-8482-B1B746073606}"
1111
ProjectSection(SolutionItems) = preProject
12+
.runsettings = .runsettings
1213
nanoFramework.System.Device.Spi.nuspec = nanoFramework.System.Device.Spi.nuspec
1314
README.md = README.md
1415
version.json = version.json

0 commit comments

Comments
 (0)