Skip to content

Commit fad8a92

Browse files
josesimoesjosesimoes
authored
Update POC (#175)
***NO_CI***
1 parent ee77543 commit fad8a92

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

‎poc/TestOfTestFramework/NFUnitTest.nfproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2424
</PropertyGroup>
2525
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
26+
<PropertyGroup>
27+
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
28+
</PropertyGroup>
2629
<ItemGroup>
2730
<Compile Include="Test.cs" />
2831
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -32,13 +35,14 @@
3235
<HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
3336
</Reference>
3437
<Reference Include="nanoFramework.TestFramework">
35-
<HintPath>..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.TestFramework.dll</HintPath>
38+
<HintPath>..\packages\nanoFramework.TestFramework.2.0.57\lib\nanoFramework.TestFramework.dll</HintPath>
3639
</Reference>
3740
<Reference Include="nanoFramework.UnitTestLauncher">
38-
<HintPath>..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
41+
<HintPath>..\packages\nanoFramework.TestFramework.2.0.57\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
3942
</Reference>
4043
</ItemGroup>
4144
<ItemGroup>
45+
<None Include="nano.runsettings" />
4246
<None Include="packages.config" />
4347
</ItemGroup>
4448
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
@@ -48,11 +52,11 @@
4852
<ProjectConfigurationsDeclaredAsItems />
4953
</ProjectCapabilities>
5054
</ProjectExtensions>
51-
<Import Project="..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets')" />
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')" />
5256
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
5357
<PropertyGroup>
5458
<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>
5559
</PropertyGroup>
56-
<Error Condition="!Exists('..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\nanoFramework.TestFramework.2.0.43\build\nanoFramework.TestFramework.targets'))" />
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'))" />
5761
</Target>
5862
</Project>

‎poc/.runsettings‎ renamed to ‎poc/TestOfTestFramework/nano.runsettings‎

File renamed without changes.

‎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.43" targetFramework="netnano1.0" developmentDependency="true" />
4+
<package id="nanoFramework.TestFramework" version="2.0.57" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎poc/TestOfTestFrameworkByReference/NFUnitTestByReference.nfproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
55
</PropertyGroup>
66
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
7+
<ItemGroup>
8+
<ProjectCapability Include="TestContainer" />
9+
</ItemGroup>
710
<PropertyGroup>
811
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
912
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,7 +24,7 @@
2124
</PropertyGroup>
2225
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2326
<PropertyGroup>
24-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\.runsettings</RunSettingsFilePath>
27+
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
2528
</PropertyGroup>
2629
<ItemGroup>
2730
<Compile Include="DataRowTests.cs" />
@@ -35,15 +38,15 @@
3538
<ProjectReference Include="..\..\source\UnitTestLauncher\nanoFramework.UnitTestLauncher.nfproj" />
3639
</ItemGroup>
3740
<ItemGroup>
38-
<None Include=".runsettings" />
41+
<None Include="nano.runsettings" />
3942
<None Include="packages.config" />
4043
</ItemGroup>
4144
<ItemGroup>
4245
<Reference Include="mscorlib">
4346
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
4447
</Reference>
4548
<Reference Include="nanoFramework.Runtime.Native">
46-
<HintPath>..\..\packages\nanoFramework.Runtime.Native.1.5.4\lib\nanoFramework.Runtime.Native.dll</HintPath>
49+
<HintPath>..\packages\nanoFramework.Runtime.Native.1.5.4\lib\nanoFramework.Runtime.Native.dll</HintPath>
4750
</Reference>
4851
</ItemGroup>
4952
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />

‎poc/TestOfTestFrameworkByReference/.runsettings‎ renamed to ‎poc/TestOfTestFrameworkByReference/nano.runsettings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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</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>

‎poc/TestOfTestFrameworkByReference/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="netnanoframework10" />
4-
<package id="nanoFramework.Runtime.Native" version="1.5.4" targetFramework="netnanoframework10" />
4+
<package id="nanoFramework.Runtime.Native" version="1.5.4" targetFramework="netnano1.0" />
55
</packages>

0 commit comments

Comments
 (0)