Skip to content

Commit 2640339

Browse files
authored
Merge pull request #5328 from retailcoder/splash
Version bump (v2.5.0)
2 parents 9c24f9c + 2184a80 commit 2640339

File tree

8 files changed

+1237
-30
lines changed

8 files changed

+1237
-30
lines changed

Rubberduck.Core/Rubberduck.Core.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ApplicationIcon>Ducky.ico</ApplicationIcon>
1414
<!-- Give a fixed version to not blow XAML generated code to smithereens -->
1515
<!-- This also fixes "Input string was not in the correct format" error message when referring to the current assembly in an XAML-Namespace -->
16-
<AssemblyVersion>2.4.1</AssemblyVersion>
16+
<AssemblyVersion>2.5.0</AssemblyVersion>
1717
</PropertyGroup>
1818
<Import Project="..\RubberduckBaseProject.csproj" />
1919
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">
@@ -107,12 +107,23 @@
107107
</EmbeddedResource>
108108
</ItemGroup>
109109
<ItemGroup>
110+
<Compile Update="Properties\Resources.Designer.cs">
111+
<DesignTime>True</DesignTime>
112+
<AutoGen>True</AutoGen>
113+
<DependentUpon>Resources.resx</DependentUpon>
114+
</Compile>
110115
<Compile Update="Properties\Settings.Designer.cs">
111116
<DependentUpon>Settings.settings</DependentUpon>
112117
<DesignTime>True</DesignTime>
113118
<AutoGen>True</AutoGen>
114119
</Compile>
115120
</ItemGroup>
121+
<ItemGroup>
122+
<EmbeddedResource Update="Properties\Resources.resx">
123+
<Generator>ResXFileCodeGenerator</Generator>
124+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
125+
</EmbeddedResource>
126+
</ItemGroup>
116127
<ItemGroup>
117128
<None Update="Properties\Settings.settings">
118129
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

Rubberduck.Core/UI/Splash.Designer.cs

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

0 commit comments

Comments
 (0)