Merge pull request #5706 from retailcoder/bump252

Bump version to 2.5.2
rubberduck-vba · Apr 19, 2021 · edd5fb3 · edd5fb3
2 parents 236805a + c009f17
commit edd5fb3
Show file tree

Hide file tree

Showing 13 changed files with 468 additions and 1,391 deletions.
diff --git a/Rubberduck.Core/Properties/Resources.Designer.cs b/Rubberduck.Core/Properties/Resources.Designer.cs
diff --git a/Rubberduck.Core/Properties/Resources.resx b/Rubberduck.Core/Properties/Resources.resx
@@ -117,4 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Splash2021f" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Splash2021f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/Rubberduck.Core/Resources/Splash2021f.png b/Rubberduck.Core/Resources/Splash2021f.png
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>Rubberduck.Core</AssemblyName>
     <Title>Rubberduck.Core</Title>
     <Product>Rubberduck.Core</Product>
-    <Copyright>Copyright © 2014-2019</Copyright>
+    <Copyright>Copyright © 2014-2021</Copyright>
     <ProjectGuid>{A1587EAC-7B54-407E-853F-4C7493D0323E}</ProjectGuid>
     <DocumentationFile>bin\Debug\Rubberduck.Core.xml</DocumentationFile>
     <!-- Disable "Missing XML documentation" warning (CS1591) -->
@@ -91,4 +91,17 @@
       <Version>2.0.20525</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
diff --git a/Rubberduck.Core/UI/Splash.cs b/Rubberduck.Core/UI/Splash.cs
diff --git a/Rubberduck.Core/UI/Splash.resx b/Rubberduck.Core/UI/Splash.resx
diff --git a/Rubberduck.Core/UI/Splash.Designer.cs → Rubberduck.Core/UI/Splash2021.Designer.cs b/Rubberduck.Core/UI/Splash.Designer.cs → Rubberduck.Core/UI/Splash2021.Designer.cs
diff --git a/Rubberduck.Core/UI/Splash2021.cs b/Rubberduck.Core/UI/Splash2021.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Rubberduck.UI
+{
+    public partial class Splash2021 : Form
+    {
+        public Splash2021()
+        {
+            InitializeComponent();
+#if DEBUG
+            VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version} (debug)";
+#else
+            VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version}";
+#endif
+            VersionLabel.Parent = pictureBox1;
+            VersionLabel.BackColor = Color.Transparent;
+        }
+    }
+}