Skip to content

Commit 37d0ee7

Browse files
nfbotnfbot
authored
release-v1.12.0
\r\n***PUBLISH_RELEASE***
2 parents 37764a4 + 81c414b commit 37d0ee7

File tree

81 files changed

+3152
-832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3152
-832
lines changed

‎Tests/NFUnitTestArithmetic/NFUnitTestArithmetic.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectCapability Include="TestContainer" />
55
</ItemGroup>
66
<PropertyGroup Label="Globals">
7-
<NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
7+
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
88
</PropertyGroup>
99
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
1010
<PropertyGroup>
@@ -44,7 +44,7 @@
4444
</ItemGroup>
4545
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
4646
<!-- MANUAL UPDATE HERE -->
47-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" />
47+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" />
4848
<ProjectExtensions>
4949
<ProjectCapabilities>
5050
<ProjectConfigurationsDeclaredAsItems />
@@ -54,6 +54,6 @@
5454
<PropertyGroup>
5555
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
5656
</PropertyGroup>
57-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
57+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
5858
</Target>
5959
</Project>

‎Tests/NFUnitTestArithmetic/UnitTestFormat.cs

+44-16
Original file line numberDiff line numberDiff line change
@@ -253,82 +253,110 @@ private void TestFormatInner(string valueStr, string formatString, string expect
253253
&& (numType == NumType.IntOnly || numType == NumType.All)
254254
)
255255
{
256-
CheckValue(SByte.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.SByte, rowData);
256+
CheckValue(sbyte.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.SByte, rowData);
257+
258+
Assert.True(sbyte.TryParse(valueStr, out sbyte result), $"TryParse failed for sbyte {valueStr}");
259+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.SByte, rowData);
257260
}
258261

259262
if (value <= Int16.MaxValue
260263
&& value >= Int16.MinValue
261264
&& (numType == NumType.IntOnly || numType == NumType.All)
262265
)
263266
{
264-
CheckValue(Int16.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int16, rowData);
267+
CheckValue(short.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int16, rowData);
268+
269+
Assert.True(short.TryParse(valueStr, out short result), $"TryParse failed for short {valueStr}");
270+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int16, rowData);
265271
}
266272

267273
if (value <= Int32.MaxValue
268274
&& value >= Int32.MinValue
269275
&& (numType == NumType.IntOnly || numType == NumType.All)
270276
)
271277
{
272-
CheckValue(Int32.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int32, rowData);
278+
CheckValue(int.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int32, rowData);
279+
280+
Assert.True(int.TryParse(valueStr, out int result), $"TryParse failed for int {valueStr}");
281+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int32, rowData);
273282
}
274283

275284
if (value <= Int64.MaxValue
276285
&& value >= Int64.MinValue
277286
&& (numType == NumType.IntOnly || numType == NumType.All)
278287
)
279288
{
280-
CheckValue(Int64.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int64, rowData);
289+
CheckValue(long.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int64, rowData);
290+
291+
Assert.True(long.TryParse(valueStr, out long result), $"TryParse failed for long {valueStr}");
292+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Int64, rowData);
281293
}
282294

283295
if (value <= Byte.MaxValue
284296
&& value >= Byte.MinValue
285297
&& (numType == NumType.IntOnly || numType == NumType.All)
286-
&& isNegative == false)
298+
&& !isNegative)
287299
{
288-
CheckValue(Byte.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Byte, rowData);
300+
CheckValue(byte.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Byte, rowData);
301+
302+
Assert.True(byte.TryParse(valueStr, out byte result), $"TryParse failed for byte {valueStr}");
303+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Byte, rowData);
289304
}
290305

291306
if (value <= UInt16.MaxValue
292307
&& value >= UInt16.MinValue
293308
&& (numType == NumType.IntOnly || numType == NumType.All)
294-
&& isNegative == false)
309+
&& !isNegative)
295310
{
296-
CheckValue(UInt16.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt16, rowData);
311+
CheckValue(ushort.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt16, rowData);
312+
313+
Assert.True(ushort.TryParse(valueStr, out ushort result), $"TryParse failed for ushort {valueStr}");
314+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt16, rowData);
297315
}
298316

299317
if (value <= UInt32.MaxValue
300318
&& value >= UInt32.MinValue
301319
&& (numType == NumType.IntOnly || numType == NumType.All)
302-
&& isNegative == false)
320+
&& !isNegative)
303321
{
304-
CheckValue(UInt32.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt32, rowData);
322+
CheckValue(uint.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt32, rowData);
323+
324+
Assert.True(uint.TryParse(valueStr, out uint result), $"TryParse failed for uint {valueStr}");
325+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt32, rowData);
305326
}
306327

307328
if (value <= UInt64.MaxValue
308329
&& value >= UInt64.MinValue
309330
&& (numType == NumType.IntOnly || numType == NumType.All)
310-
&& isNegative == false)
331+
&& !isNegative)
311332
{
312-
CheckValue(UInt64.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt64, rowData);
333+
CheckValue(ulong.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt64, rowData);
334+
335+
Assert.True(ulong.TryParse(valueStr, out ulong result), $"TryParse failed for ulong {valueStr}");
336+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.UInt64, rowData);
313337
}
314338

