Merge remote-tracking branch 'origin/master' into websharper61

rbauduin · Nov 28, 2022 · f0d134d · f0d134d
2 parents bc03a16 + 043018d
commit f0d134d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build.fsx b/build.fsx
@@ -181,8 +181,9 @@ Target.create "RunCompilerTestsRelease" <| fun _ ->
 
     [
         //"tests/WebSharper.Compiler.FSharp.Tests/WebSharper.Compiler.FSharp.Tests.fsproj"
-        "tests/WebSharper.Core.JavaScript.Tests/WebSharper.Core.JavaScript.Tests.fsproj"
-        "tests/WebSharper.CSharp.Analyzer.Tests/WebSharper.CSharp.Analyzer.Tests.fsproj"
+        yield "tests/WebSharper.Core.JavaScript.Tests/WebSharper.Core.JavaScript.Tests.fsproj"
+        if System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform System.Runtime.InteropServices.OSPlatform.Windows then 
+            yield "tests/WebSharper.CSharp.Analyzer.Tests/WebSharper.CSharp.Analyzer.Tests.fsproj"
     ]
     |> List.iter (
         DotNet.test (fun t ->
@@ -216,7 +217,7 @@ Target.create "RunSPATestsRelease" <| fun _ ->
     //    failwith "Chutzpah test run failed for SPA tests"
 
 Target.create "RunMainTestsRelease" <| fun _ ->
-    if Environment.environVarAsBoolOrDefault "SKIP_CORE_TESTING" false then
+    if Environment.environVarAsBoolOrDefault "SKIP_CORE_TESTING" false || not <| System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform System.Runtime.InteropServices.OSPlatform.Windows then
         Trace.log "Chutzpah testing skipped"
     else
 

diff --git a/msbuild/WebSharper.FSharp.Internal.targets b/msbuild/WebSharper.FSharp.Internal.targets
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(WebSharperRunCompiler)' == 'True' ">
     <WebSharperTaskAssembly Condition=" '$(WebSharperTaskAssembly)' == ''">$(Root)/build/$(Configuration)/FSharp/netstandard2.0/WebSharper.MSBuild.FSharp.dll</WebSharperTaskAssembly>
     <WebSharperToolPath Condition=" '$(WebSharperToolPath)' == '' AND '$(OS)' == 'Windows_NT' ">$(Root)/build/$(Configuration)/FSharp/net6.0/wsfsc.exe</WebSharperToolPath>
-    <WebSharperToolPath Condition=" '$(WebSharperToolPath)' == '' AND '$(OS)' == 'Windows_NT' ">$(Root)/build/$(Configuration)/FSharp/net6.0/wsfsc.exe</WebSharperToolPath>
+    <WebSharperToolPath Condition=" '$(WebSharperToolPath)' == '' AND '$(OS)' != 'Windows_NT' ">$(Root)/build/$(Configuration)/FSharp/net6.0/wsfsc.sh</WebSharperToolPath>
     <WebSharperSourceMap>True</WebSharperSourceMap>
     <WebSharperConfigFile Condition=" '$(WebSharperConfigFile)' == '' AND Exists('$(MSBuildProjectDirectory)/wsconfig.$(MSBuildProjectName).json') ">$(MSBuildProjectDirectory)/wsconfig.$(MSBuildProjectName).json</WebSharperConfigFile>
     <WebSharperConfigFile Condition=" '$(WebSharperConfigFile)' == '' AND Exists('$(MSBuildProjectDirectory)/wsconfig.json') ">$(MSBuildProjectDirectory)/wsconfig.json</WebSharperConfigFile>

diff --git a/src/compiler/WebSharper.Compiler.FSharp/Compile.fs b/src/compiler/WebSharper.Compiler.FSharp/Compile.fs
@@ -87,7 +87,9 @@ let Compile (config : WsConfig) (warnSettings: WarnSettings) (logger: LoggerBase
             config.CompilerArgs 
             |> Array.map (fun s -> 
                 s.Replace(@"net6.0\.NETCoreApp,Version=v6.0.AssemblyAttributes.fs", 
-                    @"netstandard2.0\.NETStandard,Version=v2.0.AssemblyAttributes.fs")
+                    @"netstandard2.0\.NETStandard,Version=v2.0.AssemblyAttributes.fs"
+                    ).Replace(@"net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.fs", 
+                        @"netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.fs")
             )
         File.WriteAllLines(mainProxiesFile, fixedArgs)
         MakeDummyDll config.AssemblyFile thisName