diff options
18 files changed, 50 insertions, 70 deletions
diff --git a/src/Common/tests/System/Collections/ISet.Generic.Tests.cs b/src/Common/tests/System/Collections/ISet.Generic.Tests.cs index 0f32114ce9..c6dfc3ad80 100644 --- a/src/Common/tests/System/Collections/ISet.Generic.Tests.cs +++ b/src/Common/tests/System/Collections/ISet.Generic.Tests.cs @@ -419,6 +419,7 @@ namespace System.Collections.Tests [Theory] [MemberData(nameof(ValidCollectionSizes))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #16796")] //Throws InvalidOperationException public void ISet_Generic_IntersectWith_Itself(int setLength) { ISet<T> set = GenericISetFactory(setLength); diff --git a/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc.cs b/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc.cs index 39be0b810c..5f3423aae9 100644 --- a/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc.cs +++ b/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc.cs @@ -50,7 +50,6 @@ namespace Microsoft.Win32.RegistryTests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46, "dotnet/corefx#11332")] public void OpenSubKeyTest() { // [] Vanilla; open a subkey in read/write mode and write to it diff --git a/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc_rr.cs b/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc_rr.cs index d450f04c61..cc5ab92448 100644 --- a/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc_rr.cs +++ b/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rkpc_rr.cs @@ -66,7 +66,6 @@ namespace Microsoft.Win32.RegistryTests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46, "dotnet/corefx#11332")] public void OpenSubKeyTest() { // [] Vanilla; open a subkey in read/write mode and write to it diff --git a/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rr.cs b/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rr.cs index 5f9e27a43c..334373d08d 100644 --- a/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rr.cs +++ b/src/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_OpenSubKey_str_rr.cs @@ -41,7 +41,6 @@ namespace Microsoft.Win32.RegistryTests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46, "dotnet/corefx#11332")] public void OpenSubKeyTest() { // [] Vanilla; open a subkey in read/write mode and write to it diff --git a/src/System.Collections/tests/Generic/SortedList/SortedList.Tests.cs b/src/System.Collections/tests/Generic/SortedList/SortedList.Tests.cs index 7177ede863..b4dd0fea37 100644 --- a/src/System.Collections/tests/Generic/SortedList/SortedList.Tests.cs +++ b/src/System.Collections/tests/Generic/SortedList/SortedList.Tests.cs @@ -117,7 +117,7 @@ namespace System.Collections.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46, "dotnet/corefx#7019")] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx#7019")] public void CantAcceptDuplicateKeysFromSourceDictionary() { Dictionary<string, int> source = new Dictionary<string, int> { { "a", 1 }, { "A", 1 } }; diff --git a/src/System.Collections/tests/Generic/SortedSet/SortedSet.Generic.Tests.cs b/src/System.Collections/tests/Generic/SortedSet/SortedSet.Generic.Tests.cs index b73c61d44b..d20241323a 100644 --- a/src/System.Collections/tests/Generic/SortedSet/SortedSet.Generic.Tests.cs +++ b/src/System.Collections/tests/Generic/SortedSet/SortedSet.Generic.Tests.cs @@ -57,7 +57,8 @@ namespace System.Collections.Tests [Theory] [MemberData(nameof(EnumerableTestData))] - public void SortedSet_Generic_Constructor_IEnumerable_IComparer(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements) + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #16790")] + public void SortedSet_Generic_Constructor_IEnumerable_IComparer_Netcoreapp(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements) { IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, 0); SortedSet<T> set = new SortedSet<T>(enumerable, GetIComparer()); @@ -66,16 +67,27 @@ namespace System.Collections.Tests [Theory] [MemberData(nameof(EnumerableTestData))] - public void SortedSet_Generic_Constructor_IEnumerable_IComparer_NullComparer(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements) + [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework, "dotnet/corefx #16790")] + public void SortedSet_Generic_Constructor_IEnumerable_IComparer_Netfx(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements) + { + IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, 0); + SortedSet<T> set = new SortedSet<T>(enumerable, GetIComparer() ?? Comparer<T>.Default); + Assert.True(set.SetEquals(enumerable)); + } + + [Theory] + [MemberData(nameof(EnumerableTestData))] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #16790")] + public void SortedSet_Generic_Constructor_IEnumerable_IComparer_NullComparer_Netcoreapp(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements) { IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, 0); SortedSet<T> set = new SortedSet<T>(enumerable, comparer: null); Assert.True(set.SetEquals(enumerable)); } - #endregion +#endregion - #region Max and Min +#region Max and Min [Theory] [MemberData(nameof(ValidCollectionSizes))] @@ -96,9 +108,9 @@ namespace System.Collections.Tests } } - #endregion +#endregion - #region GetViewBetween +#region GetViewBetween [Theory] [MemberData(nameof(ValidCollectionSizes))] @@ -201,7 +213,7 @@ namespace System.Collections.Tests #endregion - #region RemoveWhere +#region RemoveWhere [Theory] [MemberData(nameof(ValidCollectionSizes))] @@ -229,9 +241,9 @@ namespace System.Collections.Tests Assert.Throws<ArgumentNullException>("match", () => set.RemoveWhere(null)); } - #endregion +#endregion - #region Enumeration and Ordering +#region Enumeration and Ordering [Theory] [MemberData(nameof(ValidCollectionSizes))] @@ -275,9 +287,9 @@ namespace System.Collections.Tests Assert.True(mySubSet.SetEquals(en)); //"Expected to be the same set." } - #endregion +#endregion - #region CopyTo +#region CopyTo [Theory] [MemberData(nameof(ValidCollectionSizes))] @@ -313,9 +325,9 @@ namespace System.Collections.Tests Assert.Throws<ArgumentOutOfRangeException>(() => set.CopyTo(actual, 0, int.MinValue)); } - #endregion +#endregion - #region CreateSetComparer +#region CreateSetComparer [Fact] public void SetComparer_SetEqualsTests() @@ -350,6 +362,6 @@ namespace System.Collections.Tests Assert.True(comparerSet1.SetEquals(set)); Assert.True(comparerSet2.SetEquals(set)); } - #endregion +#endregion } } diff --git a/src/System.Diagnostics.Debug/tests/DebugTests.cs b/src/System.Diagnostics.Debug/tests/DebugTests.cs index b1def81cd4..d75e284f1d 100644 --- a/src/System.Diagnostics.Debug/tests/DebugTests.cs +++ b/src/System.Diagnostics.Debug/tests/DebugTests.cs @@ -16,7 +16,6 @@ namespace System.Diagnostics.Tests RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "\r\n" : "\n"; [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void Asserts() { VerifyLogged(() => { Debug.Assert(true); }, ""); @@ -31,7 +30,6 @@ namespace System.Diagnostics.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void Fail() { VerifyAssert(() => { Debug.Fail("something bad happened"); }, "something bad happened"); @@ -39,7 +37,6 @@ namespace System.Diagnostics.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void Write() { VerifyLogged(() => { Debug.Write(5); }, "5"); @@ -56,7 +53,6 @@ namespace System.Diagnostics.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void Print() { VerifyLogged(() => { Debug.Print("logged"); }, "logged"); @@ -64,7 +60,6 @@ namespace System.Diagnostics.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void WriteLine() { VerifyLogged(() => { Debug.WriteLine(5); }, "5" + s_newline); @@ -79,7 +74,6 @@ namespace System.Diagnostics.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void WriteIf() { VerifyLogged(() => { Debug.WriteIf(true, 5); }, "5"); @@ -96,7 +90,6 @@ namespace System.Diagnostics.Tests } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void WriteLineIf() { VerifyLogged(() => { Debug.WriteLineIf(true, 5); }, "5" + s_newline); @@ -116,7 +109,6 @@ namespace System.Diagnostics.Tests [InlineData(2)] [InlineData(4)] [InlineData(3)] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public void Indentation(int indentSize) { Debug.IndentLevel = 0; diff --git a/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs b/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs index 02c2309b1e..b07486500d 100644 --- a/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs +++ b/src/System.IO.FileSystem/tests/Directory/CreateDirectory.cs @@ -127,7 +127,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // trailing slash public void ValidExtendedPathWithTrailingSlash() { @@ -230,7 +230,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(AreAllLongPathsAvailable))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // long directory path succeeds public void DirectoryLongerThanMaxPath_Succeeds() { @@ -255,7 +255,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(LongPathsAreNotBlocked), nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // long directory path with extended syntax throws PathTooLongException public void DirectoryLongerThanMaxLongPathWithExtendedSyntax_ThrowsPathTooLongException() { @@ -267,7 +267,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(LongPathsAreNotBlocked), nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // long directory path with extended syntax succeeds public void ExtendedDirectoryLongerThanLegacyMaxPath_Succeeds() { @@ -279,7 +279,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(AreAllLongPathsAvailable))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // long directory path succeeds public void DirectoryLongerThanMaxDirectoryAsPath_Succeeds() { @@ -356,7 +356,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // extended syntax with whitespace public void WindowsExtendedSyntaxWhiteSpace() { @@ -413,7 +413,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // device name prefixes public void PathWithReservedDeviceNameAsExtendedPath() { diff --git a/src/System.IO.FileSystem/tests/Directory/Delete.cs b/src/System.IO.FileSystem/tests/Directory/Delete.cs index 7a341c18f6..b88478abbb 100644 --- a/src/System.IO.FileSystem/tests/Directory/Delete.cs +++ b/src/System.IO.FileSystem/tests/Directory/Delete.cs @@ -109,7 +109,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] public void ExtendedDirectoryWithSubdirectories() { DirectoryInfo testDir = Directory.CreateDirectory(IOInputs.ExtendedPrefix + GetTestFilePath()); @@ -119,7 +119,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(LongPathsAreNotBlocked), nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] public void LongPathExtendedDirectory() { DirectoryInfo testDir = Directory.CreateDirectory(IOServices.GetPath(IOInputs.ExtendedPrefix + TestDirectory, characterCount: 500).FullPath); @@ -143,7 +143,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Deleting extended readonly directory throws IOException public void WindowsDeleteExtendedReadOnlyDirectory() { @@ -175,7 +175,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Deleting extended hidden directory succeeds public void WindowsShouldBeAbleToDeleteExtendedHiddenDirectory() { diff --git a/src/System.IO.FileSystem/tests/Directory/Exists.cs b/src/System.IO.FileSystem/tests/Directory/Exists.cs index b95cb61c26..fff873fa05 100644 --- a/src/System.IO.FileSystem/tests/Directory/Exists.cs +++ b/src/System.IO.FileSystem/tests/Directory/Exists.cs @@ -177,7 +177,7 @@ namespace System.IO.Tests #region PlatformSpecific [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Extended path exists public void ValidExtendedPathExists_ReturnsTrue() { @@ -190,7 +190,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Extended path already exists as file public void ExtendedPathAlreadyExistsAsFile() { @@ -203,7 +203,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Extended path already exists as directory public void ExtendedPathAlreadyExistsAsDirectory() { @@ -216,7 +216,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(AreAllLongPathsAvailable))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Long directory path doesn't throw on Exists public void DirectoryLongerThanMaxDirectoryAsPath_DoesntThrow() { @@ -258,7 +258,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // In Windows, trailing whitespace in a path is trimmed appropriately public void TrailingWhitespaceExistence() { diff --git a/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs b/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs index eaee5de069..05c649a99c 100644 --- a/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs +++ b/src/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs @@ -220,7 +220,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(AreAllLongPathsAvailable))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] public void SearchPatternLongPath() { // Create a destination path longer than the traditional Windows limit of 256 characters diff --git a/src/System.IO.FileSystem/tests/Directory/Move.cs b/src/System.IO.FileSystem/tests/Directory/Move.cs index d6074195a3..63588f5cce 100644 --- a/src/System.IO.FileSystem/tests/Directory/Move.cs +++ b/src/System.IO.FileSystem/tests/Directory/Move.cs @@ -144,7 +144,7 @@ namespace System.IO.Tests #region PlatformSpecific [ConditionalFact(nameof(AreAllLongPathsAvailable))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Long path succeeds public void Path_With_Longer_Than_MaxDirectory_Succeeds() { diff --git a/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs b/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs index 8b8ca60963..5074f0d247 100644 --- a/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs +++ b/src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs @@ -205,7 +205,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(UsingNewNormalization))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Extended windows path public void ExtendedPathSubdirectory() { diff --git a/src/System.IO.FileSystem/tests/File/Create.cs b/src/System.IO.FileSystem/tests/File/Create.cs index 8951785e91..6d9c4600e2 100644 --- a/src/System.IO.FileSystem/tests/File/Create.cs +++ b/src/System.IO.FileSystem/tests/File/Create.cs @@ -58,7 +58,7 @@ namespace System.IO.Tests [ConditionalFact(nameof(UsingNewNormalization))] [PlatformSpecific(TestPlatforms.Windows)] // Valid Windows path extended prefix - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "dos device path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] public void ValidCreation_ExtendedSyntax() { DirectoryInfo testDir = Directory.CreateDirectory(IOInputs.ExtendedPrefix + GetTestFilePath()); @@ -74,7 +74,7 @@ namespace System.IO.Tests [ConditionalFact(nameof(AreAllLongPathsAvailable))] [PlatformSpecific(TestPlatforms.Windows)] // Valid Windows path extended prefix, long path - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] public void ValidCreation_LongPathExtendedSyntax() { DirectoryInfo testDir = Directory.CreateDirectory(IOServices.GetPath(IOInputs.ExtendedPrefix + TestDirectory, characterCount: 500).FullPath); diff --git a/src/System.IO.FileSystem/tests/File/Move.cs b/src/System.IO.FileSystem/tests/File/Move.cs index 09e96ab5a1..9cbaadd2a4 100644 --- a/src/System.IO.FileSystem/tests/File/Move.cs +++ b/src/System.IO.FileSystem/tests/File/Move.cs @@ -148,7 +148,7 @@ namespace System.IO.Tests } [ConditionalFact(nameof(AreAllLongPathsAvailable))] - [SkipOnTargetFramework(Tfm.BelowNet462 | Tfm.Core50, "long path support added in 4.6.2")] + [SkipOnTargetFramework(TargetFrameworkMonikers.Uap | TargetFrameworkMonikers.UapAot)] [PlatformSpecific(TestPlatforms.Windows)] // Path longer than max path limit public void OverMaxPathWorks_Windows() { diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index 809700615a..b5e4ea930f 100644 --- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -96,7 +96,6 @@ <Compile Include="File\ReadWriteAllLines.cs" /> <Compile Include="PathFeatures.cs" /> <Compile Include="TestData.cs" /> - <Compile Include="Tfm.cs" /> <Compile Include="UnseekableFileStream.cs" /> <Compile Include="FSAssert.cs" /> <Compile Include="FileSystemTest.cs" /> diff --git a/src/System.IO.FileSystem/tests/Tfm.cs b/src/System.IO.FileSystem/tests/Tfm.cs deleted file mode 100644 index 90443fb808..0000000000 --- a/src/System.IO.FileSystem/tests/Tfm.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Xunit; - - -public static class Tfm -{ - public const TargetFrameworkMonikers BelowNet462 = TargetFrameworkMonikers.Net45 | TargetFrameworkMonikers.Net451 | TargetFrameworkMonikers.Net452 | TargetFrameworkMonikers.Net46 | TargetFrameworkMonikers.Net461; - public const TargetFrameworkMonikers BelowNet47 = BelowNet462 | TargetFrameworkMonikers.Net462 | TargetFrameworkMonikers.Net463; - public const TargetFrameworkMonikers Core50 = TargetFrameworkMonikers.Netcore50 | TargetFrameworkMonikers.Netcore50aot; -} diff --git a/src/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/MarshalTests.cs b/src/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/MarshalTests.cs index 7d18a961d0..e74d4279f5 100644 --- a/src/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/MarshalTests.cs +++ b/src/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/MarshalTests.cs @@ -272,7 +272,6 @@ namespace System.Runtime.InteropServices #if netcoreapp [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void GenerateGuidForType() { Assert.Equal(typeof(int).GUID, Marshal.GenerateGuidForType(typeof(int))); @@ -285,7 +284,6 @@ namespace System.Runtime.InteropServices } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void GenerateProgIdForType() { Assert.Throws<ArgumentNullException>(() => Marshal.GenerateProgIdForType(null)); @@ -293,7 +291,6 @@ namespace System.Runtime.InteropServices } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void GetComObjectData() { Assert.Throws<PlatformNotSupportedException>(() => Marshal.GetComObjectData(null, null)); @@ -309,14 +306,12 @@ namespace System.Runtime.InteropServices } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void GetIDispatchForObject() { Assert.Throws<PlatformNotSupportedException>(() => Marshal.GetIDispatchForObject(null)); } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void GetTypedObjectForIUnknown() { if(PlatformDetection.IsWindows) @@ -330,7 +325,6 @@ namespace System.Runtime.InteropServices } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void SetComObjectData() { Assert.Throws<PlatformNotSupportedException>(() => Marshal.SetComObjectData(null, null, null)); @@ -424,7 +418,6 @@ namespace System.Runtime.InteropServices } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void BindToMoniker() { String monikerName = null; @@ -442,7 +435,6 @@ namespace System.Runtime.InteropServices } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Net46)] public static void ChangeWrapperHandleStrength() { if(PlatformDetection.IsWindows) |