fsprojects · enricosada · May 18, 2018 · May 18, 2018 · May 18, 2018 · May 18, 2018
diff --git a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj
@@ -3,7 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <PaketTestsSourcesDir>..\Paket.IntegrationTests</PaketTestsSourcesDir>
-    <DefineConstants>PAKET_NETCORE</DefineConstants>
+    <DefineConstants>
+      PAKET_NETCORE;
+      NO_UNIT_PLATFORMATTRIBUTE;
+      TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;
+      FAKE_NETSTANDARD_API;
+      @(DefineConstants)
+    </DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs b/integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs
@@ -25,7 +25,7 @@ let ``#1182 framework restrictions overwrite each other``() =
     lockFile.Contains("framework: winv4.5") |> shouldEqual false
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform("Mono")>] // PATH TOO LONG on Windows...

diff --git a/integrationtests/Paket.IntegrationTests/FullGitSpecs.fs b/integrationtests/Paket.IntegrationTests/FullGitSpecs.fs
@@ -47,7 +47,7 @@ let ``#1353 should use NuGet source from git repo``() =
     |> shouldEqual (SemVer.Parse "1.1.3")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should use git tag as NuGet source``() = 
@@ -61,7 +61,7 @@ let ``#1353 should use git tag as NuGet source``() =
     |> shouldEqual (SemVer.Parse "2.0.0")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should use git tag with operatore as NuGet source``() = 
@@ -75,7 +75,7 @@ let ``#1353 should use git tag with operatore as NuGet source``() =
     |> shouldEqual (SemVer.Parse "2.0.0")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should restore NuGet source from built git repo``() = 
@@ -88,7 +88,7 @@ let ``#1353 should restore NuGet source from built git repo``() =
     Directory.Exists arguPackagesDir |> shouldEqual true
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should build NuGet source from git repo``() = 

diff --git a/integrationtests/Paket.IntegrationTests/OutdatedSpecs.fs b/integrationtests/Paket.IntegrationTests/OutdatedSpecs.fs
@@ -15,7 +15,7 @@ let ``#183 outdated without params``() =
     msg |> shouldContainText "FSharp.Formatting 2.4 ->"
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform "Mono">] // PATH TOO LONG on Windows...
@@ -26,7 +26,7 @@ let ``#183 outdated --ignore-constraint``() =
 
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform "Mono">] // PATH TOO LONG on Windows...

diff --git a/integrationtests/Paket.IntegrationTests/ResolverSkipsConflictsFastSpecs.fs b/integrationtests/Paket.IntegrationTests/ResolverSkipsConflictsFastSpecs.fs
@@ -78,7 +78,7 @@ let ``#2922-1 paket can timeout out of loop of doom``() =
     | exn when exn.Message.Contains("TimeoutException") -> ()
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform("Net")>]

diff --git a/integrationtests/Paket.IntegrationTests/RestoreSpecs.fs b/integrationtests/Paket.IntegrationTests/RestoreSpecs.fs
@@ -19,7 +19,7 @@ let ``#2496 Paket fails on projects that target multiple frameworks``() =
         |> ignore
 
 [<Test>]
-#if NETCOREAPP2_0
+#if FAKE_NETSTANDARD_API
 [<Ignore("use an api of FakeLib (net40) unsupported on .net core")>]
 #endif
 let ``#2812 Lowercase package names in package cache: old csproj, packages folder enabled``() =

diff --git a/tests/Paket.Tests.preview3/Paket.Tests.fsproj b/tests/Paket.Tests.preview3/Paket.Tests.fsproj
@@ -2,7 +2,13 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <PaketTestsSourcesDir>..\Paket.Tests</PaketTestsSourcesDir>
-    <DefineConstants>WEBPROXY_NETSTANDARD;$(DefineConstants)</DefineConstants>
+    <DefineConstants>
+      WEBPROXY_NETSTANDARD;
+      TESTSUITE_RUNS_ON_DOTNETCORE;
+      NO_UNIT_PLATFORMATTRIBUTE;
+      NO_UNIT_TIMEOUTATTRIBUTE;
+      @(DefineConstants)
+    </DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs b/tests/Paket.Tests/InstallModel/Xml/FSharp.Data.SqlClient.fs
@@ -28,7 +28,7 @@ let expected = """
 </Choose>"""
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
 [<Flaky>]
 #endif
 let ``should generate Xml for FSharp.Data.SqlClient 1.4.4``() = 

