Skip to content

Commit 79a42f2

Browse files
josesimoesjosesimoes
committed
Work on POC solutions
- Update reference to Test nuget. - Improve Test of Test byref: adding test adapter to the build allows full testing and running unit tests in VS. ***NO_CI***
1 parent 03ed6b1 commit 79a42f2

File tree

5 files changed

+30
-7
lines changed

5 files changed

+30
-7
lines changed

‎poc/NFUnit Test DemoByReference.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 17.3.32929.385
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTestByReference", "TestOfTestFrameworkByReference\NFUnitTestByReference.nfproj", "{FBD29C49-D7DC-425E-BAD1-1AE63484A6CD}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91} = {F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}
9+
EndProjectSection
710
EndProject
811
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "nanoFramework.TestFramework", "..\source\TestFramework\nanoFramework.TestFramework.nfproj", "{D66A7774-AFAB-466B-9CFB-3485B02F4AF4}"
912
EndProject
1013
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFrameworkShared", "..\source\TestFrameworkShared\TestFrameworkShared.shproj", "{55F048B5-6739-43C5-A93D-DB61DB8E912F}"
1114
EndProject
1215
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "nanoFramework.UnitTestLauncher", "..\source\UnitTestLauncher\nanoFramework.UnitTestLauncher.nfproj", "{897FC4EA-823D-4343-8CC6-B6F28C3FF91E}"
1316
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoFramework.TestAdapter", "..\source\TestAdapter\nanoFramework.TestAdapter.csproj", "{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}"
18+
EndProject
1419
Global
1520
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1621
Debug|Any CPU = Debug|Any CPU
@@ -35,6 +40,10 @@ Global
3540
{897FC4EA-823D-4343-8CC6-B6F28C3FF91E}.Release|Any CPU.ActiveCfg = Release|Any CPU
3641
{897FC4EA-823D-4343-8CC6-B6F28C3FF91E}.Release|Any CPU.Build.0 = Release|Any CPU
3742
{897FC4EA-823D-4343-8CC6-B6F28C3FF91E}.Release|Any CPU.Deploy.0 = Release|Any CPU
43+
{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44+
{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Debug|Any CPU.Build.0 = Debug|Any CPU
45+
{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Release|Any CPU.ActiveCfg = Release|Any CPU
46+
{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Release|Any CPU.Build.0 = Release|Any CPU
3847
EndGlobalSection
3948
GlobalSection(SolutionProperties) = preSolution
4049
HideSolutionNode = FALSE
@@ -44,5 +53,6 @@ Global
4453
EndGlobalSection
4554
GlobalSection(SharedMSBuildProjectFiles) = preSolution
4655
..\source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13
56+
..\source\TestFrameworkShared\TestFrameworkShared.projitems*{f967dd1c-f1e4-4fe0-afcd-15544ced3b91}*SharedItemsImports = 5
4757
EndGlobalSection
4858
EndGlobal

‎poc/TestOfTestFramework/NFUnitTest.nfproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
<HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
3636
</Reference>
3737
<Reference Include="nanoFramework.TestFramework">
38-
<HintPath>..\packages\nanoFramework.TestFramework.2.0.57\lib\nanoFramework.TestFramework.dll</HintPath>
38+
<HintPath>..\packages\nanoFramework.TestFramework.2.0.60\lib\nanoFramework.TestFramework.dll</HintPath>
3939
</Reference>
4040
<Reference Include="nanoFramework.UnitTestLauncher">
41-
<HintPath>..\packages\nanoFramework.TestFramework.2.0.57\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
41+
<HintPath>..\packages\nanoFramework.TestFramework.2.0.60\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4242
</Reference>
4343
</ItemGroup>
4444
<ItemGroup>
@@ -52,11 +52,11 @@
5252
<ProjectConfigurationsDeclaredAsItems />
5353
</ProjectCapabilities>
5454
</ProjectExtensions>
55-
<Import Project="..\packages\nanoFramework.TestFramework.2.0.57\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.2.0.57\build\nanoFramework.TestFramework.targets')" />
55+
<Import Project="..\packages\nanoFramework.TestFramework.2.0.60\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.2.0.60\build\nanoFramework.TestFramework.targets')" />
5656
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
5757
<PropertyGroup>
5858
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
5959
</PropertyGroup>
60-
<Error Condition="!Exists('..\packages\nanoFramework.TestFramework.2.0.57\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\nanoFramework.TestFramework.2.0.57\build\nanoFramework.TestFramework.targets'))" />
60+
<Error Condition="!Exists('..\packages\nanoFramework.TestFramework.2.0.60\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\nanoFramework.TestFramework.2.0.60\build\nanoFramework.TestFramework.targets'))" />
6161
</Target>
6262
</Project>

‎poc/TestOfTestFramework/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.TestFramework" version="2.0.57" targetFramework="netnano1.0" developmentDependency="true" />
4+
<package id="nanoFramework.TestFramework" version="2.0.60" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎poc/TestOfTestFrameworkByReference/NFUnitTestByReference.nfproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,19 @@
4949
<HintPath>..\packages\nanoFramework.Runtime.Native.1.5.4\lib\nanoFramework.Runtime.Native.dll</HintPath>
5050
</Reference>
5151
</ItemGroup>
52+
<Target Name="CopyTestAdapter" AfterTargets="Build">
53+
<Message Text="Copying TestAdapter" Importance="High" />
54+
<ItemGroup>
55+
<!-- Because this ItemGroup is inside the target, this will enumerate
56+
all files just before calling Copy. If the ItemGroup were outside
57+
the target , it would enumerate the files during evaluation, before
58+
the build starts, which may miss files created during the build. -->
59+
<TestAdapterFiles Include="$(SolutionDir)..\source\TestAdapter\bin\Debug\net4.8\*"/>
60+
</ItemGroup>
61+
<Copy
62+
SourceFiles="@(TestAdapterFiles)"
63+
DestinationFolder="$(TargetDir)" />
64+
</Target>
5265
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5366
<ProjectExtensions>
5467
<ProjectCapabilities>

‎poc/TestOfTestFrameworkByReference/nano.runsettings‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
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\net4.8;E:\GitHub\nf-nanoFramework.TestFramework\source\UnitTestLauncher\bin\Debug</TestAdaptersPaths> -->
1212
</RunConfiguration>
1313
<nanoFrameworkAdapter>
1414
<Logging>None</Logging>
15-
<IsRealHardware>True</IsRealHardware>
15+
<IsRealHardware>False</IsRealHardware>
1616
</nanoFrameworkAdapter>
1717
</RunSettings>

0 commit comments

Comments
 (0)