From b8cbc5c65543af08ca0769e8c0bdbb77b01263fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Wed, 24 Mar 2021 22:03:55 +0000 Subject: [PATCH] Update Test Framework - Update sub-module. - Rename dummy test adapter project to make it clear the intention. --- Tests/NFUnitTestAdpater/packages.config | 5 ----- .../DummyClass.cs | 0 .../NFUnitTest_DummyAdapter.nfproj} | 22 +++++++++---------- .../Properties/AssemblyInfo.cs | 0 .../nano.runsettings | 0 Tests/NFUnitTest_DummyAdapter/packages.config | 5 +++++ azure-pipelines.yml | 2 +- nanoFramework.CoreLibrary.sln | 2 +- nanoFramework.TestFramework | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 Tests/NFUnitTestAdpater/packages.config rename Tests/{NFUnitTestAdpater => NFUnitTest_DummyAdapter}/DummyClass.cs (100%) rename Tests/{NFUnitTestAdpater/NFUnitTestAdapater.nfproj => NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj} (86%) rename Tests/{NFUnitTestAdpater => NFUnitTest_DummyAdapter}/Properties/AssemblyInfo.cs (100%) rename Tests/{NFUnitTestAdpater => NFUnitTest_DummyAdapter}/nano.runsettings (100%) create mode 100644 Tests/NFUnitTest_DummyAdapter/packages.config diff --git a/Tests/NFUnitTestAdpater/packages.config b/Tests/NFUnitTestAdpater/packages.config deleted file mode 100644 index 7e0e1e84..00000000 --- a/Tests/NFUnitTestAdpater/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Tests/NFUnitTestAdpater/DummyClass.cs b/Tests/NFUnitTest_DummyAdapter/DummyClass.cs similarity index 100% rename from Tests/NFUnitTestAdpater/DummyClass.cs rename to Tests/NFUnitTest_DummyAdapter/DummyClass.cs diff --git a/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj b/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj similarity index 86% rename from Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj rename to Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj index a110c6a6..8424376f 100644 --- a/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj +++ b/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj @@ -31,29 +31,29 @@ - - ..\..\packages\nanoFramework.CoreLibrary.1.10.1-preview.11\lib\mscorlib.dll + + + + + + ..\..\packages\nanoFramework.CoreLibrary.1.10.3-preview.7\lib\mscorlib.dll True True - - ..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.TestFramework.dll + + ..\..\packages\nanoFramework.TestFramework.1.0.98\lib\nanoFramework.TestFramework.dll True True - ..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.UnitTestLauncher.exe + ..\..\packages\nanoFramework.TestFramework.1.0.98\lib\nanoFramework.UnitTestLauncher.exe True True - - - - - + @@ -63,6 +63,6 @@ Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder. - + \ No newline at end of file diff --git a/Tests/NFUnitTestAdpater/Properties/AssemblyInfo.cs b/Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs similarity index 100% rename from Tests/NFUnitTestAdpater/Properties/AssemblyInfo.cs rename to Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs diff --git a/Tests/NFUnitTestAdpater/nano.runsettings b/Tests/NFUnitTest_DummyAdapter/nano.runsettings similarity index 100% rename from Tests/NFUnitTestAdpater/nano.runsettings rename to Tests/NFUnitTest_DummyAdapter/nano.runsettings diff --git a/Tests/NFUnitTest_DummyAdapter/packages.config b/Tests/NFUnitTest_DummyAdapter/packages.config new file mode 100644 index 00000000..5364f4bf --- /dev/null +++ b/Tests/NFUnitTest_DummyAdapter/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f84e9fcb..6adf9a67 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 diff --git a/nanoFramework.CoreLibrary.sln b/nanoFramework.CoreLibrary.sln index 0f93e422..ff188880 100644 --- a/nanoFramework.CoreLibrary.sln +++ b/nanoFramework.CoreLibrary.sln @@ -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 diff --git a/nanoFramework.TestFramework b/nanoFramework.TestFramework index 56156e46..53619c38 160000 --- a/nanoFramework.TestFramework +++ b/nanoFramework.TestFramework @@ -1 +1 @@ -Subproject commit 56156e464c2b2b7bf717e4ae5f372c7aedc08812 +Subproject commit 53619c38bf6ec0e87b8bd19c71b9ab3fddc7d083