diff --git a/Tests/NFUnitTestArithmetic/NFUnitTestArithmetic.nfproj b/Tests/NFUnitTestArithmetic/NFUnitTestArithmetic.nfproj
index 51da889c..68c20724 100644
--- a/Tests/NFUnitTestArithmetic/NFUnitTestArithmetic.nfproj
+++ b/Tests/NFUnitTestArithmetic/NFUnitTestArithmetic.nfproj
@@ -37,17 +37,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestArray/NFUnitTestArray.nfproj b/Tests/NFUnitTestArray/NFUnitTestArray.nfproj
index 245da723..b286f819 100644
--- a/Tests/NFUnitTestArray/NFUnitTestArray.nfproj
+++ b/Tests/NFUnitTestArray/NFUnitTestArray.nfproj
@@ -34,17 +34,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestAttributes/NFUnitTestAttributes.nfproj b/Tests/NFUnitTestAttributes/NFUnitTestAttributes.nfproj
index 6d102acb..94b39570 100644
--- a/Tests/NFUnitTestAttributes/NFUnitTestAttributes.nfproj
+++ b/Tests/NFUnitTestAttributes/NFUnitTestAttributes.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestBasicConcepts/NFUnitTestBasicConcepts.nfproj b/Tests/NFUnitTestBasicConcepts/NFUnitTestBasicConcepts.nfproj
index 318a10c7..42821daa 100644
--- a/Tests/NFUnitTestBasicConcepts/NFUnitTestBasicConcepts.nfproj
+++ b/Tests/NFUnitTestBasicConcepts/NFUnitTestBasicConcepts.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestBitConverter/NFUnitTestBitConverter.nfproj b/Tests/NFUnitTestBitConverter/NFUnitTestBitConverter.nfproj
index f331e43d..c0fcda23 100644
--- a/Tests/NFUnitTestBitConverter/NFUnitTestBitConverter.nfproj
+++ b/Tests/NFUnitTestBitConverter/NFUnitTestBitConverter.nfproj
@@ -34,17 +34,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestClasses/NFUnitTestClasses.nfproj b/Tests/NFUnitTestClasses/NFUnitTestClasses.nfproj
index 8597d268..ea326cb8 100644
--- a/Tests/NFUnitTestClasses/NFUnitTestClasses.nfproj
+++ b/Tests/NFUnitTestClasses/NFUnitTestClasses.nfproj
@@ -44,17 +44,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestConversions/NFUnitTestConversions.nfproj b/Tests/NFUnitTestConversions/NFUnitTestConversions.nfproj
index f038ee9c..d9330933 100644
--- a/Tests/NFUnitTestConversions/NFUnitTestConversions.nfproj
+++ b/Tests/NFUnitTestConversions/NFUnitTestConversions.nfproj
@@ -35,17 +35,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestDelegates/NFUnitTestDelegates.nfproj b/Tests/NFUnitTestDelegates/NFUnitTestDelegates.nfproj
index ba0ab21b..3b657569 100644
--- a/Tests/NFUnitTestDelegates/NFUnitTestDelegates.nfproj
+++ b/Tests/NFUnitTestDelegates/NFUnitTestDelegates.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestEnum/NFUnitTestEnum.nfproj b/Tests/NFUnitTestEnum/NFUnitTestEnum.nfproj
index f78c77fd..4e964297 100644
--- a/Tests/NFUnitTestEnum/NFUnitTestEnum.nfproj
+++ b/Tests/NFUnitTestEnum/NFUnitTestEnum.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestException/NFUnitTestException.nfproj b/Tests/NFUnitTestException/NFUnitTestException.nfproj
index be674ff4..053e0477 100644
--- a/Tests/NFUnitTestException/NFUnitTestException.nfproj
+++ b/Tests/NFUnitTestException/NFUnitTestException.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestInterface/NFUnitTestInterface.nfproj b/Tests/NFUnitTestInterface/NFUnitTestInterface.nfproj
index c9257439..38786431 100644
--- a/Tests/NFUnitTestInterface/NFUnitTestInterface.nfproj
+++ b/Tests/NFUnitTestInterface/NFUnitTestInterface.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestLexical/NFUnitTestLexical.nfproj b/Tests/NFUnitTestLexical/NFUnitTestLexical.nfproj
index 99c0c4fe..eefc3d51 100644
--- a/Tests/NFUnitTestLexical/NFUnitTestLexical.nfproj
+++ b/Tests/NFUnitTestLexical/NFUnitTestLexical.nfproj
@@ -34,17 +34,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestNamespace/NFUnitTestNamespace.nfproj b/Tests/NFUnitTestNamespace/NFUnitTestNamespace.nfproj
index a7f7a4b4..b680b040 100644
--- a/Tests/NFUnitTestNamespace/NFUnitTestNamespace.nfproj
+++ b/Tests/NFUnitTestNamespace/NFUnitTestNamespace.nfproj
@@ -43,17 +43,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestRecords/NFUnitTestRecords.nfproj b/Tests/NFUnitTestRecords/NFUnitTestRecords.nfproj
index 6dcffc95..46837771 100644
--- a/Tests/NFUnitTestRecords/NFUnitTestRecords.nfproj
+++ b/Tests/NFUnitTestRecords/NFUnitTestRecords.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestStatementsTests/NFUnitTestStatements.nfproj b/Tests/NFUnitTestStatementsTests/NFUnitTestStatements.nfproj
index 30c4e309..605947c8 100644
--- a/Tests/NFUnitTestStatementsTests/NFUnitTestStatements.nfproj
+++ b/Tests/NFUnitTestStatementsTests/NFUnitTestStatements.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestStruct/NFUnitTestStruct.nfproj b/Tests/NFUnitTestStruct/NFUnitTestStruct.nfproj
index 952c14e3..86660317 100644
--- a/Tests/NFUnitTestStruct/NFUnitTestStruct.nfproj
+++ b/Tests/NFUnitTestStruct/NFUnitTestStruct.nfproj
@@ -33,17 +33,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestSystemLib/NFUnitTestSystemLib.nfproj b/Tests/NFUnitTestSystemLib/NFUnitTestSystemLib.nfproj
index 54803e8a..593d741a 100644
--- a/Tests/NFUnitTestSystemLib/NFUnitTestSystemLib.nfproj
+++ b/Tests/NFUnitTestSystemLib/NFUnitTestSystemLib.nfproj
@@ -56,17 +56,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestThread/NFUnitTestThread.nfproj b/Tests/NFUnitTestThread/NFUnitTestThread.nfproj
index 36016567..f8777b76 100644
--- a/Tests/NFUnitTestThread/NFUnitTestThread.nfproj
+++ b/Tests/NFUnitTestThread/NFUnitTestThread.nfproj
@@ -39,17 +39,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestTypes/NFUnitTestTypes.nfproj b/Tests/NFUnitTestTypes/NFUnitTestTypes.nfproj
index cced57f9..e5000da3 100644
--- a/Tests/NFUnitTestTypes/NFUnitTestTypes.nfproj
+++ b/Tests/NFUnitTestTypes/NFUnitTestTypes.nfproj
@@ -41,17 +41,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTestVariables/NFUnitTestVariables.nfproj b/Tests/NFUnitTestVariables/NFUnitTestVariables.nfproj
index 142a6d85..052d0dd1 100644
--- a/Tests/NFUnitTestVariables/NFUnitTestVariables.nfproj
+++ b/Tests/NFUnitTestVariables/NFUnitTestVariables.nfproj
@@ -34,17 +34,9 @@
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTest_DummyAdapter/DummyClass.cs b/Tests/NFUnitTest_DummyAdapter/DummyClass.cs
deleted file mode 100644
index 4cb8ff6a..00000000
--- a/Tests/NFUnitTest_DummyAdapter/DummyClass.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation. All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-
-using System.Diagnostics;
-using System.Threading;
-
-namespace NFUnitTestAdapater
-{
- public class DummyClass
- {
- public void DummyMethod()
- {
- //////////////////////////////////////////////////////////////////////
- // This is just to get the TestAdapter. DO NOT remove this project! //
- //////////////////////////////////////////////////////////////////////
-
- // do something here so the method isn't removed on Release build
- Thread.Sleep(Timeout.Infinite);
- }
- }
-}
diff --git a/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj b/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj
deleted file mode 100644
index 61ce4327..00000000
--- a/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
- $(MSBuildExtensionsPath)\nanoFramework\v1.0\
-
-
-
- Debug
- AnyCPU
- {11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 396a2b21-8a5f-4274-9fdd-3b35dc8eae47
- Library
- Properties
- 512
- NFUnitTestAdpater
- NFUnitTest
- False
- true
- UnitTest
- v1.0
-
-
-
-
-
-
-
-
-
-
-
- ..\..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll
-
-
- ..\..\packages\nanoFramework.TestFramework.2.1.53\lib\nanoFramework.TestFramework.dll
-
-
- ..\..\packages\nanoFramework.TestFramework.2.1.53\lib\nanoFramework.UnitTestLauncher.exe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.
-
-
-
-
diff --git a/Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs b/Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0383fb89..00000000
--- a/Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.TestApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.TestApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tests/NFUnitTest_DummyAdapter/packages.config b/Tests/NFUnitTest_DummyAdapter/packages.config
deleted file mode 100644
index b8ec76db..00000000
--- a/Tests/NFUnitTest_DummyAdapter/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/Tests/NFUnitTest_DummyAdapter/packages.lock.json b/Tests/NFUnitTest_DummyAdapter/packages.lock.json
deleted file mode 100644
index 3322b791..00000000
--- a/Tests/NFUnitTest_DummyAdapter/packages.lock.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "version": 1,
- "dependencies": {
- ".NETnanoFramework,Version=v1.0": {
- "nanoFramework.CoreLibrary": {
- "type": "Direct",
- "requested": "[1.12.0, 1.12.0]",
- "resolved": "1.12.0",
- "contentHash": "qQrFNXmJiStMC4VXk5cVMOJp23/qlT9FW5i9i+igwQVwraQTtvpkam8yK1hj992jqrbjoCIFZP4Hw9E8H0pB7w=="
- },
- "nanoFramework.TestFramework": {
- "type": "Direct",
- "requested": "[2.1.53, 2.1.53]",
- "resolved": "2.1.53",
- "contentHash": "Qr070ITYv5XZ6E54+bDhFEOaCOcrx/oSOUK/uWYnQrCLTH9Tanf/fhEnWOViMk8nOiuXsPtY00Aen+57lrVsFg=="
- }
- }
- }
-}
\ No newline at end of file
diff --git a/nanoFramework.CoreLibrary.sln b/nanoFramework.CoreLibrary.sln
index 8f0e7b93..a2a1bbe7 100644
--- a/nanoFramework.CoreLibrary.sln
+++ b/nanoFramework.CoreLibrary.sln
@@ -10,6 +10,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{05E83B20-2648-4807-8F3E-D656497E3481}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
+ .runsettings = .runsettings
nanoFramework.CoreLibrary.NoReflection.nuspec = nanoFramework.CoreLibrary.NoReflection.nuspec
nanoFramework.CoreLibrary.nuspec = nanoFramework.CoreLibrary.nuspec
NuGet.Config = NuGet.Config
@@ -62,10 +63,10 @@ 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}") = "NFUnitTest_DummyAdapter", "Tests\NFUnitTest_DummyAdapter\NFUnitTest_DummyAdapter.nfproj", "{396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}"
-EndProject
Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTestRecords", "Tests\NFUnitTestRecords\NFUnitTestRecords.nfproj", "{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoFramework.TestAdapter", "nanoFramework.TestFramework\source\TestAdapter\nanoFramework.TestAdapter.csproj", "{6D740F0A-D435-4ACF-AD27-D702A599F229}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -210,18 +211,16 @@ Global
{44A0C6A8-4F31-405B-95CA-6F0D65BC11B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{44A0C6A8-4F31-405B-95CA-6F0D65BC11B8}.Release|Any CPU.Build.0 = Release|Any CPU
{44A0C6A8-4F31-405B-95CA-6F0D65BC11B8}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}.Release|Any CPU.Build.0 = Release|Any CPU
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}.Release|Any CPU.Build.0 = Release|Any CPU
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {6D740F0A-D435-4ACF-AD27-D702A599F229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6D740F0A-D435-4ACF-AD27-D702A599F229}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6D740F0A-D435-4ACF-AD27-D702A599F229}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6D740F0A-D435-4ACF-AD27-D702A599F229}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -249,13 +248,14 @@ Global
{48C77E72-02D2-4D6F-B68B-B0972388781F} = {0BAE286A-5434-4F56-A9F1-41B72056170E}
{44A0C6A8-4F31-405B-95CA-6F0D65BC11B8} = {0BAE286A-5434-4F56-A9F1-41B72056170E}
{55F048B5-6739-43C5-A93D-DB61DB8E912F} = {0BAE286A-5434-4F56-A9F1-41B72056170E}
- {396A2B21-8A5F-4274-9FDD-3B35DC8EAE47} = {0BAE286A-5434-4F56-A9F1-41B72056170E}
{0BE498D1-CB3E-4D1E-BA4C-2C49AE30432D} = {0BAE286A-5434-4F56-A9F1-41B72056170E}
+ {6D740F0A-D435-4ACF-AD27-D702A599F229} = {0BAE286A-5434-4F56-A9F1-41B72056170E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8DE44407-9B41-4459-97D2-FCE54B1F4300}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
nanoFramework.TestFramework\source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13
+ nanoFramework.TestFramework\source\TestFrameworkShared\TestFrameworkShared.projitems*{6d740f0a-d435-4acf-ad27-d702a599f229}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
diff --git a/nanoFramework.TestFramework b/nanoFramework.TestFramework
index ac2b71cf..5963e0d5 160000
--- a/nanoFramework.TestFramework
+++ b/nanoFramework.TestFramework
@@ -1 +1 @@
-Subproject commit ac2b71cf5d9c08afc61074a707c326dc683c4f5f
+Subproject commit 5963e0d58284b02163008f5c77a746daa5d9e51c