Skip to content

Commit

Permalink
scripts/sanitycheck: respect sln location chenges
Browse files Browse the repository at this point in the history
  • Loading branch information
Mersho committed Oct 17, 2023
1 parent 265b103 commit 58505a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions scripts/fsxHelper.fs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module FsxHelper =

let ScriptsDir = __SOURCE_DIRECTORY__ |> DirectoryInfo
let RootDir = Path.Combine(ScriptsDir.FullName, "..") |> DirectoryInfo
let SourceDir = Path.Combine(ScriptsDir.FullName, "../src/") |> DirectoryInfo
let NugetDir = Path.Combine (RootDir.FullName, ".nuget") |> DirectoryInfo
let NugetExe = Path.Combine (NugetDir.FullName, "nuget.exe") |> FileInfo
let NugetSolutionPackagesDir = Path.Combine(RootDir.FullName, "packages") |> DirectoryInfo
Expand Down
8 changes: 4 additions & 4 deletions scripts/sanitycheck.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -422,22 +422,22 @@ let SanityCheckNugetPackages () =
//let solutions = Directory.GetCurrentDirectory() |> DirectoryInfo |> findSolutions
//NOTE: we hardcode the solutions rather than the line above, because e.g. Linux OS can't build/restore iOS proj
let solutions =
FsxHelper.RootDir.EnumerateFiles().Where (
FsxHelper.SourceDir.EnumerateFiles().Where (
fun file ->

match Misc.GuessPlatform() with

// xbuild cannot build .NETStandard projects so we cannot build the non-Core parts:
| Misc.Platform.Linux when "msbuild" = Environment.GetEnvironmentVariable "BuildTool" ->
file.Name = "gwallet.linux.sln"
file.Name = "gwallet.linux-legacy.sln"

| Misc.Platform.Mac ->
file.Name = "gwallet.mac.sln"
file.Name = "gwallet.mac-legacy.sln"

| _ (* stockmono linux and windows *) ->

// TODO: have a windows solution file
file.Name = "gwallet.core.sln"
file.Name = "gwallet.core-legacy.sln"
)
for sol in solutions do
sanityCheckNugetPackagesFromSolution sol
Expand Down

0 comments on commit 58505a2

Please sign in to comment.