Update to 4.7.2 and update Octokit to allow auto updating again

Jonno12345 · Apr 25, 2021 · eccfccb · eccfccb
1 parent 47262f5
commit eccfccb
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 33 deletions.
diff --git a/TileIconifier.Core/Properties/AssemblyInfo.cs b/TileIconifier.Core/Properties/AssemblyInfo.cs
@@ -64,4 +64,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.1.1")]
+[assembly: AssemblyVersion("3.1.1.1")]
diff --git a/TileIconifier.Core/Properties/Resources.Designer.cs b/TileIconifier.Core/Properties/Resources.Designer.cs
diff --git a/TileIconifier.Core/TileIconifier.Core.csproj b/TileIconifier.Core/TileIconifier.Core.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TileIconifier.Core</RootNamespace>
     <AssemblyName>TileIconifier.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -40,9 +40,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octokit, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octokit.0.20.0\lib\net45\Octokit.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Octokit, Version=0.50.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octokit.0.50.0\lib\net46\Octokit.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/TileIconifier.Core/packages.config b/TileIconifier.Core/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="Octokit" version="0.20.0" targetFramework="net45" />
+  <package id="Octokit" version="0.50.0" targetFramework="net472" />
   <package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net45" />
 </packages>
diff --git a/TileIconifier/App.config b/TileIconifier/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
   <appSettings>
     <!--Enable the high DPI improvements introduced in .net 4.5.2. This can be 
     removed when targeting .net 4.7 or higher with the DpiAwarness key set to 
     PerMonitorV2.-->
-    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
+    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>
   </appSettings>
-</configuration>
+</configuration>
diff --git a/TileIconifier/Controls/IconifierPanel/TileIconifierPanel.resx b/TileIconifier/Controls/IconifierPanel/TileIconifierPanel.resx
@@ -196,7 +196,7 @@
     <value>btnReset</value>
   </data>
   <data name="&gt;&gt;btnReset.Type" xml:space="preserve">
-    <value>TileIconifier.Controls.SkinnableButton, TileIconifier, Version=2.2.7785.40606, Culture=neutral, PublicKeyToken=null</value>
+    <value>TileIconifier.Controls.SkinnableButton, TileIconifier, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;btnReset.Parent" xml:space="preserve">
     <value>tableLayoutPanel2</value>
@@ -228,7 +228,7 @@ Me</value>
     <value>pannablePictureBoxControlPanelMedium</value>
   </data>
   <data name="&gt;&gt;pannablePictureBoxControlPanelMedium.Type" xml:space="preserve">
-    <value>TileIconifier.Controls.IconifierPanel.PictureBox.PannablePictureBoxControlPanel, TileIconifier, Version=2.2.7785.40606, Culture=neutral, PublicKeyToken=null</value>
+    <value>TileIconifier.Controls.IconifierPanel.PictureBox.PannablePictureBoxControlPanel, TileIconifier, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;pannablePictureBoxControlPanelMedium.Parent" xml:space="preserve">
     <value>tableLayoutPanel2</value>
@@ -258,7 +258,7 @@ Me</value>
     <value>colorPanel</value>
   </data>
   <data name="&gt;&gt;colorPanel.Type" xml:space="preserve">
-    <value>TileIconifier.Controls.IconifierPanel.ColorPanel, TileIconifier, Version=2.2.7785.40606, Culture=neutral, PublicKeyToken=null</value>
+    <value>TileIconifier.Controls.IconifierPanel.ColorPanel, TileIconifier, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;colorPanel.Parent" xml:space="preserve">
     <value>tableLayoutPanel2</value>
@@ -293,7 +293,7 @@ Me</value>
     <value>pannablePictureBoxControlPanelSmall</value>
   </data>
   <data name="&gt;&gt;pannablePictureBoxControlPanelSmall.Type" xml:space="preserve">
-    <value>TileIconifier.Controls.IconifierPanel.PictureBox.PannablePictureBoxControlPanel, TileIconifier, Version=2.2.7785.40606, Culture=neutral, PublicKeyToken=null</value>
+    <value>TileIconifier.Controls.IconifierPanel.PictureBox.PannablePictureBoxControlPanel, TileIconifier, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;pannablePictureBoxControlPanelSmall.Parent" xml:space="preserve">
     <value>tableLayoutPanel2</value>
@@ -326,7 +326,7 @@ Me</value>
     <value>chkUseSameImg</value>
   </data>
   <data name="&gt;&gt;chkUseSameImg.Type" xml:space="preserve">
-    <value>TileIconifier.Controls.SkinnableCheckBox, TileIconifier, Version=2.2.7785.40606, Culture=neutral, PublicKeyToken=null</value>
+    <value>TileIconifier.Controls.SkinnableCheckBox, TileIconifier, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;chkUseSameImg.Parent" xml:space="preserve">
     <value>tableLayoutPanel2</value>

diff --git a/TileIconifier/Properties/AssemblyInfo.cs b/TileIconifier/Properties/AssemblyInfo.cs
@@ -64,4 +64,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.1.1")]
+[assembly: AssemblyVersion("3.1.1.1")]
diff --git a/TileIconifier/Properties/Resources.Designer.cs b/TileIconifier/Properties/Resources.Designer.cs
diff --git a/TileIconifier/Properties/Settings.Designer.cs b/TileIconifier/Properties/Settings.Designer.cs
diff --git a/TileIconifier/TileIconifier.WinForms.csproj b/TileIconifier/TileIconifier.WinForms.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TileIconifier</RootNamespace>
     <AssemblyName>TileIconifier</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
@@ -29,6 +29,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>

diff --git a/TileIconifier/packages.config b/TileIconifier/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="1.6.2" targetFramework="net452" developmentDependency="true" />
-  <package id="Fody" version="2.0.0" targetFramework="net452" developmentDependency="true" />
+  <package id="Fody" version="2.0.0" targetFramework="net452" developmentDependency="true" requireReinstallation="true" />
   <package id="Resource.Embedder" version="1.1.1.0" targetFramework="net452" developmentDependency="true" />
 </packages>