update release build scripts

Author: r-Larch

MouseTrap.sln

@@ -3,12 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseTrap", "MouseTrap\MouseTrap.csproj", "{7D3F74F8-5F37-4CC2-A82C-64669E4B3AB3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseTrap", "MouseTrap\MouseTrap.csproj", "{7D3F74F8-5F37-4CC2-A82C-64669E4B3AB3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02A88C37-94A2-41A9-82FD-D279583D03D6}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
-		build\Build-Release.ps1 = build\Build-Release.ps1
+		build\Create-Artifacts.ps1 = build\Create-Artifacts.ps1
 		README.md = README.md
 	EndProjectSection
 EndProject

MouseTrap/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using MouseTrap;
 
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("LarchSys")]
 [assembly: AssemblyProduct(App.Name)]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

MouseTrap/choco/MouseTrap.nuspec

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package>
   <metadata>
     <id>MouseTrap</id>
-    <version>1.0.1</version>
+    <version>0.0.0</version>
     <title>MouseTrap DPI aware mouse move across screens</title>
     <tags>multiscreen mouse-pointer screen-scale dpi-awareness dpi-scaling cursor-moves cursor-position</tags>
     <summary>A small tool to map the cursor between monitors with different DPIs</summary>
@@ -14,66 +14,36 @@ different resolutions and scaling settings.
 
 ## Min requirements
 
