From cf03b2db0d65ad4ed11f14cdeebc415ce96b1381 Mon Sep 17 00:00:00 2001
From: FormalDeterminism <aaronvahid+github@gmail.com>
Date: Mon, 1 May 2017 18:17:48 -0500
Subject: [PATCH 1/2] Fixed a few pixels of the Windows 10 taskbar displaying
 below BabySmash window. Not tested with ClickOnce.

---
 Controller.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Controller.cs b/Controller.cs
index e22c82c..b506a1e 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -127,6 +127,7 @@ public void Launch()
                     Width = s.WorkingArea.Width,
                     Height = s.WorkingArea.Height,
                     WindowStyle = WindowStyle.None,
+                    ResizeMode = ResizeMode.NoResize,
                     Topmost = true,
                     AllowsTransparency = Settings.Default.TransparentBackground,
                     Background = (Settings.Default.TransparentBackground ? new SolidColorBrush(Color.FromArgb(1, 0, 0, 0)) : Brushes.WhiteSmoke),

From a89149adecaf0642bc7bbe5e0d221e69a2759a28 Mon Sep 17 00:00:00 2001
From: freaksterrao <freaksterrao@users.noreply.github.com>
Date: Sun, 3 Jul 2022 18:47:38 +0530
Subject: [PATCH 2/2] Updated the solution to target net 4.8 since its
 available on Windows 10 and 11 by default. Also updated to latest version of
 Newtonsoft.Json

---
 .gitignore                       |  2 ++
 BabySmash.csproj                 | 15 ++++++++-------
 Properties/Resources.Designer.cs |  2 +-
 Properties/Settings.Designer.cs  |  2 +-
 app.config                       |  2 +-
 packages.config                  |  4 ----
 6 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 packages.config

diff --git a/.gitignore b/.gitignore
index fd5204b..3e4af05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,3 +181,5 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+
+.vs
\ No newline at end of file
diff --git a/BabySmash.csproj b/BabySmash.csproj
index 9473dd2..c4b1771 100644
--- a/BabySmash.csproj
+++ b/BabySmash.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BabySmash</RootNamespace>
     <AssemblyName>BabySmash</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -54,7 +54,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -72,10 +72,6 @@
     <Compile Include="Extensions\ObjectExtensions.cs" />
     <Compile Include="Shapes\BabySmashShape.cs" />
     <Compile Include="WordFinder.cs" />
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationFramework.Luna">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
@@ -87,6 +83,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Speech" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -253,7 +250,6 @@
     </EmbeddedResource>
     <None Include="app.config" />
     <None Include="BabySmash_TemporaryKey.pfx" />
-    <None Include="packages.config" />
     <None Include="private.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -335,6 +331,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 202ab18..db3f3fa 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace BabySmash.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index 7c003da..01ef09d 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace BabySmash.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/app.config b/app.config
index fce508d..4c5f3f4 100644
--- a/app.config
+++ b/app.config
@@ -58,5 +58,5 @@
             </setting>
         </BabySmash.Properties.Settings>
     </userSettings>
-    <startup><supportedRuntime version="v2.0.50727"/></startup>
+    <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
 </configuration>
diff --git a/packages.config b/packages.config
deleted file mode 100644
index ff91865..0000000
--- a/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
-</packages>
\ No newline at end of file