Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Test Framework #128

Merged
merged 1 commit into from
Mar 25, 2021
Merged

Update Test Framework #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Tests/NFUnitTestAdpater/packages.config
View file
Open in desktop

This file was deleted.

0 Tests/NFUnitTestAdpater/DummyClass.cs → Tests/NFUnitTest_DummyAdapter/DummyClass.cs
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions ...UnitTestAdpater/NFUnitTestAdapater.nfproj → ...mmyAdapter/NFUnitTest_DummyAdapter.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.10.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.1-preview.11\lib\mscorlib.dll</HintPath>
<None Include="nano.runsettings" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.10.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.3-preview.7\lib\mscorlib.dll</HintPath>
<Private>True</Private>
<SpecificVersion>True</SpecificVersion>
</Reference>
<Reference Include="nanoFramework.TestFramework, Version=1.0.92.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.TestFramework.dll</HintPath>
<Reference Include="nanoFramework.TestFramework, Version=1.0.98.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.98\lib\nanoFramework.TestFramework.dll</HintPath>
<Private>True</Private>
<SpecificVersion>True</SpecificVersion>
</Reference>
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
<HintPath>..\..\packages\nanoFramework.TestFramework.1.0.98\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
<Private>True</Private>
<SpecificVersion>True</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="nano.runsettings" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
<!-- MANUAL UPDATE HERE -->
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.92\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.92\build\nanoFramework.TestFramework.targets')" />
<Import Project="..\..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets')" />
<ProjectExtensions>
<ProjectCapabilities>
<ProjectConfigurationsDeclaredAsItems />
Expand All @@ -63,6 +63,6 @@
<PropertyGroup>
<WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
</PropertyGroup>
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.92\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
<Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
</Target>
</Project>
0 ...nitTestAdpater/Properties/AssemblyInfo.cs → ...t_DummyAdapter/Properties/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 Tests/NFUnitTestAdpater/nano.runsettings → .../NFUnitTest_DummyAdapter/nano.runsettings
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions Tests/NFUnitTest_DummyAdapter/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.7" targetFramework="netnanoframework10" />
<package id="nanoFramework.TestFramework" version="1.0.98" targetFramework="netnanoframework10" developmentDependency="true" />
</packages>
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
parameters:
sonarCloudProject: 'nanoframework_lib-CoreLibrary'
runUnitTests: true
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\NFUnitTestAdpater\nano.runsettings'
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\NFUnitTest_DummyAdapter\nano.runsettings'

# package steps
- template: azure-pipelines-templates/class-lib-package.yml@templates
Expand Down
2 changes: 1 addition & 1 deletion nanoFramework.CoreLibrary.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TestFramework", "Tests\Test
EndProject
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TestFrameworkShared", "nanoFramework.TestFramework\source\TestFrameworkShared\TestFrameworkShared.shproj", "{55F048B5-6739-43C5-A93D-DB61DB8E912F}"
EndProject
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTestAdapater", "Tests\NFUnitTestAdpater\NFUnitTestAdapater.nfproj", "{396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}"
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTest_DummyAdapter", "Tests\NFUnitTest_DummyAdapter\NFUnitTest_DummyAdapter.nfproj", "{396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion nanoFramework.TestFramework
Open in desktop
Submodule nanoFramework.TestFramework updated 15 files
+1 −1 .github/workflows/update-dependencies.yml
+3 −0 .gitignore
+3 −3 azure-pipelines.yml
+0 −0 azure-pipelines/update-dependents.ps1
+9 −8 poc/TestOfTestFramework/NFUnitTest.nfproj
+2 −2 poc/TestOfTestFramework/packages.config
+7 −7 poc/TestOfTestFrameworkByReference/NFUnitTestByReference.nfproj
+2 −2 poc/TestOfTestFrameworkByReference/packages.config
+16 −2 source/TestAdapter/nanoFramework.TestAdapter.csproj
+2 −3 source/TestFramework/nanoFramework.TestFramework.nfproj
+1 −1 source/TestFramework/packages.config
+2 −3 source/UnitTestLauncher/nanoFramework.UnitTestLauncher.nfproj
+1 −1 source/UnitTestLauncher/packages.config
+1 −1 source/nanoFramework.TestFramework.targets
+5 −9 source/package.nuspec