Skip to content

Commit ac2b71c

Browse files
josesimoesjosesimoes
authored
Improvements in Test Adapter (#192)
1 parent 7dc9977 commit ac2b71c

File tree

2 files changed

+200
-3
lines changed

2 files changed

+200
-3
lines changed

‎source/TestAdapter/nanoFramework.TestAdapter.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
77
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
8+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
9+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
810
</PropertyGroup>
911

1012
<ItemGroup>
1113
<PackageReference Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
1214
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.3.2" />
1315
<PackageReference Include="nanoFramework.nanoCLR.Win32" GeneratePathProperty="true">
14-
<Version>1.8.0.570</Version>
16+
<Version>1.8.0.751</Version>
1517
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1618
<PrivateAssets>all</PrivateAssets>
1719
</PackageReference>
@@ -39,8 +41,8 @@
3941

4042
<!-- need this here to make sure the latest version of WIN32 nanoCLR is used in Azure Pipeline builds -->
4143
<Target Name="SetNanoCLRLocation_AzurePipeline" AfterTargets="Build" Condition="'$(TF_BUILD)' == 'True'">
42-
<Copy SourceFiles="$(PkgnanoFramework_nanoCLR_Win32)\lib\net48\nanoFramework.nanoCLR.exe" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="false" />
43-
<Copy SourceFiles="$(PkgnanoFramework_nanoCLR_Win32)\tools\vcruntime140.dll" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="false" />
44+
<Copy SourceFiles="$(PkgnanoFramework_nanoCLR_Win32)\lib\net48\nanoFramework.nanoCLR.exe" DestinationFolder="$(TargetDir)" />
45+
<Copy SourceFiles="$(PkgnanoFramework_nanoCLR_Win32)\tools\vcruntime140.dll" DestinationFolder="$(TargetDir)" />
4446
</Target>
4547

4648
</Project>

‎source/TestAdapter/packages.lock.json‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
".NETFramework,Version=v4.8": {
5+
"ICSharpCode.Decompiler": {
6+
"type": "Direct",
7+
"requested": "[7.2.1.6856, )",
8+
"resolved": "7.2.1.6856",
9+
"contentHash": "0YtLSmDhFJb79+K4c/unBWT5ZHu9ov++k0gCfxIB6+uM/n5TEYjZMKSiEQDB6FeaeLPmduxB3SYxasLIDjuhEQ==",
10+
"dependencies": {
11+
"Microsoft.Win32.Registry": "5.0.0",
12+
"System.Collections.Immutable": "5.0.0",
13+
"System.Reflection.Metadata": "5.0.0"
14+
}
15+
},
16+
"Microsoft.TestPlatform.ObjectModel": {
17+
"type": "Direct",
18+
"requested": "[17.3.2, )",
19+
"resolved": "17.3.2",
20+
"contentHash": "DJEIfSA2GDC+2m42vKGNR2hm+Uhta4SpCsLZVVvYIiYMjxtk7GzNnv82qvE4SCW3kIYllMg2D0rr8juuj/f7AA==",
21+
"dependencies": {
22+
"NuGet.Frameworks": "5.11.0",
23+
"System.Reflection.Metadata": "1.6.0"
24+
}
25+
},
26+
"nanoFramework.nanoCLR.Win32": {
27+
"type": "Direct",
28+
"requested": "[1.8.0.751, )",
29+
"resolved": "1.8.0.751",
30+
"contentHash": "fyT81Ee1KUQiqpFtotFt0s+X5Zh5HKpWKM+BokoBU7lbLG+kt0/8b4oetlyafrs97Vt+uF2LXb6bLwZvmhV7SA=="
31+
},
32+
"nanoFramework.Tools.Debugger.Net": {
33+
"type": "Direct",
34+
"requested": "[2.4.3, )",
35+
"resolved": "2.4.3",
36+
"contentHash": "pVnNQwU07et8vFi0baqj3SPt6KdVDT64Pe8e1BnAteXfQbC1p5Lobh+yz8MXyox5ZB0RIlowTRTyye5WxD8l1g==",
37+
"dependencies": {
38+
"Microsoft.Extensions.Options.DataAnnotations": "6.0.0",
39+
"Polly": "7.2.3",
40+
"PropertyChanged.Fody": "2.6.1",
41+
"System.IO.Ports": "6.0.0"
42+
}
43+
},
44+
"Nerdbank.GitVersioning": {
45+
"type": "Direct",
46+
"requested": "[3.5.119, )",
47+
"resolved": "3.5.119",
48+
"contentHash": "x8k4zV6YKZA5Rr810439lG9NngdbyPtFv0QpIYz32m1Im59kvSbEHO8gKGZoNvsfZSquayjEDUCa8acbut372g=="
49+
},
50+
"Fody": {
51+
"type": "Transitive",
52+
"resolved": "4.2.1",
53+
"contentHash": "46t+e1eESclH4TkfqUEYAgZ1+ZbXSFS7GqSKvtcw6u2yT05heDKdzj1r3YA/6FCZM4uB4z7qRW9V+gBsCilonQ=="
54+
},
55+
"Microsoft.Bcl.AsyncInterfaces": {
56+
"type": "Transitive",
57+
"resolved": "6.0.0",
58+
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
59+
"dependencies": {
60+
"System.Threading.Tasks.Extensions": "4.5.4"
61+
}
62+
},
63+
"Microsoft.Extensions.DependencyInjection.Abstractions": {
64+
"type": "Transitive",
65+
"resolved": "6.0.0",
66+
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==",
67+
"dependencies": {
68+
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
69+
"System.Threading.Tasks.Extensions": "4.5.4"
70+
}
71+
},
72+
"Microsoft.Extensions.Options": {
73+
"type": "Transitive",
74+
"resolved": "6.0.0",
75+
"contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
76+
"dependencies": {
77+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
78+
"Microsoft.Extensions.Primitives": "6.0.0"
79+
}
80+
},
81+
"Microsoft.Extensions.Options.DataAnnotations": {
82+
"type": "Transitive",
83+
"resolved": "6.0.0",
84+
"contentHash": "Fvs4plZYQT/iF/JsYwP/pppQRvQC211enBjCoIu/355M+aunlzSyzN/n3wPibyY76794MFLkLVT47JCBc3porg==",
85+
"dependencies": {
86+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
87+
"Microsoft.Extensions.Options": "6.0.0"
88+
}
89+
},
90+
"Microsoft.Extensions.Primitives": {
91+
"type": "Transitive",
92+
"resolved": "6.0.0",
93+
"contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==",
94+
"dependencies": {
95+
"System.Memory": "4.5.4",
96+
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
97+
}
98+
},
99+
"Microsoft.Win32.Registry": {
100+
"type": "Transitive",
101+
"resolved": "5.0.0",
102+
"contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
103+
"dependencies": {
104+
"System.Security.AccessControl": "5.0.0",
105+
"System.Security.Principal.Windows": "5.0.0"
106+
}
107+
},
108+
"NuGet.Frameworks": {
109+
"type": "Transitive",
110+
"resolved": "5.11.0",
111+
"contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q=="
112+
},
113+
"Polly": {
114+
"type": "Transitive",
115+
"resolved": "7.2.3",
116+
"contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
117+
},
118+
"PropertyChanged.Fody": {
119+
"type": "Transitive",
120+
"resolved": "2.6.1",
121+
"contentHash": "dCMGDjA7ahlpCIfvPxwXB6KIIeYtc2qALk69p22HQwgzKJQG25l87l5skk5ZBV5/B/z3dQZBVZkdJZbvtEXuAg==",
122+
"dependencies": {
123+
"Fody": "4.2.1"
124+
}
125+
},
126+
"System.Buffers": {
127+
"type": "Transitive",
128+
"resolved": "4.5.1",
129+
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
130+
},
131+
"System.Collections.Immutable": {
132+
"type": "Transitive",
133+
"resolved": "5.0.0",
134+
"contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==",
135+
"dependencies": {
136+
"System.Memory": "4.5.4"
137+
}
138+
},
139+
"System.IO.Ports": {
140+
"type": "Transitive",
141+
"resolved": "6.0.0",
142+
"contentHash": "dRyGI7fUESar5ZLIpiBOaaNLW7YyOBGftjj5Of+xcduC/Rjl7RjhEnWDvvNBmHuF3d0tdXoqdVI/yrVA8f00XA=="
143+
},
144+
"System.Memory": {
145+
"type": "Transitive",
146+
"resolved": "4.5.4",
147+
"contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
148+
"dependencies": {
149+
"System.Buffers": "4.5.1",
150+
"System.Numerics.Vectors": "4.5.0",
151+
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
152+
}
153+
},
154+
"System.Numerics.Vectors": {
155+
"type": "Transitive",
156+
"resolved": "4.5.0",
157+
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
158+
},
159+
"System.Reflection.Metadata": {
160+
"type": "Transitive",
161+
"resolved": "5.0.0",
162+
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==",
163+
"dependencies": {
164+
"System.Collections.Immutable": "5.0.0"
165+
}
166+
},
167+
"System.Runtime.CompilerServices.Unsafe": {
168+
"type": "Transitive",
169+
"resolved": "6.0.0",
170+
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
171+
},
172+
"System.Security.AccessControl": {
173+
"type": "Transitive",
174+
"resolved": "5.0.0",
175+
"contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
176+
"dependencies": {
177+
"System.Security.Principal.Windows": "5.0.0"
178+
}
179+
},
180+
"System.Security.Principal.Windows": {
181+
"type": "Transitive",
182+
"resolved": "5.0.0",
183+
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
184+
},
185+
"System.Threading.Tasks.Extensions": {
186+
"type": "Transitive",
187+
"resolved": "4.5.4",
188+
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
189+
"dependencies": {
190+
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
191+
}
192+
}
193+
}
194+
}
195+
}

0 commit comments

Comments
 (0)