315339
if (value <= Single.MaxValue
316340
&& value >= Single.MinValue
317341
&& (numType == NumType.FloatDoubleOnly || numType == NumType.All)
318342
)
319343
{
320-
CheckValue(Single.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Single, rowData);
344+
CheckValue(float.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Single, rowData);
345+
346+
Assert.True(float.TryParse(valueStr, out float result), $"TryParse failed for float {valueStr}");
347+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Single, rowData);
321348
}
322349

323350
if (value <= Double.MaxValue
324351
&& value >= Double.MinValue
325352
&& (numType == NumType.FloatDoubleOnly || numType == NumType.All)
326353
)
327354
{
328-
CheckValue(Double.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Double, rowData);
329-
}
330-
355+
CheckValue(double.Parse(valueStr), valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Double, rowData);
331356

357+
Assert.True(double.TryParse(valueStr, out double result), $"TryParse failed for double {valueStr}");
358+
CheckValue(result, valueStr, formatString, expectedResult, SampleDisplay.ColumnType.Double, rowData);
359+
}
332360
}
333361

334362
private void CheckValue(object value, string valueStr, string formatString, string expectedResult, SampleDisplay.ColumnType columnType, SampleDisplay.RowData rowData)

‎Tests/NFUnitTestArray/NFUnitTestArray.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectCapability Include="TestContainer" />
55
</ItemGroup>
66
<PropertyGroup Label="Globals">
7-
<NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
7+
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
88
</PropertyGroup>
99
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
1010
<PropertyGroup>
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
4343
<!-- MANUAL UPDATE HERE -->
44-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" />
44+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" />
4545
<ProjectExtensions>
4646
<ProjectCapabilities>
4747
<ProjectConfigurationsDeclaredAsItems />
@@ -51,6 +51,6 @@
5151
<PropertyGroup>
5252
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
5353
</PropertyGroup>
54-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
54+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
5555
</Target>
5656
</Project>

‎Tests/NFUnitTestAttributes/NFUnitTestAttributes.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectCapability Include="TestContainer" />
55
</ItemGroup>
66
<PropertyGroup Label="Globals">
7-
<NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
7+
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
88
</PropertyGroup>
99
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
1010
<PropertyGroup>
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
4242
<!-- MANUAL UPDATE HERE -->
43-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" />
43+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" />
4444
<ProjectExtensions>
4545
<ProjectCapabilities>
4646
<ProjectConfigurationsDeclaredAsItems />
@@ -50,6 +50,6 @@
5050
<PropertyGroup>
5151
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
5252
</PropertyGroup>
53-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
53+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
5454
</Target>
5555
</Project>

‎Tests/NFUnitTestBasicConcepts/NFUnitTestBasicConcepts.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectCapability Include="TestContainer" />
55
</ItemGroup>
66
<PropertyGroup Label="Globals">
7-
<NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
7+
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
88
</PropertyGroup>
99
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
1010
<PropertyGroup>
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
4242
<!-- MANUAL UPDATE HERE -->
43-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" />
43+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" />
4444
<ProjectExtensions>
4545
<ProjectCapabilities>
4646
<ProjectConfigurationsDeclaredAsItems />
@@ -50,6 +50,6 @@
5050
<PropertyGroup>
5151
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
5252
</PropertyGroup>
53-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
53+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
5454
</Target>
5555
</Project>

‎Tests/NFUnitTestBitConverter/NFUnitTestBitConverter.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectCapability Include="TestContainer" />
55
</ItemGroup>
66
<PropertyGroup Label="Globals">
7-
<NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
7+
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
88
</PropertyGroup>
99
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
1010
<PropertyGroup>
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
4343
<!-- MANUAL UPDATE HERE -->
44-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" />
44+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" />
4545
<ProjectExtensions>
4646
<ProjectCapabilities>
4747
<ProjectConfigurationsDeclaredAsItems />
@@ -51,6 +51,6 @@
5151
<PropertyGroup>
5252
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
5353
</PropertyGroup>
54-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
54+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
5555
</Target>
5656
</Project>

‎Tests/NFUnitTestClasses/NFUnitTestClasses.nfproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectCapability Include="TestContainer" />
55
</ItemGroup>
66
<PropertyGroup Label="Globals">
7-
<NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
7+
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
88
</PropertyGroup>
99
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
1010
<PropertyGroup>
@@ -51,7 +51,7 @@
5151
</ItemGroup>
5252
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5353
<!-- MANUAL UPDATE HERE -->
54-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" />
54+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" />
5555
<ProjectExtensions>
5656
<ProjectCapabilities>
5757
<ProjectConfigurationsDeclaredAsItems />
@@ -61,6 +61,6 @@
6161
<PropertyGroup>
6262
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
6363
</PropertyGroup>
64-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.157\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
64+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.170\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
6565
</Target>
6666
</Project>

0 commit comments

Comments
 (0)