chg the build script to also run the test suite for net6.0-windows wi…

…th rid win-x86, to verify the fixes for calling convention of function pointers in #506
ericsink · Sep 18, 2022 · 5c6e952 · 5c6e952
1 parent b166926
commit 5c6e952
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,9 +4,9 @@
     <Copyright>Copyright 2014-2022 SourceGear, LLC</Copyright>
     <Company>SourceGear</Company>
     <Authors>Eric Sink</Authors>
-    <Version>2.1.2-pre20220916160911</Version>
-    <AssemblyVersion>2.1.2.1719</AssemblyVersion>
-    <FileVersion>2.1.2.1719</FileVersion>
+    <Version>2.1.2-pre20220918132332</Version>
+    <AssemblyVersion>2.1.2.1721</AssemblyVersion>
+    <FileVersion>2.1.2.1721</FileVersion>
     <Description>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite</Description>
     <ProviderLangVersion>10.0</ProviderLangVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>

diff --git a/build/Program.fs b/build/Program.fs
@@ -111,6 +111,11 @@ let main argv =
             let args = sprintf "run --framework=%s" tfm
             exec "dotnet" args (Path.Combine(top, "test_nupkgs", dir, "fake_xunit"))
 
+    if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then
+        let args = "run -f net6.0-windows -r win-x86 --no-self-contained"
+        exec "dotnet" args (Path.Combine(top, "test_nupkgs", "e_sqlite3", "fake_xunit"))
+        exec "dotnet" args (Path.Combine(top, "test_nupkgs", "e_sqlcipher", "fake_xunit"))
+
     printfn "generating push.bat"
     let bat = System.Collections.Generic.List<string>()
     for s in Directory.GetFiles(dir_nupkgs, "*.nupkg") do

diff --git a/test_nupkgs/e_sqlcipher/fake_xunit/e_sqlcipher_with_fake_xunit.csproj b/test_nupkgs/e_sqlcipher/fake_xunit/e_sqlcipher_with_fake_xunit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net6.0;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/test_nupkgs/e_sqlite3/fake_xunit/e_sqlite3_with_fake_xunit.csproj b/test_nupkgs/e_sqlite3/fake_xunit/e_sqlite3_with_fake_xunit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net6.0;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">