Skip to content

Commit edd5fb3

Browse files
authored
Merge pull request #5706 from retailcoder/bump252
Bump version to 2.5.2
2 parents 236805a + c009f17 commit edd5fb3

File tree

13 files changed

+468
-1391
lines changed

13 files changed

+468
-1391
lines changed

Rubberduck.Core/Properties/Resources.Designer.cs

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Rubberduck.Core/Properties/Resources.resx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,8 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="Splash2021f" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\Splash2021f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
120124
</root>
69.8 KB
Loading

Rubberduck.Core/Rubberduck.Core.csproj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyName>Rubberduck.Core</AssemblyName>
66
<Title>Rubberduck.Core</Title>
77
<Product>Rubberduck.Core</Product>
8-
<Copyright>Copyright © 2014-2019</Copyright>
8+
<Copyright>Copyright © 2014-2021</Copyright>
99
<ProjectGuid>{A1587EAC-7B54-407E-853F-4C7493D0323E}</ProjectGuid>
1010
<DocumentationFile>bin\Debug\Rubberduck.Core.xml</DocumentationFile>
1111
<!-- Disable "Missing XML documentation" warning (CS1591) -->
@@ -91,4 +91,17 @@
9191
<Version>2.0.20525</Version>
9292
</PackageReference>
9393
</ItemGroup>
94+
<ItemGroup>
95+
<Compile Update="Properties\Resources.Designer.cs">
96+
<DesignTime>True</DesignTime>
97+
<AutoGen>True</AutoGen>
98+
<DependentUpon>Resources.resx</DependentUpon>
99+
</Compile>
100+
</ItemGroup>
101+
<ItemGroup>
102+
<EmbeddedResource Update="Properties\Resources.resx">
103+
<Generator>ResXFileCodeGenerator</Generator>
104+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
105+
</EmbeddedResource>
106+
</ItemGroup>
94107
</Project>

Rubberduck.Core/UI/Splash.cs

Lines changed: 0 additions & 18 deletions
This file was deleted.

Rubberduck.Core/UI/Splash.resx

Lines changed: 0 additions & 1340 deletions
This file was deleted.
Lines changed: 32 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Rubberduck.Core/UI/Splash2021.cs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace Rubberduck.UI
12+
{
13+
public partial class Splash2021 : Form
14+
{
15+
public Splash2021()
16+
{
17+
InitializeComponent();
18+
#if DEBUG
19+
VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version} (debug)";
20+
#else
21+
VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version}";
22+
#endif
23+
VersionLabel.Parent = pictureBox1;
24+
VersionLabel.BackColor = Color.Transparent;
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)