Paket.dependencies: Allow Paket.Core to be in pre-release version to …

…get the integration-tests pass. (#2791) * Paket.dependencies: We have to allow Paket.Core to be in pre-release version to get the integration-tests pass. * unit-test was assuming line-numbers which increased by one due to previous commit
fsprojects · Jul 29, 2024 · 55c4409 · 55c4409
1 parent accd2f4
commit 55c4409
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 14 deletions.
diff --git a/integrationtests/core-no-dependencies-hello-world/before/paket.dependencies b/integrationtests/core-no-dependencies-hello-world/before/paket.dependencies
@@ -6,4 +6,5 @@ source https://api.nuget.org/v3/index.json
 source https://ci.appveyor.com/nuget/fake
 
 nuget Fake.Runtime prerelease
-nuget FSharp.Core prerelease
+nuget FSharp.Core prerelease
+nuget Paket.Core prerelease
diff --git a/...ationtests/core-reference-assemblies-net60101-rollforward/before/reference-assemblies.fsx b/...ationtests/core-reference-assemblies-net60101-rollforward/before/reference-assemblies.fsx
@@ -3,7 +3,8 @@ storage: none
 source https://api.nuget.org/v3/index.json
 source ../../../release/dotnetcore
 nuget Fake.Runtime prerelease
-nuget FSharp.Core prerelease"
+nuget FSharp.Core prerelease
+nuget Paket.Core prerelease"
 
 open Fake.Runtime
 

diff --git a/integrationtests/core-reference-assemblies-net60101/before/reference-assemblies.fsx b/integrationtests/core-reference-assemblies-net60101/before/reference-assemblies.fsx
@@ -3,7 +3,8 @@ storage: none
 source https://api.nuget.org/v3/index.json
 source ../../../release/dotnetcore
 nuget Fake.Runtime prerelease
-nuget FSharp.Core prerelease"
+nuget FSharp.Core prerelease
+nuget Paket.Core prerelease"
 
 open Fake.Runtime
 

diff --git a/integrationtests/core-reference-fake-core-targets/before/reference_fake-targets.fsx b/integrationtests/core-reference-fake-core-targets/before/reference_fake-targets.fsx
@@ -5,7 +5,8 @@ source ../../../release/dotnetcore
 
 nuget Fake.Core.Target prerelease
 nuget System.Reactive.Compatibility
-nuget FSharp.Core prerelease"
+nuget FSharp.Core prerelease
+nuget Paket.Core prerelease"
 #endif
 
 printfn "before load"

diff --git a/integrationtests/core-reference-fake-runtime/before/reference_fake-runtime.fsx b/integrationtests/core-reference-fake-runtime/before/reference_fake-runtime.fsx
@@ -6,7 +6,8 @@ source ../../../release/dotnetcore
 //source https://ci.appveyor.com/nuget/paket
 
 nuget Fake.Runtime prerelease
-nuget FSharp.Core prerelease"
+nuget FSharp.Core prerelease
+nuget Paket.Core prerelease"
 #endif
 #load ".fake/reference_fake-runtime.fsx/intellisense.fsx"
 

diff --git a/integrationtests/core-simple-failed-to-compile/before/fail-to-compile.fsx b/integrationtests/core-simple-failed-to-compile/before/fail-to-compile.fsx
@@ -5,7 +5,8 @@ source ../../../release/dotnetcore
 //source https://ci.appveyor.com/nuget/paket
 
 nuget Fake.Runtime prerelease
-nuget FSharp.Core prerelease"
+nuget FSharp.Core prerelease
+nuget Paket.Core prerelease"
 #endif
 open klajsdhgfasjkhd
 

diff --git a/integrationtests/core-simple-runtime-error/before/runtime-error.fsx b/integrationtests/core-simple-runtime-error/before/runtime-error.fsx
@@ -5,6 +5,7 @@
 #r "paket: //source https://ci.appveyor.com/nuget/paket"
 #r "paket: nuget Fake.Runtime prerelease"
 #r "paket: nuget FSharp.Core prerelease"
+#r "paket: nuget Paket.Core prerelease"
 #endif
 
 // Issue https:/fsharp/FAKE/issues/2121

diff --git a/integrationtests/core-use-external-paket-dependencies/before/paket.dependencies b/integrationtests/core-use-external-paket-dependencies/before/paket.dependencies
@@ -5,4 +5,5 @@ source ../../../release/dotnetcore
 
 nuget Fake.Runtime prerelease
 nuget FSharp.Core prerelease
-nuget Microsoft.NETCore.App
+nuget Microsoft.NETCore.App
+nuget Paket.Core prerelease
diff --git a/paket.dependencies b/paket.dependencies
@@ -55,7 +55,7 @@ group fakemodule
  nuget FParsec
  nuget Octokit
  nuget Newtonsoft.Json
- nuget Paket.Core 8.1.0-alpha004
+ nuget Paket.Core prerelease
  nuget NuGet.Protocol
  nuget NuGet.Packaging
  nuget Mono.Cecil prerelease

diff --git a/src/test/Fake.Core.IntegrationTests/SimpleHelloWorldTests.fs b/src/test/Fake.Core.IntegrationTests/SimpleHelloWorldTests.fs
@@ -249,7 +249,7 @@ let tests =
  "Expected correct declaration of 'Start'"
  { Declaration.Empty with
  File = scriptFile
- Line = 36 }
+ Line = 37 }
  startTarget.Declaration
 
  Expect.equal "Expected correct hard dependencies of 'Start'" [] startTarget.HardDependencies
@@ -261,7 +261,7 @@ let tests =
  "Expected correct declaration of 'TestTarget'"
  { Declaration.Empty with
  File = scriptFile
- Line = 38 }
+ Line = 39 }
  testTarget.Declaration
 
  Expect.equal
@@ -270,7 +270,7 @@ let tests =
  Declaration =
  { Declaration.Empty with
  File = scriptFile
- Line = 45 } } ]
+ Line = 46 } } ]
  testTarget.HardDependencies
 
  Expect.equal "Expected correct description of 'TestTarget'" "" testTarget.Description

diff --git a/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs b/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs
@@ -6,16 +6,18 @@ open Expecto
 
 [<Tests>]
 let tests =
- let flagsTestCase name changeBuildArgs expected =
+ let flagsTestCase name changeBuildArgs (expected: string) =
  testCase name
  <| fun _ ->
  let _, cmdLine = MSBuild.buildArgs changeBuildArgs
 
  let expected =
+ let trimmed = expected.Trim()
+
  if BuildServer.ansiColorSupport then
- $"%s{expected} /clp:ForceConsoleColor".Trim()
+ $"%s{trimmed} /clp:ForceConsoleColor".Trim()
  else
- expected.Trim()
+ trimmed
 
  let expected = $"/m /nodeReuse:False {expected} /p:RestorePackages=False".Trim()