diff --git a/source/TestFramework/CallerArgumentExpressionAttribute.cs b/source/TestFramework/CallerArgumentExpressionAttribute.cs
deleted file mode 100644
index ec3fb98..0000000
--- a/source/TestFramework/CallerArgumentExpressionAttribute.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-// ReSharper disable once CheckNamespace
-namespace System.Runtime.CompilerServices
-{
- ///
- /// Indicates that a parameter captures the expression passed for another parameter as a string.
- ///
- [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = false)]
- internal sealed class CallerArgumentExpressionAttribute : Attribute
- {
- ///
- /// Initializes a new instance of the class.
- ///
- /// The name of the parameter whose expression should be captured as a string.
- public CallerArgumentExpressionAttribute(string parameterName)
- {
- ParameterName = parameterName;
- }
-
- ///
- /// Gets the name of the parameter whose expression should be captured as a string.
- ///
- public string ParameterName { get; }
- }
-}
\ No newline at end of file
diff --git a/source/TestFramework/NullableAttributes.cs b/source/TestFramework/NullableAttributes.cs
deleted file mode 100644
index e36c7e6..0000000
--- a/source/TestFramework/NullableAttributes.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-// ReSharper disable once CheckNamespace
-namespace System.Diagnostics.CodeAnalysis
-{
- ///
- /// Specifies that is allowed as an input even if the corresponding type disallows it.
- ///
- ///
- /// To override a method that has a parameter annotated with this attribute, use the ? operator. For more information, see Nullable static analysis in the C# guide.
- ///
- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
- internal sealed class AllowNullAttribute : Attribute
- { }
-
- ///
- /// Specifies that null is disallowed as an input even if the corresponding type allows it.
- ///
- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
- internal sealed class DisallowNullAttribute : Attribute
- { }
-
- ///
- /// Specifies that an output may be null even if the corresponding type disallows it.
- ///
- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
- internal sealed class MaybeNullAttribute : Attribute
- { }
-
- ///
- /// Specifies that an output will not be null even if the corresponding type allows it. Specifies that an input argument was not null when the call returns.
- ///
- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
- internal sealed class NotNullAttribute : Attribute
- { }
-
- ///
- /// Specifies that when a method returns , the parameter may be null even if the corresponding type disallows it.
- ///
- [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
- internal sealed class MaybeNullWhenAttribute : Attribute
- {
- ///
- /// Initializes the attribute with the specified return value condition.
- ///
- ///
- /// The return value condition. If the method returns this value, the associated parameter may be null.
- ///
- internal MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
- ///
- /// Gets the return value condition.
- ///
- internal bool ReturnValue { get; }
- }
-
- ///
- /// Specifies that when a method returns , the parameter will not be null even if the corresponding type allows it.
- ///
- internal sealed class NotNullWhenAttribute : Attribute
- {
- /// Initializes the attribute with the specified return value condition.
- ///
- /// The return value condition. If the method returns this value, the associated parameter will not be null.
- ///
- internal NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
- /// Gets the return value condition.
- internal bool ReturnValue { get; }
- }
-
- ///
- /// Specifies that the output will be non-null if the named parameter is non-null.
- ///
- [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
- internal sealed class NotNullIfNotNullAttribute : Attribute
- {
- /// Initializes the attribute with the associated parameter name.
- ///
- /// The associated parameter name. The output will be non-null if the argument to the parameter specified is non-null.
- ///
- internal NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
-
- /// Gets the associated parameter name.
- internal string ParameterName { get; }
- }
-
- ///
- /// Applied to a method that will never return under any circumstance.
- ///
- [AttributeUsage(AttributeTargets.Method, Inherited = false)]
- internal sealed class DoesNotReturnAttribute : Attribute
- { }
-
- ///
- /// Specifies that the method will not return if the associated Boolean parameter is passed the specified value.
- ///
- [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
- internal sealed class DoesNotReturnIfAttribute : Attribute
- {
- /// Initializes the attribute with the specified parameter value.
- ///
- /// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
- /// the associated parameter matches this value.
- ///
- internal DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
-
- ///
- /// Gets the condition parameter value.
- ///
- internal bool ParameterValue { get; }
- }
-
- ///
- /// Specifies that the method or property will ensure that the listed field and property members have not-null values.
- ///
- [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
- internal sealed class MemberNotNullAttribute : Attribute
- {
- /// Initializes the attribute with a field or property member.
- ///
- /// The field or property member that is promised to be not-null.
- ///
- internal MemberNotNullAttribute(string member) => Members = new[] { member };
-
- /// Initializes the attribute with the list of field and property members.
- ///
- /// The list of field and property members that are promised to be not-null.
- ///
- internal MemberNotNullAttribute(params string[] members) => Members = members;
-
- ///
- /// Gets field or property member names.
- ///
- internal string[] Members { get; }
- }
-
- ///
- /// Specifies that the method or property will ensure that the listed field and property members have not-null values when returning with the specified return value condition.
- ///
- [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
- internal sealed class MemberNotNullWhenAttribute : Attribute
- {
- /// Initializes the attribute with the specified return value condition and a field or property member.
- ///
- /// The return value condition. If the method returns this value, the associated parameter will not be null.
- ///
- ///
- /// The field or property member that is promised to be not-null.
- ///
- internal MemberNotNullWhenAttribute(bool returnValue, string member)
- {
- ReturnValue = returnValue;
- Members = new[] { member };
- }
-
- /// Initializes the attribute with the specified return value condition and list of field and property members.
- ///
- /// The return value condition. If the method returns this value, the associated parameter will not be null.
- ///
- ///
- /// The list of field and property members that are promised to be not-null.
- ///
- internal MemberNotNullWhenAttribute(bool returnValue, params string[] members)
- {
- ReturnValue = returnValue;
- Members = members;
- }
-
- ///
- /// Gets the return value condition.
- ///
- internal bool ReturnValue { get; }
-
- ///
- /// Gets field or property member names.
- ///
- internal string[] Members { get; }
- }
-}
diff --git a/source/TestFramework/nanoFramework.TestFramework.nfproj b/source/TestFramework/nanoFramework.TestFramework.nfproj
index e6c6b6d..aef9a17 100644
--- a/source/TestFramework/nanoFramework.TestFramework.nfproj
+++ b/source/TestFramework/nanoFramework.TestFramework.nfproj
@@ -42,9 +42,7 @@
Assert.cs
-
-