Merge branch 'develop'

snoopwpf · Dec 21, 2020 · 7e5ec73 · 7e5ec73
2 parents 74eaa9b + d4c794b
commit 7e5ec73
Show file tree

Hide file tree

Showing 150 changed files with 1,694 additions and 1,310 deletions.
diff --git a/.build/Build.cs b/.build/Build.cs
@@ -143,7 +143,7 @@ protected override void OnBuildInitialized()
         .DependsOn(CleanOutput)
         .DependsOn(Compile)
         .Executes(() => {
-            // Generate ingore files to prevent chocolatey from generating shims for them
+            // Generate ignore files to prevent chocolatey from generating shims for them
             foreach (var launcher in CurrentBuildOutputDirectory.GlobFiles($"{ProjectName}.InjectorLauncher.*.exe"))
             {
                 using var _ = File.Create(launcher + ".ignore");

diff --git a/.build/Configuration.cs b/.build/Configuration.cs
@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using Nuke.Common.Tooling;
+
+[TypeConverter(typeof(TypeConverter<Configuration>))]
+public class Configuration : Enumeration
+{
+    public static Configuration Debug = new Configuration { Value = nameof(Debug) };
+    public static Configuration Release = new Configuration { Value = nameof(Release) };
+
+    public static implicit operator string(Configuration configuration)
+    {
+        return configuration.Value;
+    }
+}
diff --git a/.build/_build.csproj b/.build/_build.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="0.24.11" />
+    <PackageReference Include="Nuke.Common" Version="5.0.2" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.2.4]" />
     <PackageDownload Include="Nuget.CommandLine" Version="[5.5.1]" />
     <PackageDownload Include="wix" Version="[3.11.2]" />

diff --git a/.markdownlint.json b/.markdownlint.json
@@ -1,4 +1,5 @@
 {
     "line-length": false,
+    "MD024": false,
     "MD033": false
 }
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,13 @@
 # Changelog for Snoop
 
+## 3.0.1
+
+- ### Bug fixes
+
+  - Fixing window finder cursor display when DPI != 100%
+  - [#203](../../issues/203) - The calling thread cannot access this object because a different thread owns it.
+  - [#207](../../issues/207) - Exception when trying to snoop application with invalid resource definitions inside ResourceDictionary
+
 ## 3.0.0
 
 - ### Bug fixes
@@ -84,4 +92,5 @@
 
 - ### Improvements
 
-  - Added a new triggers tab to view triggers from ControlTemplates and Styles
+  - Added a new triggers tab to view triggers from ControlTemplates and Styles
+
diff --git a/Directory.build.props b/Directory.build.props
@@ -11,6 +11,7 @@
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);NU1503</NoWarn>
   </PropertyGroup>
 

diff --git a/Directory.packages.props b/Directory.packages.props
@@ -1,6 +1,6 @@
 <Project>
     <ItemGroup>
-        <PackageVersion Include="CommandLineParser" Version="2.*" />
+        <PackageVersion Include="CommandLineParser" Version="2.8.0" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
@@ -16,13 +16,13 @@
     </ItemGroup>
 
     <ItemGroup Label="Build">
-        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.*" />
+        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
 
-        <PackageVersion Include="JetBrains.Annotations" Version="2020.*" />
+        <PackageVersion Include="JetBrains.Annotations" Version="2020.3.0" />
 
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" version="3.*" />
-        <PackageVersion Include="StyleCop.Analyzers" version="1.*" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" version="3.8.0" />
+        <PackageVersion Include="StyleCop.Analyzers" version="1.2.0-beta.312" />
 
-        <PackageVersion Include="WpfAnalyzers" version="3.*" />
+        <PackageVersion Include="WpfAnalyzers" version="3.5.2" />
     </ItemGroup>
 </Project>
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -9,11 +9,14 @@ branches:
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     is-release-branch: true
+    increment: Patch
   develop:
     mode: ContinuousDeployment
     tag: alpha
     prevent-increment-of-merged-branch-version: true
     track-merge-target: true
+    tracks-release-branches: true
+    increment: Patch
   pull-request:
     mode: ContinuousDelivery
 ignore:

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ It allows you to spy/browse the visual tree of a running application (without th
 
 ## Versions
 
-### [3.0.0](../../tree/develop) (preview)
+### [3.0.0](../../releases/tag/v3.0.0)
 
 You can read the [changelog](Changelog.md) for details on what changed in this version.
 Please note that this version is not yet finished.
@@ -36,7 +36,7 @@ Highlights:
 - Snooping disabled controls when holding CTRL + SHIFT works now
 - Snoop now filters uncommon properties by default
 - Snoop is now able to show `MergedDictionaries` from `ResourceDictionary`
-- Snoop now has two tracking modes. 
+- Snoop now has two tracking modes.
   - Holding CTRL tries to skip template parts
   - Holding CTRL + SHIFT does not skip template parts
 - Drastically improved performance of AppChooser.Refresh() (thanks @mikel785)
@@ -95,8 +95,9 @@ Just open `Snoop.sln` with Visual Studio 2019 (16.7 or later) and build it.
 Please note that you need the Visual Studio 2019 C++ payload and in case you are using a later version you also need the VC++ 142 payload.
 
 Requirements:
-- Visual Studio 2019 16.7 (including C++ payload)
-- .NET Core SDK 3.1.400
+
+- Visual Studio 2019 16.8 (including C++ payload)
+- .NET Core SDK 5.0.100
 
 ## Contributors
 

diff --git a/Shared/InjectorData.cs b/Shared/InjectorData.cs
@@ -1,10 +1,10 @@
 public class InjectorData
 {
-    public string FullAssemblyPath { get; set; }
+    public string FullAssemblyPath { get; set; } = string.Empty;
 
-    public string ClassName { get; set; }
+    public string ClassName { get; set; } = string.Empty;
 
-    public string MethodName { get; set; }
+    public string MethodName { get; set; } = string.Empty;
 
-    public string SettingsFile { get; set; }
+    public string? SettingsFile { get; set; }
 }
diff --git a/Snoop.Core/Controls/AdornerContainer.cs b/Snoop.Core/Controls/AdornerContainer.cs
@@ -15,7 +15,7 @@ namespace Snoop.Controls
     /// </summary>
     public class AdornerContainer : Adorner
     {
-        private UIElement child;
+        private UIElement? child;
 
         static AdornerContainer()
         {
@@ -30,10 +30,10 @@ public AdornerContainer(UIElement adornedElement)
 
         protected override int VisualChildrenCount => this.child is null ? 0 : 1;
 
-        protected override Visual GetVisualChild(int index)
+        protected override Visual? GetVisualChild(int index)
         {
             if (index == 0
-                && this.child != null)
+                && this.child is not null)
             {
                 return this.child;
             }
@@ -48,7 +48,7 @@ protected override Size ArrangeOverride(Size finalSize)
             return finalSize;
         }
 
-        public UIElement Child
+        public UIElement? Child
         {
             get { return this.child; }
 

diff --git a/Snoop.Core/Controls/Inspector.cs b/Snoop.Core/Controls/Inspector.cs
@@ -10,7 +10,7 @@ namespace Snoop.Controls
 
     public class Inspector : Grid
     {
-        public PropertyFilter Filter
+        public PropertyFilter? Filter
         {
             get { return this.filter; }
 
@@ -21,7 +21,7 @@ public PropertyFilter Filter
             }
         }
 
-        private PropertyFilter filter;
+        private PropertyFilter? filter;
 
         protected virtual void OnFilterChanged()
         {

diff --git a/Snoop.Core/Controls/Previewer.xaml.cs b/Snoop.Core/Controls/Previewer.xaml.cs
@@ -13,8 +13,8 @@ namespace Snoop.Controls
 
     public partial class Previewer
     {
-        public static readonly RoutedCommand MagnifyCommand = new RoutedCommand(nameof(MagnifyCommand), typeof(Previewer));
-        public static readonly RoutedCommand ScreenshotCommand = new RoutedCommand(nameof(ScreenshotCommand), typeof(Previewer));
+        public static readonly RoutedCommand MagnifyCommand = new(nameof(MagnifyCommand), typeof(Previewer));
+        public static readonly RoutedCommand ScreenshotCommand = new(nameof(ScreenshotCommand), typeof(Previewer));
 
         public Previewer()
         {
@@ -44,7 +44,7 @@ public object Target
                 typeof(object),
                 typeof(Previewer),
                 new FrameworkPropertyMetadata(
-                    (object)null,
+                    default,
                     OnTargetChanged));
 
         /// <summary>
@@ -121,7 +121,7 @@ private void HandleTargetOrIsActiveChanged()
 
         private void HandleCanMagnify(object sender, CanExecuteRoutedEventArgs e)
         {
-            e.CanExecute = this.Target as Visual != null;
+            e.CanExecute = this.Target as Visual is not null;
             e.Handled = true;
         }
 
@@ -134,7 +134,7 @@ private void HandleMagnify(object sender, ExecutedRoutedEventArgs e)
 
         private void HandleCanScreenshot(object sender, CanExecuteRoutedEventArgs e)
         {
-            e.CanExecute = this.Target as Visual != null;
+            e.CanExecute = this.Target as Visual is not null;
             e.Handled = true;
         }