Update version to 0.3.2

Author: jwosty

.github/workflows/ci.yml

@@ -28,8 +28,8 @@ jobs:
         path: artifacts
     - name: Test
       run: |
-        dotnet fake build -t Test
-        dotnet fake build -t BuildTemplateProjects
+        dotnet fake build -t Test -- Release
+        dotnet fake build -t BuildTemplateProjects -- Release
 
   build-macos:
     name: CI (macOS)
@@ -56,15 +56,15 @@ jobs:
         dotnet tool restore
         dotnet paket restore
     - name: Build
-      run: dotnet fake build
+      run: dotnet fake build -- Release
     - name: Pack
-      run: dotnet fake build -t PackAll
+      run: dotnet fake build -t PackAll -- Release
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
         name: interstellar-macos
         path: artifacts/
     - name: Test
       run: |
-        dotnet fake build -t Test
-        dotnet fake build -t BuildTemplateProjects
+        dotnet fake build -t Test -- Release
+        dotnet fake build -t BuildTemplateProjects -- Release

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.2
+
+* WinForms, WPF - Fix a bug that happens under Windows high-DPI mode
+* Change targets to netcoreapp3.1
+
 ## 0.3.1
 
 * WinForms - Fixed an issue that could cause apps to crash at startup in release mode (https://github.com/jwosty/Interstellar/issues/10 ; thanks to @amaitland for the fix)

build.fsx

@@ -2,7 +2,6 @@
 #load ".fake/build.fsx/intellisense.fsx"
 #endif
 
-// F# 4.7 due to https://github.com/fsharp/FAKE/issues/2001
 #r "paket:
 nuget FSharp.Core 6.0.4
 nuget Fake.Core.Target
@@ -122,13 +121,18 @@ let projects = [
     if Environment.isMacOS then yield! [Projects.macosWkLib; Projects.macosWkFFLib]
 ]
 
-let msbuild setParams project =
-    let buildMode = Environment.environVarOrDefault "buildMode" "Release"
+let buildMode (args: TargetParameter) =
+    args.Context.Arguments
+    |> List.tryPick (fun x -> if x.ToLower() = "debug" then Some x else None)
+    |> Option.defaultValue "Release"
+
+let msbuild args setParams project =
+    // let buildMode = Environment.environVarOrDefault "buildMode" "Release"
     let commit = Git.Information.getCurrentSHA1 __SOURCE_DIRECTORY__
     project |> MSBuild.build (
         quiet <<
         setParams <<
-        addProperties ["Configuration", buildMode; "RepositoryCommit", commit] <<
+        addProperties ["Configuration", buildMode args; "RepositoryCommit", commit] <<
         addVersionInfo currentVersionInfo << setParams
     )
 
@@ -148,7 +152,7 @@ let getNupkgPath version (projPath: string) =
     Path.Combine ([|projDir; "bin"; "Release";
                     sprintf "%s%s.nupkg" (Path.GetFileNameWithoutExtension projPath) vstr|])
 
-Target.create "Clean" (fun _ ->
+Target.create "Clean" (fun args ->
     Trace.log " --- Cleaning --- "
     for (proj, projStyle) in projects do
         let vstr = currentVersionInfo.versionName
@@ -159,7 +163,7 @@ Target.create "Clean" (fun _ ->
         else if Environment.isMacOS then [ yield Solutions.macos; for (p,_) in Templates.macosProjects -> p ]
         else []
     for proj in projects do
-        msbuild (addTarget "Clean") proj
+        msbuild args (addTarget "Clean") proj
     Shell.deleteDir ".fsdocs"
     Shell.deleteDir "output"
     Shell.deleteDir "temp"
@@ -221,21 +225,21 @@ Target.create "UpdateAssemblyInfo" (fun _ ->
     File.WriteAllText (asmInfoPath, result)
 )
 
-Target.create "Build" (fun _ ->
+Target.create "Build" (fun args ->
     Trace.log " --- Building --- "
     // if Environment.isWindows then
     //     msbuild (addTarget "Restore") Solutions.windows
     // else
     //     msbuild (addTarget "Restore") Solutions.macos
     if Environment.isWindows then
-        msbuild (addTarget "Build") (fst Projects.winFormsLib)
-        msbuild (addTarget "Build") (fst Projects.wpfLib)
+        msbuild args (addTarget "Build") (fst Projects.winFormsLib)
+        msbuild args (addTarget "Build") (fst Projects.wpfLib)
     else if Environment.isMacOS then
         // this is so very strange that we have to treat them differently like so...
         // macosWkLib needs the `msbuild /restore` for whatever reason because it's an SDK-style project...
-        msbuild (doRestore) (fst Projects.macosWkLib)
+        msbuild args (doRestore) (fst Projects.macosWkLib)
         // but this one needs the `dotnet restore *.sln` somehow because it's not an SDK-style project!
-        msbuild id (fst Projects.macosWkFFLib)
+        msbuild args id (fst Projects.macosWkFFLib)
         // this makes zero sense, but alright... seriously, what the heck? You try changing those around and see msbuild/dotnet scream
         // at you
 )
@@ -263,15 +267,15 @@ Target.create "ReleaseDocs" (fun _ ->
     Git.Branches.pushBranch "temp/gh-pages" "origin" "gh-pages"
 )
 
-Target.create "Pack" (fun _ ->
+Target.create "Pack" (fun args ->
     Trace.log " --- Packing NuGet packages --- "
     let props = ["SolutionDir", __SOURCE_DIRECTORY__]
     Trace.log (sprintf "PROJECT LIST: %A" projects)
     for (proj, projStyle) in projects do
         match projStyle with
         | ProjectStyle.Sdk ->
             Trace.log (sprintf "Packing %s (sdk-style project)" proj)
-            msbuild (addTargets ["Pack"] << addProperties props) proj
+            msbuild args (addTargets ["Pack"] << addProperties props) proj
             // Collect all generated package archives into a common folder
             let vstr = currentVersionInfo.versionName
             let oldNupkgPath = getNupkgPath (Some vstr) proj
@@ -299,7 +303,7 @@ Target.create "Pack" (fun _ ->
     |> Seq.iter (``Nupkg-hack``.hackNupkgAtPath)
 )
 
-Target.create "BuildTemplateProjects" (fun _ ->
+Target.create "BuildTemplateProjects" (fun args ->
     Trace.log " --- Building template projects --- "
     if Environment.isWindows then
         let p = [ yield! Templates.winProjects ]
@@ -310,10 +314,10 @@ Target.create "BuildTemplateProjects" (fun _ ->
     else if Environment.isMacOS then
         let p = [ yield! Templates.macosProjects ]
         for (proj, projStyle) in p do
-            msbuild (addTarget "Restore") proj
+            msbuild args (addTarget "Restore") proj
             // DotNet.restore id proj
         for (proj, projStyle) in p do
-            msbuild (addTarget "Build") proj
+            msbuild args (addTarget "Build") proj
 )
 
 Target.create "PackTemplates" (fun _ ->
@@ -367,4 +371,4 @@ open Fake.Core.TargetOperators
     ==> "BuildTemplateProjects"
 
 // *** Start Build ***
-Target.runOrDefault "Build"
+Target.runOrDefaultWithArguments "Build"

src/Interstellar.MacOS.WebKit.FullFramework/AssemblyInfo.fs

@@ -20,9 +20,9 @@ open System.Runtime.CompilerServices
 
 // The assembly version has the format {Major}.{Minor}.{Build}.{Revision}
 
-[<assembly: AssemblyVersion("0.3.1")>]
-[<assembly: AssemblyInformationalVersion("0.3.1")>]
-[<assembly: AssemblyFileVersion("0.3.1.0")>]
+[<assembly: AssemblyVersion("0.3.2")>]
+[<assembly: AssemblyInformationalVersion("0.3.2")>]
+[<assembly: AssemblyFileVersion("0.3.2.0")>]
 
 //[<assembly: AssemblyDelaySign(false)>]
 //[<assembly: AssemblyKeyFile("")>]

templates/minimal/src/InterstellarApp.Core/InterstellarApp.Core.fsproj

@@ -7,6 +7,6 @@
     <Compile Include="Library.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Interstellar.Core" Version="0.3.1" />
+    <PackageReference Include="Interstellar.Core" Version="0.3.2" />
   </ItemGroup>
 </Project>

templates/minimal/src/InterstellarApp.Windows/InterstellarApp.Windows.fsproj

@@ -12,7 +12,7 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Interstellar.Wpf.Chromium" Version="0.3.1" />
+    <PackageReference Include="Interstellar.Wpf.Chromium" Version="0.3.2" />
     <PackageReference Include="CefSharp.Wpf" Version="86.0.241" />
   </ItemGroup>
   <ItemGroup>

templates/minimal/src/InterstellarApp.macOS/InterstellarApp.macOS.fsproj

@@ -46,10 +46,10 @@
     <ProjectReference Include="..\InterstellarApp.Core\InterstellarApp.Core.fsproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Interstellar.Core" Version="0.3.1">
+    <PackageReference Include="Interstellar.Core" Version="0.3.2">
       <GeneratePathProperty></GeneratePathProperty>
     </PackageReference>
-    <PackageReference Include="Interstellar.macOS.WebKit" Version="0.3.1">
+    <PackageReference Include="Interstellar.macOS.WebKit" Version="0.3.2">
       <GeneratePathProperty></GeneratePathProperty>
     </PackageReference>
   </ItemGroup>