diff --git a/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs b/tests/Paket.Tests/InstallModel/Xml/GitInfoPlanter.fs
@@ -17,7 +17,7 @@ let expectedPropertyNodes = """<?xml version="1.0" encoding="utf-16"?>
 <Import Project="..\..\..\GitInfoPlanter\build\GitInfoPlanter.targets" Condition="Exists('..\..\..\GitInfoPlanter\build\GitInfoPlanter.targets')" Label="Paket" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />"""
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
 [<Flaky>]
 #endif
 let ``should generate Xml for GitInfoPlanter2.0.0``() = 

diff --git a/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs b/tests/Paket.Tests/InstallModel/Xml/StyleCop.MSBuild.fs
@@ -14,7 +14,7 @@ let expectedPropertyNodes = """<?xml version="1.0" encoding="utf-16"?>
 <Import Project="..\..\..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets')" Label="Paket" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />"""
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
 [<Flaky>]
 #endif
 let ``should generate Xml for StyleCop.MSBuild``() = 

diff --git a/tests/Paket.Tests/NuGetConfig/NuGetConfigSpecs.fs b/tests/Paket.Tests/NuGetConfig/NuGetConfigSpecs.fs
@@ -13,7 +13,7 @@ open Chessie.ErrorHandling
 open System.Xml
 open TestHelpers
 
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
 open System.Runtime.InteropServices
 #endif
 
@@ -26,7 +26,7 @@ let parse fileName =
 [<Test>]
 let ``can detect encrypted passwords in nuget.config``() = 
 
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
     if not(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) then
         //TODO not create a secrect, just check the parse fails with an error
         Assert.Ignore("ProtectedData.Protect is supported only on windows")

diff --git a/tests/Paket.Tests/Resolver/ResolverErrorSituationTests.fs b/tests/Paket.Tests/Resolver/ResolverErrorSituationTests.fs
@@ -68,7 +68,7 @@ let graph1 =
   ]
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_TIMEOUTATTRIBUTE
 [<Ignore "TimeoutAttribute not supported by netstandard NUnit">]
 #else
 [<Timeout 5000>]
@@ -263,7 +263,7 @@ let ``task priorization works``() =
     cts.Cancel()
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_TIMEOUTATTRIBUTE
 [<Ignore "TimeoutAttribute not supported by netstandard NUnit">]
 #else
 [<Timeout 5000>]
@@ -322,7 +322,7 @@ let ``cancellation fsharp.core``() =
     with :? AggregateException as agg -> ()
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_TIMEOUTATTRIBUTE
 [<Ignore "TimeoutAttribute not supported by netstandard NUnit">]
 #else
 [<Timeout 5000>]

diff --git a/tests/Paket.Tests/UtilsSpecs.fs b/tests/Paket.Tests/UtilsSpecs.fs
@@ -68,7 +68,7 @@ let ``relative path with local identifier on unxoid systems``() =
     |> shouldEqual (RelativePath "./Store")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform "Mono">]
@@ -78,7 +78,7 @@ let ``mono runtime reported on mono platform``() =
     shouldEqual true
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform "Net">]

diff --git a/tests/Paket.Tests/Versioning/ConfigFileSpecs.fs b/tests/Paket.Tests/Versioning/ConfigFileSpecs.fs
@@ -6,7 +6,7 @@ open NUnit.Framework
 open System.Xml
 open FsUnit
 
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
 open System.Runtime.InteropServices
 #endif
 
@@ -23,7 +23,7 @@ let sampleDoc() =
 [<Test>]
 let ``get username, password, and auth type from node``() = 
 
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
     if not(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) then
         Assert.Ignore("Encrypt use ProtectedData.Protect that is supported only on windows")
 #endif
@@ -45,7 +45,7 @@ let ``get username, password, and auth type from node``() =
 [<Test>]
 let ``get username and password from node without auth type``() = 
 
-#if NETCOREAPP2_0
+#if TESTSUITE_RUNS_ON_DOTNETCORE
     if not(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) then
         Assert.Ignore("Encrypt use ProtectedData.Protect that is supported only on windows")
 #endif