Skip to content

Commit b2aac54

Browse files
josesimoesjosesimoes
committed
Rework test adapter project
- Fix target framework moniker. - Adjust nuspec accordingly. - Update runsettings in PoC project. - Remove unnecessary properties in project. - Update nanoFramework.Tools.Debugger.Net to v2.5.4. - Update Microsoft.TestPlatform.ObjectModel to v17.12.0.
1 parent ed9e540 commit b2aac54

File tree

4 files changed

+168
-25
lines changed

4 files changed

+168
-25
lines changed

‎poc/TestOfTestFrameworkByReference/nano.runsettings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<RunSettings>
33
<!-- Configurations that affect the Test Framework -->
44
<RunConfiguration>
@@ -8,7 +8,7 @@
88
<TargetFrameworkVersion>net48</TargetFrameworkVersion>
99
<TargetPlatform>x64</TargetPlatform>
1010
<!-- Comment the following line or adjust it if you want to test the TestAdapter. Path has to be absolute or relative to the build folder of the test dll -->
11-
<!-- <TestAdaptersPaths>E:\GitHub\nf-nanoFramework.TestFramework\source\TestAdapter\bin\Debug\net4.8;E:\GitHub\nf-nanoFramework.TestFramework\source\UnitTestLauncher\bin\Debug</TestAdaptersPaths> -->
11+
<!-- <TestAdaptersPaths>E:\GitHub\nf-nanoFramework.TestFramework\source\TestAdapter\bin\Debug\net48;E:\GitHub\nf-nanoFramework.TestFramework\source\UnitTestLauncher\bin\Debug</TestAdaptersPaths> -->
1212
</RunConfiguration>
1313
<nanoFrameworkAdapter>
1414
<Logging>None</Logging>

‎source/TestAdapter/nanoFramework.TestAdapter.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net4.8</TargetFramework>
4+
<TargetFrameworks>net48;net6.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
6+
<PlatformTarget>AnyCPU</PlatformTarget>
7+
<OutputType>Library</OutputType>
68
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
79
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
8-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
910
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
10-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1111
<LangVersion>8.0</LangVersion>
1212
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
1313
</PropertyGroup>
1414

1515
<ItemGroup>
1616
<PackageReference Include="CliWrap" Version="3.6.7" />
1717
<PackageReference Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
18-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.10.0" />
19-
<PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.5.3" />
18+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
19+
<PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.5.4" />
2020
<PackageReference Include="Nerdbank.GitVersioning">
2121
<Version>3.6.146</Version>
2222
<PrivateAssets>all</PrivateAssets>

‎source/TestAdapter/packages.lock.json

