diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-02-12 08:40:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 08:40:35 +0300 |
| commit | 608267af43311b131d20e4111477ffb1109233a0 (patch) | |
| tree | 1000b765463fbaeb3f0fdd08ae380e0fb8de0669 /src/System.Runtime.Extensions/tests | |
| parent | 41ac0d427a4e5f17b6f20cc2bef098278da01d70 (diff) | |
Cleanup netstandard ifdefs and conditions (#16072)
* Cleanup netstandard conditions in csproj files
* Cleanup netstandard17 ifdefs
* Disable failing tests
Diffstat (limited to 'src/System.Runtime.Extensions/tests')
3 files changed, 0 insertions, 7 deletions
diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 5de360ac3e..ccc21a67db 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -4,7 +4,6 @@ <PropertyGroup> <ProjectGuid>{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <DefineConstants Condition="'$(TargetGroup)'=='netstandard2.0'">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> diff --git a/src/System.Runtime.Extensions/tests/System/Environment.Exit.cs b/src/System.Runtime.Extensions/tests/System/Environment.Exit.cs index 2aec5322e4..a0697677b4 100644 --- a/src/System.Runtime.Extensions/tests/System/Environment.Exit.cs +++ b/src/System.Runtime.Extensions/tests/System/Environment.Exit.cs @@ -39,7 +39,6 @@ namespace System.Tests } } -#if netstandard17 [Theory] [MemberData(nameof(ExitCodeValues))] public static void ExitCode_Roundtrips(int exitCode) @@ -49,7 +48,6 @@ namespace System.Tests Environment.ExitCode = 0; // in case the test host has a void returning Main } -#endif //netstandard17 [ActiveIssue("https://github.com/dotnet/coreclr/issues/6206")] [Theory] diff --git a/src/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs b/src/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs index 66488f3e42..a725c3e8c5 100644 --- a/src/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs +++ b/src/System.Runtime.Extensions/tests/System/Environment.GetEnvironmentVariable.cs @@ -18,7 +18,6 @@ namespace System.Tests Assert.Throws<ArgumentException>("variable", () => Environment.SetEnvironmentVariable("", "test")); Assert.Throws<ArgumentException>("value", () => Environment.SetEnvironmentVariable("test", new string('s', 65 * 1024))); -#if netstandard17 Assert.Throws<ArgumentException>("variable", () => Environment.SetEnvironmentVariable("", "test", EnvironmentVariableTarget.Machine)); Assert.Throws<ArgumentNullException>("variable", () => Environment.SetEnvironmentVariable(null, "test", EnvironmentVariableTarget.User)); Assert.Throws<ArgumentNullException>("variable", () => Environment.GetEnvironmentVariable(null, EnvironmentVariableTarget.Process)); @@ -29,7 +28,6 @@ namespace System.Tests { Assert.Throws<ArgumentException>("variable", () => Environment.SetEnvironmentVariable(new string('s', 256), "value", EnvironmentVariableTarget.User)); } -#endif } [Fact] @@ -149,7 +147,6 @@ namespace System.Tests } } -#if netstandard17 public void EnvironmentVariablesAreHashtable() { // On NetFX, the type returned was always Hashtable @@ -213,7 +210,6 @@ namespace System.Tests } } } -#endif private static void SetEnvironmentVariableWithPInvoke(string name, string value) { |