chore: fixed templates and pipeline (#2)

andrewbabbittdev · web-flow · commit 5444487059e8 · 2022-02-11T19:52:22.000-07:00
* Moving away from cswin32 due to dotnet-format bug.

* Cleaned up templates and sample
diff --git a/src/BlazorDesktop.Sample/.editorconfig b/src/BlazorDesktop.Sample/.editorconfig
diff --git a/src/BlazorDesktop.Sample/Data/WeatherForecast.cs b/src/BlazorDesktop.Sample/Data/WeatherForecast.cs
@@ -1,4 +1,8 @@
-﻿namespace BlazorDesktop.Data
+﻿// Licensed to the Blazor Desktop Contributors under one or more agreements.
+// The Blazor Desktop Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace BlazorDesktop.Data
 {
     public class WeatherForecast
     {
diff --git a/src/BlazorDesktop.Sample/Data/WeatherForecastService.cs b/src/BlazorDesktop.Sample/Data/WeatherForecastService.cs
@@ -1,4 +1,8 @@
-﻿namespace BlazorDesktop.Data
+﻿// Licensed to the Blazor Desktop Contributors under one or more agreements.
+// The Blazor Desktop Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace BlazorDesktop.Data
 {
     public class WeatherForecastService
     {
diff --git a/src/BlazorDesktop.Sample/Program.cs b/src/BlazorDesktop.Sample/Program.cs
@@ -1,4 +1,8 @@
-﻿using BlazorDesktop.Data;
+﻿// Licensed to the Blazor Desktop Contributors under one or more agreements.
+// The Blazor Desktop Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BlazorDesktop.Data;
 using BlazorDesktop.Hosting;
 using BlazorDesktop.Sample;
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/BlazorDesktop.Sample/appsettings.Development.json b/src/BlazorDesktop.Sample/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/src/BlazorDesktop.Sample/appsettings.json b/src/BlazorDesktop.Sample/appsettings.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/src/BlazorDesktop.Templates/BlazorDesktop.Templates.csproj b/src/BlazorDesktop.Templates/BlazorDesktop.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.0.3</PackageVersion>
+    <PackageVersion>1.0.4</PackageVersion>
     <PackageId>BlazorDesktop.Templates</PackageId>
     <Title>Blazor Desktop Templates</Title>
     <Authors>Andrew Babbitt</Authors>
diff --git a/src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/BlazorDesktop-CSharp.csproj b/src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/BlazorDesktop-CSharp.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorDesktop" Version="1.0.1" />
+    <PackageReference Include="BlazorDesktop" Version="1.0.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/appsettings.Development.json b/src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/appsettings.Development.json
@@ -1,9 +1,8 @@
 {
-  "DetailedErrors": true,
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   }
 }
diff --git a/src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/appsettings.json b/src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/appsettings.json
@@ -2,7 +2,7 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   }
 }
diff --git a/src/BlazorDesktop/BlazorDesktop.csproj b/src/BlazorDesktop/BlazorDesktop.csproj
@@ -28,9 +28,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIcon>nuget.png</PackageIcon>
     <RepositoryType>git</RepositoryType>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
-    <Version>1.0.1</Version>
+    <AssemblyVersion>1.0.4.0</AssemblyVersion>
+    <FileVersion>1.0.4.0</FileVersion>
+    <Version>1.0.4</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
@@ -48,10 +48,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="6.0.101-preview.11.2349" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.635-beta">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/BlazorDesktop/NativeMethods.txt b/src/BlazorDesktop/NativeMethods.txt
diff --git a/src/BlazorDesktop/Wpf/BlazorDesktopEventForwarder.cs b/src/BlazorDesktop/Wpf/BlazorDesktopEventForwarder.cs
@@ -2,8 +2,7 @@
 // The Blazor Desktop Contributors licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.Win32;
-using Windows.Win32.Foundation;
+using System.Runtime.InteropServices;
 
 namespace BlazorDesktop.Wpf;
 
@@ -42,7 +41,25 @@ public BlazorDesktopEventForwarder(IntPtr target)
     /// </summary>
     public void MouseDownDrag()
     {
-        PInvoke.ReleaseCapture();
-        PInvoke.SendMessage(new HWND(_target), WM_NCLBUTTONDOWN, HTCAPTION, 0);
+        ReleaseCapture();
+        SendMessage(_target, WM_NCLBUTTONDOWN, HTCAPTION, 0);
     }
+
+    /// <summary>
+    /// Sends the specified message to a window or windows. The SendMessage function calls the window procedure for the specified window and does not return until the window procedure has processed the message.
+    /// </summary>
+    /// <param name="hWnd">A handle to the window whose window procedure will receive the message.</param>
+    /// <param name="msg">The message to be sent.</param>
+    /// <param name="wParam">Additional message-specific information.</param>
+    /// <param name="lParam">Additional message-specific information.</param>
+    /// <returns>The return value specifies the result of the message processing; it depends on the message sent.</returns>
+    [DllImport("User32", ExactSpelling = true, EntryPoint = "SendMessageW", SetLastError = true)]
+    internal static extern nint SendMessage(IntPtr hWnd, uint msg, uint wParam, nint lParam);
+
+    /// <summary>
+    /// Releases the mouse capture from a window in the current thread and restores normal mouse input processing.
+    /// </summary>
+    /// <returns>If the function succeeds, the return value is true. If the function fails, the return value is false.</returns>
+    [DllImport("User32", ExactSpelling = true, SetLastError = true)]
+    internal static extern bool ReleaseCapture();
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-namespace BlazorDesktop.Data`
	`1`	`+// Licensed to the Blazor Desktop Contributors under one or more agreements.`
	`2`	`+// The Blazor Desktop Contributors licenses this file to you under the MIT license.`
	`3`	`+// See the LICENSE file in the project root for more information.`
	`4`	`+`
	`5`	`+namespace BlazorDesktop.Data`
`2`	`6`	`{`
`3`	`7`	`public class WeatherForecast`
`4`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`		`- "DetailedErrors": true,`
`3`	`2`	`"Logging": {`
`4`	`3`	`"LogLevel": {`
`5`	`4`	`"Default": "Information",`
`6`		`- "Microsoft.AspNetCore": "Warning"`
	`5`	`+ "Microsoft.Hosting.Lifetime": "Information"`
`7`	`6`	`}`
`8`	`7`	`}`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"Logging": {`
`3`	`3`	`"LogLevel": {`
`4`	`4`	`"Default": "Information",`
`5`		`- "Microsoft.AspNetCore": "Warning"`
	`5`	`+ "Microsoft.Hosting.Lifetime": "Information"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`