Skip to content

Commit ae4b543

Browse files
authored
Update TestFramework (#139)
***NO_CI***
1 parent b554394 commit ae4b543

File tree

5 files changed

+23
-10
lines changed

5 files changed

+23
-10
lines changed

Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@
3535
<None Include="packages.config" />
3636
</ItemGroup>
3737
<ItemGroup>
38-
<Reference Include="mscorlib, Version=1.10.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
39-
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.3-preview.7\lib\mscorlib.dll</HintPath>
38+
<Reference Include="mscorlib, Version=1.10.4.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
39+
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.4-preview.11\lib\mscorlib.dll</HintPath>
4040
<Private>True</Private>
4141
<SpecificVersion>True</SpecificVersion>
4242
</Reference>
43-
<Reference Include="nanoFramework.TestFramework, Version=1.0.110.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
44-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.110\lib\nanoFramework.TestFramework.dll</HintPath>
43+
<Reference Include="nanoFramework.TestFramework, Version=1.0.114.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
44+
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.114\lib\nanoFramework.TestFramework.dll</HintPath>
4545
<Private>True</Private>
4646
<SpecificVersion>True</SpecificVersion>
4747
</Reference>
4848
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
49-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.110\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
49+
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.114\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
5050
<Private>True</Private>
5151
<SpecificVersion>True</SpecificVersion>
5252
</Reference>
5353
</ItemGroup>
5454
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5555
<!-- MANUAL UPDATE HERE -->
56-
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets')" />
56+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.114\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.114\build\nanoFramework.TestFramework.targets')" />
5757
<ProjectExtensions>
5858
<ProjectCapabilities>
5959
<ProjectConfigurationsDeclaredAsItems />
@@ -63,6 +63,6 @@
6363
<PropertyGroup>
6464
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
6565
</PropertyGroup>
66-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
66+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.114\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
6767
</Target>
6868
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.7" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.TestFramework" version="1.0.110" targetFramework="netnanoframework10" developmentDependency="true" />
3+
<package id="nanoFramework.CoreLibrary" version="1.10.4-preview.11" targetFramework="netnanoframework10" />
4+
<package id="nanoFramework.TestFramework" version="1.0.114" targetFramework="netnanoframework10" developmentDependency="true" />
55
</packages>

Tests/UnitTestLauncher/UnitTestLauncher.nfproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616
<AssemblyName>UnitTestLauncher</AssemblyName>
1717
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1818
</PropertyGroup>
19+
<PropertyGroup>
20+
<SignAssembly>true</SignAssembly>
21+
</PropertyGroup>
22+
<PropertyGroup>
23+
<AssemblyOriginatorKeyFile>..\..\nanoFramework.CoreLibrary\key.snk</AssemblyOriginatorKeyFile>
24+
</PropertyGroup>
25+
<PropertyGroup>
26+
<DelaySign>false</DelaySign>
27+
</PropertyGroup>
1928
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2029
<ItemGroup>
2130
<Compile Include="..\..\nanoFramework.TestFramework\source\UnitTestLauncher\Program.cs" />
@@ -25,6 +34,9 @@
2534
<ProjectReference Include="..\..\nanoFramework.CoreLibrary\CoreLibrary.nfproj" />
2635
<ProjectReference Include="..\TestFramework\TestFramework.nfproj" />
2736
</ItemGroup>
37+
<ItemGroup>
38+
<None Include="..\nanoFramework.CoreLibrary\key.snk" />
39+
</ItemGroup>
2840
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
2941
<ProjectExtensions>
3042
<ProjectCapabilities>

nanoFramework.CoreLibrary/Friends.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("nanoFramework.System.Text, PublicKey=00240000048000009400000006020000002400005253413100040000010001001120aa3e809b3da4f65e1b1f65c0a3a1bf6335c39860ca41acb3c48de278c6b63c5df38239ec1f2e32d58cb897c8c174a5f8e78a9c0b6087d3aef373d7d0f3d9be67700fc2a5a38de1fb71b5b6f6046d841ff35abee2e0b0840a6291a312be184eb311baff5fef0ff6895b9a5f2253aed32fb06b819134f6bb9d531488a87ea2")]
1212
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("nanoFramework.UnitTestLauncher, PublicKey=00240000048000009400000006020000002400005253413100040000010001001120aa3e809b3da4f65e1b1f65c0a3a1bf6335c39860ca41acb3c48de278c6b63c5df38239ec1f2e32d58cb897c8c174a5f8e78a9c0b6087d3aef373d7d0f3d9be67700fc2a5a38de1fb71b5b6f6046d841ff35abee2e0b0840a6291a312be184eb311baff5fef0ff6895b9a5f2253aed32fb06b819134f6bb9d531488a87ea2")]
1313
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("nanoFramework.Logging, PublicKey=00240000048000009400000006020000002400005253413100040000010001001120aa3e809b3da4f65e1b1f65c0a3a1bf6335c39860ca41acb3c48de278c6b63c5df38239ec1f2e32d58cb897c8c174a5f8e78a9c0b6087d3aef373d7d0f3d9be67700fc2a5a38de1fb71b5b6f6046d841ff35abee2e0b0840a6291a312be184eb311baff5fef0ff6895b9a5f2253aed32fb06b819134f6bb9d531488a87ea2")]
14+
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTestLauncher, PublicKey=00240000048000009400000006020000002400005253413100040000010001001120aa3e809b3da4f65e1b1f65c0a3a1bf6335c39860ca41acb3c48de278c6b63c5df38239ec1f2e32d58cb897c8c174a5f8e78a9c0b6087d3aef373d7d0f3d9be67700fc2a5a38de1fb71b5b6f6046d841ff35abee2e0b0840a6291a312be184eb311baff5fef0ff6895b9a5f2253aed32fb06b819134f6bb9d531488a87ea2")]

0 commit comments

Comments
 (0)