Skip to content

Commit bcbf646

Browse files
committed
Update TestFramework
***NO_CI***
1 parent 4a4b7e5 commit bcbf646

File tree

8 files changed

+27
-15
lines changed

8 files changed

+27
-15
lines changed

Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<Compile Include="Properties\AssemblyInfo.cs" />
3232
</ItemGroup>
3333
<ItemGroup>
34+
<None Include="app.config" />
3435
<None Include="nano.runsettings" />
3536
<None Include="packages.config" />
3637
</ItemGroup>
@@ -40,20 +41,20 @@
4041
<Private>True</Private>
4142
<SpecificVersion>True</SpecificVersion>
4243
</Reference>
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>
44+
<Reference Include="nanoFramework.TestFramework, Version=1.0.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.132\lib\nanoFramework.TestFramework.dll</HintPath>
4546
<Private>True</Private>
4647
<SpecificVersion>True</SpecificVersion>
4748
</Reference>
4849
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
49-
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.114\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
50+
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.132\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
5051
<Private>True</Private>
5152
<SpecificVersion>True</SpecificVersion>
5253
</Reference>
5354
</ItemGroup>
5455
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5556
<!-- MANUAL UPDATE HERE -->
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')" />
57+
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.132\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.132\build\nanoFramework.TestFramework.targets')" />
5758
<ProjectExtensions>
5859
<ProjectCapabilities>
5960
<ProjectConfigurationsDeclaredAsItems />
@@ -63,6 +64,6 @@
6364
<PropertyGroup>
6465
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
6566
</PropertyGroup>
66-
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.114\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
67+
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.132\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
6768
</Target>
6869
</Project>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="mscorlib" publicKeyToken="c07d481e9758c731" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.10.4.0" newVersion="1.10.4.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>
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.10.4-preview.11" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.TestFramework" version="1.0.114" targetFramework="netnanoframework10" developmentDependency="true" />
4+
<package id="nanoFramework.TestFramework" version="1.0.132" targetFramework="netnanoframework10" developmentDependency="true" />
55
</packages>

nanoFramework.CoreLibrary.NoReflection/CoreLibrary.NoReflection.nfproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@
397397
<None Include="..\nanoFramework.CoreLibrary\key.snk" />
398398
<None Include="packages.config" />
399399
</ItemGroup>
400-
<ItemGroup>
400+
<ItemGroup>
401401
<Folder Include="System\" />
402402
</ItemGroup>
403403
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
@@ -406,11 +406,11 @@
406406
<ProjectConfigurationsDeclaredAsItems />
407407
</ProjectCapabilities>
408408
</ProjectExtensions>
409-
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets')" />
409+
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" />
410410
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
411411
<PropertyGroup>
412412
<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>
413413
</PropertyGroup>
414-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets'))" />
414+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets'))" />
415415
</Target>
416-
</Project>
416+
</Project>

nanoFramework.CoreLibrary.NoReflection/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
44
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
55
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
6-
<package id="Nerdbank.GitVersioning" version="3.4.194" developmentDependency="true" targetFramework="netnanoframework10" />
6+
<package id="Nerdbank.GitVersioning" version="3.4.205" developmentDependency="true" targetFramework="netnanoframework10" />
77
</packages>

nanoFramework.CoreLibrary/CoreLibrary.nfproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,11 @@
398398
<ProjectConfigurationsDeclaredAsItems />
399399
</ProjectCapabilities>
400400
</ProjectExtensions>
401-
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets')" />
401+
<Import Project="..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" />
402402
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
403403
<PropertyGroup>
404404
<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>
405405
</PropertyGroup>
406-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets'))" />
406+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets'))" />
407407
</Target>
408408
</Project>

nanoFramework.CoreLibrary/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
44
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
55
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="netnanoframework10" developmentDependency="true" />
6-
<package id="Nerdbank.GitVersioning" version="3.4.194" developmentDependency="true" targetFramework="netnanoframework10" />
6+
<package id="Nerdbank.GitVersioning" version="3.4.205" developmentDependency="true" targetFramework="netnanoframework10" />
77
</packages>

0 commit comments

Comments
 (0)