Skip to content

Commit 4232aed

Browse files
Fix ability to run unit tests locally in VS17.3 (#352)
***NO_CI***
1 parent 344b5d1 commit 4232aed

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

Tests/HttpUnitTests/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>

Tests/HttpUnitTests/HttpUnitTests.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
<ItemGroup>
3229
<Compile Include="StreamContentTest.cs" />
3330
<Compile Include="ByteArrayContentTest.cs" />
@@ -72,7 +69,6 @@
7269
</Reference>
7370
</ItemGroup>
7471
<ItemGroup>
75-
<None Include="nano.runsettings" />
7672
<None Include="packages.config" />
7773
</ItemGroup>
7874
<ItemGroup>

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ steps:
4949
parameters:
5050
sonarCloudProject: 'nanoframework_lib-nanoFramework.System.Net.Http'
5151
runUnitTests: false
52-
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\HttpUnitTests\nano.runsettings'
52+
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
5353

5454
# package steps
5555
- template: azure-pipelines-templates/class-lib-package.yml@templates

nanoFramework.System.Net.Http.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "System.Net.Http.Server", "n
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B16B2D5D-9C42-4042-88E4-F85A52CFDCB4}"
1212
ProjectSection(SolutionItems) = preProject
13+
.runsettings = .runsettings
1314
nanoFramework.System.Net.Http.Client.nuspec = nanoFramework.System.Net.Http.Client.nuspec
1415
nanoFramework.System.Net.Http.nuspec = nanoFramework.System.Net.Http.nuspec
1516
nanoFramework.System.Net.Http.Server.nuspec = nanoFramework.System.Net.Http.Server.nuspec

0 commit comments

Comments
 (0)