-This tool needs the dpiAwareness api `PerMonitorV2` first introduced in **Windows 10 Creators update**.
-So **for this tool to function correctly** you should have at least **Windows build 1703**
+For this tool to function correctly you should have:
+
+ - At least **Windows 10 Creators update** (Build 1703)
+ - [**.NET 5 Runtime**](https://dotnet.microsoft.com/download/dotnet/current/runtime) (in most cases it will notify you if the runtime is missing)
 
 ## Usage and Configuration
 
 Here you can find the [documentation](https://github.com/r-Larch/MouseTrap/blob/master/README.md).
     </description>
     <authors>René Larch</authors>
     <owners>René Larch</owners>
-    <copyright>Copyright 2019 René Larch</copyright>
+    <copyright>Copyright 2020 René Larch</copyright>
     <licenseUrl>https://github.com/r-Larch/MouseTrap/blob/master/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/r-Larch/MouseTrap</projectUrl>
     <projectSourceUrl>https://github.com/r-Larch/MouseTrap</projectSourceUrl>
     <bugTrackerUrl>https://github.com/r-Larch/MouseTrap/issues</bugTrackerUrl>
     <docsUrl>https://github.com/r-Larch/MouseTrap/blob/master/README.md</docsUrl>
     <iconUrl>https://raw.githubusercontent.com/r-Larch/MouseTrap/master/MouseTrap/AppIcon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>eb517c3 update setup.cmd
-7ddbf15 makes ScreensView able to handle negative screen coordinates
-e3ac5f0 remove useless dispose
-135c8f9 fixes #1 Unhandled exception while user is logging in.
-f3b141c v1.0.0-beta binarys
-37bde46 Update v1.0.0-beta
-a53dee1 fixes countless issues and makes app more stable
-245377b requireAdministrator
-1ed14d9 added logger
-7a5957c Update v1.0.0-beta
-36bb4c2 fixed: Cursor gets trapped on one screen after switching between windows running under different users
-01ccabe fix issues in .nuspec
-a764c94 v1.0.0-beta binarys
-02f2e04 Update v1.0.0-beta
-8bbb1db let worker thread be a background thread
-3bb1efe added choco icon
-4e01838 v1.0.0-beta binarys
-758dcf3 Update v1.0.0-beta
-79350d4 set thread priority higher so moves smooth even if all CPU cores are at 100%
-dfbc0ff added VERIFICATION.txt for choco
-d242fc2 Update README.md
-d73d400 update README.md with choco instractions
-86f2af8 v1.0.0-beta binarys
-882cd8c Release v1.0.0-beta
-c3fd99d update build script to auto create choco nupkg
-cbfdeda update build script
-b84836c added nuspec for choco
-13e044a update README.md
-b8cf831 fix setup.cmd
-29515fc add build script
-7fc64c1 auto reload screen configs on SystemEvents.DisplaySettingsChanged
-8cfbf03 fix some potentional exceptions in edge cases
-4b731b1  fix spelling
-89a35ab updated README.md</releaseNotes>
+    <releaseNotes>...</releaseNotes>
     <dependencies>
       <!--<dependency id="" version=""/>-->
     </dependencies>
   </metadata>
   <files>
     <file src="..\..\LICENSE.txt" />
     <file src="..\..\VERIFICATION.txt" />
-    <file src="..\bin\*.dll" target="tools" />
-    <file src="..\bin\*.exe" target="tools" />
+    <file src="..\bin\net5.0-windows\*.dll" target="tools" />
+    <file src="..\bin\net5.0-windows\*.exe" target="tools" />
+    <file src="..\bin\net5.0-windows\*.runtimeconfig.json" target="tools" />
     <file src="*.ps1" target="tools" />
   </files>
 </package>

MouseTrap/src/Forms/ConfigFrom.Designer.cs

@@ -39,6 +39,10 @@ public DiagnosticForm(ServiceThread service)
             this.BtnCopy.Click += delegate {
                 var sb = new StringBuilder();
 
+                // update log infos
+                LogfileBox.Text = string.Empty;
+                InitLogFileInfos();
+
                 sb.AppendLine(InfosBox.Text);
                 sb.AppendLine();
                 sb.AppendLine();

MouseTrap/src/Forms/DiagnosticForm.cs

@@ -8,8 +8,10 @@ different resolutions and scaling settings.
 
 ## Min requirements
 
-This tool needs the dpiAwareness API `PerMonitorV2` first introduced in **Windows 10 Creators update**.<br>
-So **for this tool to function correctly** you should have at least **Windows build 1703**
+For this tool to function correctly you should have:
+
+ - At least **Windows 10 Creators update** (Build 1703)
+ - [**.NET 5 Runtime**](https://dotnet.microsoft.com/download/dotnet/current/runtime) (in most cases it will notify you if the runtime is missing)
 
 
 ## Download and Setup
@@ -20,7 +22,7 @@ You can find the latest release here:
 You can install MouseTrap with **chocolatey**:
 ```Powershell
 # install the package
-choco install mousetrap --version 1.0.2
+choco install mousetrap
 
 # running it
 mousetrap
@@ -34,6 +36,21 @@ mousetrap
 >```
 >*[Why Chocolatey](https://chocolatey.org/docs/why) + [installation](https://chocolatey.org/docs/installation)*
 
+
+## Changelog
+
+### Version 1.0.6
+
+ - **Migrate to .NET 5** _(from legacy .NET Framework)_
+ - Adds **Diagnostic Window**
+   - Realtime Log Viewer
+   - Configutation Viewer
+   - LogFile Viewer
+ - Implements a **potential fix** for **[#2 Unexpected Cursor Teleportation](https://github.com/r-Larch/MouseTrap/issues/2)**
+ - Adds an option to **disable Mouse teleportation** - That's usefull while gaming in fullscreen!
+ - Lots of smaller bugfixes
+
+
 ## Usage and Configuration
 
 You can always find your running **MouseTrap** app as a system-tray icon in the right corner of your Taskbar.

README.md

@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 version: 1.0.{build}
 configuration: Release
@@ -24,10 +24,10 @@ build:
   project: MouseTrap.sln
 
 after_build:
-- ps: .\build\Build-Release.ps1 $env:appveyor_build_version
+- ps: .\build\Create-Artifacts.ps1 $env:appveyor_build_version
 
 artifacts:
-- path: MouseTrap\bin\*.exe
+- path: MouseTrap\bin\*.zip
 - path: MouseTrap\bin\*.nupkg
 
 deploy:
@@ -36,9 +36,12 @@ deploy:
   prerelease: true
   draft: false
   description: |
-    MouseTrap.exe is a portable executable.
-    Download and copy it to some safe place (where you don't delete it by mistake)
-    and double click it to run.
+    MouseTrap is a portable application.
+    Download the *.zip archive and extract it to some safe place (where you don't delete it by mistake)
+    and double click mousetrap.exe to run it.
+
+    Please download and install [**.NET 5 Runtime**](https://dotnet.microsoft.com/download/dotnet/current/runtime)
+    if you have trouble running it (in most cases it will notify you with a simple message dialog).
 
     [Documentation + Help](https://github.com/r-Larch/MouseTrap/blob/master/README.md)
 

appveyor.yml

@@ -22,9 +22,10 @@ $DistFolder   = [System.IO.Path]::Combine($Root, "dist");
 $TempFolder   = [System.IO.Path]::Combine($Root, "temp");
 $ReadmeFile   = [System.IO.Path]::Combine($Root, "README.md");
 $ProjectRoot  = [System.IO.Path]::Combine($Root, "MouseTrap");
+$BuildDir     = [System.IO.Path]::Combine($ProjectRoot, "bin\net5.0-windows");
 $OutputDir    = [System.IO.Path]::Combine($ProjectRoot, "bin");
-$chocoNuspec  = [System.IO.Path]::Combine($ProjectRoot, "choco/MouseTrap.nuspec");
-$AssemblyInfo = [System.IO.Path]::Combine($ProjectRoot, "Properties/AssemblyInfo.cs");
+$chocoNuspec  = [System.IO.Path]::Combine($ProjectRoot, "choco\MouseTrap.nuspec");
+$AssemblyInfo = [System.IO.Path]::Combine($ProjectRoot, "Properties\AssemblyInfo.cs");
 
 $GithubGetRepoApi = "https://api.github.com/repos/r-Larch/MouseTrap";
 
@@ -120,6 +121,18 @@ function Main() {
 	# Zip $OutputDir "$DistFolder\MouseTrap.$ReleaseVersionNumber.zip";
 
 
+	# Release Artifact ==================
+
+	CleanDir $TempFolder;
+	[System.IO.Directory]::CreateDirectory($TempFolder);
+	Copy-Item "$([System.IO.Path]::Combine($BuildDir, "*.exe"))" "$TempFolder\";
+	Copy-Item "$([System.IO.Path]::Combine($BuildDir, "*.dll"))" "$TempFolder\";
+	Copy-Item "$([System.IO.Path]::Combine($BuildDir, "*.pdb"))" "$TempFolder\";
+	Copy-Item "$([System.IO.Path]::Combine($BuildDir, "*.runtimeconfig.json"))" "$TempFolder\";
+	Zip $TempFolder "$OutputDir\MouseTrap.$ReleaseVersionNumber.zip";
+	CleanDir $TempFolder;
+
+
 	# choco =============================
 
 	ChocoPack $chocoNuspec $OutputDir;
@@ -131,10 +144,6 @@ function Main() {
 	#[Git]::Stage("$DistFolder\MouseTrap.$ReleaseVersionNumber.nupkg");
 	#[Git]::Commit("$tag binarys");
 
-
-	# cleanup =============================
-
-	CleanDir $TempFolder;
 }