Lines changed: 157 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
},
2828
"Microsoft.TestPlatform.ObjectModel": {
2929
"type": "Direct",
30-
"requested": "[17.10.0, )",
31-
"resolved": "17.10.0",
32-
"contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==",
30+
"requested": "[17.12.0, )",
31+
"resolved": "17.12.0",
32+
"contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==",
3333
"dependencies": {
3434
"System.Reflection.Metadata": "1.6.0"
3535
}
3636
},
3737
"nanoFramework.Tools.Debugger.Net": {
3838
"type": "Direct",
39-
"requested": "[2.5.3, )",
40-
"resolved": "2.5.3",
41-
"contentHash": "j3w8QO2eupDVtxHEohlETSrQVTO5x1jZQAlgbW9VB15bYbniaeKZ+S55rwgGFeYQpEmNjgp1ArY5HkmD7AfVHw==",
39+
"requested": "[2.5.4, )",
40+
"resolved": "2.5.4",
41+
"contentHash": "5H4kqe8+CskYxKDpslfLmn7Z39SjkTT9NUHTRkO3d9oyplL1lLvR1YJkwaipNxveTfg78EziFMjsK7QLWo+WCg==",
4242
"dependencies": {
43-
"CommunityToolkit.Mvvm": "8.2.2",
43+
"CommunityToolkit.Mvvm": "7.1.2",
4444
"Polly": "7.2.4",
4545
"System.IO.Ports": "8.0.0"
4646
}
@@ -59,13 +59,12 @@
5959
},
6060
"CommunityToolkit.Mvvm": {
6161
"type": "Transitive",
62-
"resolved": "8.2.2",
63-
"contentHash": "r0g0k9tGYdrnz8R7T3x5UiokDffeevzK/2P/9SBL6fqLgN8B157MIi/bVUWI1KAz6ZorZrK9AdABCWUeXZZsvA==",
62+
"resolved": "7.1.2",
63+
"contentHash": "/zEpNH3FIBFY2iZRBi+S3Sia3q2yJgy1IQHnWRW7MdhQIe3IGcA1TGqJdbtjiJBmNy4v7kkPdNzgYlvvNDjXZg==",
6464
"dependencies": {
65-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
65+
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
6666
"System.ComponentModel.Annotations": "5.0.0",
67-
"System.Memory": "4.5.5",
68-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
67+
"System.Memory": "4.5.4"
6968
}
7069
},
7170
"Microsoft.Bcl.AsyncInterfaces": {
@@ -138,8 +137,8 @@
138137
},
139138
"System.Runtime.CompilerServices.Unsafe": {
140139
"type": "Transitive",
141-
"resolved": "6.0.0",
142-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
140+
"resolved": "4.5.3",
141+
"contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
143142
},
144143
"System.Security.AccessControl": {
145144
"type": "Transitive",
@@ -167,6 +166,150 @@
167166
"resolved": "4.5.0",
168167
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
169168
}
169+
},
170+
"net6.0": {
171+
"CliWrap": {
172+
"type": "Direct",
173+
"requested": "[3.6.7, )",
174+
"resolved": "3.6.7",
175+
"contentHash": "KYhA0OAGmNg22xI2OjkqG0zlgd61OCJOHYb+/uvSILriQNMQNmAjsRj7OqAh9dgltEuNpuPvN9+Y7pMBD/0NyQ=="
176+
},
177+
"ICSharpCode.Decompiler": {
178+
"type": "Direct",
179+
"requested": "[7.2.1.6856, )",
180+
"resolved": "7.2.1.6856",
181+
"contentHash": "0YtLSmDhFJb79+K4c/unBWT5ZHu9ov++k0gCfxIB6+uM/n5TEYjZMKSiEQDB6FeaeLPmduxB3SYxasLIDjuhEQ==",
182+
"dependencies": {
183+
"Microsoft.Win32.Registry": "5.0.0",
184+
"System.Collections.Immutable": "5.0.0",
185+
"System.Reflection.Metadata": "5.0.0"
186+
}
187+
},
188+
"Microsoft.TestPlatform.ObjectModel": {
189+
"type": "Direct",
190+
"requested": "[17.12.0, )",
191+
"resolved": "17.12.0",
192+
"contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==",
193+
"dependencies": {
194+
"System.Reflection.Metadata": "1.6.0"
195+
}
196+
},
197+
"nanoFramework.Tools.Debugger.Net": {
198+
"type": "Direct",
199+
"requested": "[2.5.4, )",
200+
"resolved": "2.5.4",
201+
"contentHash": "5H4kqe8+CskYxKDpslfLmn7Z39SjkTT9NUHTRkO3d9oyplL1lLvR1YJkwaipNxveTfg78EziFMjsK7QLWo+WCg==",
202+
"dependencies": {
203+
"CommunityToolkit.Mvvm": "7.1.2",
204+
"Polly": "7.2.4",
205+
"System.IO.Ports": "8.0.0"
206+
}
207+
},
208+
"Nerdbank.GitVersioning": {
209+
"type": "Direct",
210+
"requested": "[3.6.146, )",
211+
"resolved": "3.6.146",
212+
"contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
213+
},
214+
"Newtonsoft.Json": {
215+
"type": "Direct",
216+
"requested": "[13.0.3, )",
217+
"resolved": "13.0.3",
218+
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
219+
},
220+
"CommunityToolkit.Mvvm": {
221+
"type": "Transitive",
222+
"resolved": "7.1.2",
223+
"contentHash": "/zEpNH3FIBFY2iZRBi+S3Sia3q2yJgy1IQHnWRW7MdhQIe3IGcA1TGqJdbtjiJBmNy4v7kkPdNzgYlvvNDjXZg=="
224+
},
225+
"Microsoft.NETCore.Platforms": {
226+
"type": "Transitive",
227+
"resolved": "5.0.0",
228+
"contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ=="
229+
},
230+
"Microsoft.Win32.Registry": {
231+
"type": "Transitive",
232+
"resolved": "5.0.0",
233+
"contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
234+
"dependencies": {
235+
"System.Security.AccessControl": "5.0.0",
236+
"System.Security.Principal.Windows": "5.0.0"
237+
}
238+
},
239+
"Polly": {
240+
"type": "Transitive",
241+
"resolved": "7.2.4",
242+
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
243+
},
244+
"runtime.linux-arm.runtime.native.System.IO.Ports": {
245+
"type": "Transitive",
246+
"resolved": "8.0.0",
247+
"contentHash": "gK720fg6HemDg8sXcfy+xCMZ9+hF78Gc7BmREbmkS4noqlu1BAr9qZtuWGhLzFjBfgecmdtl4+SYVwJ1VneZBQ=="
248+
},
249+
"runtime.linux-arm64.runtime.native.System.IO.Ports": {
250+
"type": "Transitive",
251+
"resolved": "8.0.0",
252+
"contentHash": "KYG6/3ojhEWbb3FwQAKgGWPHrY+HKUXXdVjJlrtyCLn3EMcNTaNcPadb2c0ndQzixZSmAxZKopXJr0nLwhOrpQ=="
253+
},
254+
"runtime.linux-x64.runtime.native.System.IO.Ports": {
255+
"type": "Transitive",
256+
"resolved": "8.0.0",
257+
"contentHash": "Wnw5vhA4mgGbIFoo6l9Fk3iEcwRSq49a1aKwJgXUCUtEQLCSUDjTGSxqy/oMUuOyyn7uLHsH8KgZzQ1y3lReiQ=="
258+
},
259+
"runtime.native.System.IO.Ports": {
260+
"type": "Transitive",
261+
"resolved": "8.0.0",
262+
"contentHash": "Ee7Sz5llLpTgyKIWzKI/GeuRSbFkOABgJRY00SqTY0OkTYtkB+9l5rFZfE7fxPA3c22RfytCBYkUdAkcmwMjQg==",
263+
"dependencies": {
264+
"runtime.linux-arm.runtime.native.System.IO.Ports": "8.0.0",
265+
"runtime.linux-arm64.runtime.native.System.IO.Ports": "8.0.0",
266+
"runtime.linux-x64.runtime.native.System.IO.Ports": "8.0.0",
267+
"runtime.osx-arm64.runtime.native.System.IO.Ports": "8.0.0",
268+
"runtime.osx-x64.runtime.native.System.IO.Ports": "8.0.0"
269+
}
270+
},
271+
"runtime.osx-arm64.runtime.native.System.IO.Ports": {
272+
"type": "Transitive",
273+
"resolved": "8.0.0",
274+
"contentHash": "rbUBLAaFW9oVkbsb0+XSrAo2QdhBeAyzLl5KQ6Oci9L/u626uXGKInsVJG6B9Z5EO8bmplC8tsMiaHK8wOBZ+w=="
275+
},
276+
"runtime.osx-x64.runtime.native.System.IO.Ports": {
277+
"type": "Transitive",
278+
"resolved": "8.0.0",
279+
"contentHash": "IcfB4jKtM9pkzP9OpYelEcUX1MiDt0IJPBh3XYYdEISFF+6Mc+T8WWi0dr9wVh1gtcdVjubVEIBgB8BHESlGfQ=="
280+
},
281+
"System.Collections.Immutable": {
282+
"type": "Transitive",
283+
"resolved": "5.0.0",
284+
"contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g=="
285+
},
286+
"System.IO.Ports": {
287+
"type": "Transitive",
288+
"resolved": "8.0.0",
289+
"contentHash": "MaiPbx2/QXZc62gm/DrajRrGPG1lU4m08GWMoWiymPYM+ba4kfACp2PbiYpqJ4QiFGhHD00zX3RoVDTucjWe9g==",
290+
"dependencies": {
291+
"runtime.native.System.IO.Ports": "8.0.0"
292+
}
293+
},
294+
"System.Reflection.Metadata": {
295+
"type": "Transitive",
296+
"resolved": "5.0.0",
297+
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
298+
},
299+
"System.Security.AccessControl": {
300+
"type": "Transitive",
301+
"resolved": "5.0.0",
302+
"contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
303+
"dependencies": {
304+
"Microsoft.NETCore.Platforms": "5.0.0",
305+
"System.Security.Principal.Windows": "5.0.0"
306+
}
307+
},
308+
"System.Security.Principal.Windows": {
309+
"type": "Transitive",
310+
"resolved": "5.0.0",
311+
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
312+
}
170313
}
171314
}
172315
}

‎source/package.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
</packageTypes>
2323
</metadata>
2424
<files>
25-
<file src="TestAdapter\bin\Release\net4.8\*.dll" target="lib/net48" />
26-
<file src="TestAdapter\bin\Release\net4.8\*.config" target="lib/net48" />
25+
<file src="TestAdapter\bin\Release\net48\*.dll" target="lib/net48" />
26+
<file src="TestAdapter\bin\Release\net48\*.config" target="lib/net48" />
2727
<file src="UnitTestLauncher\bin\Release\nanoFramework.TestFramework.*" target="lib" />
2828
<file src="UnitTestLauncher\bin\Release\nanoFramework.UnitTestLauncher.*" target="lib" />
2929
<file src="runsettings\nano.runsettings" target="content" />
3030
<file src="..\README.md" target="docs\" />
3131
<file src="..\assets\nf-logo.png" target="images" />
3232
<file src="..\LICENSE.md" target="" />
3333
</files>
34-
</package>
34+
</package>

0 commit comments

Comments
 (0)