Skip to content

Commit deca102

Browse files
authored
Merge branch 'next' into FixAboutControl
2 parents 5979905 + 77ff013 commit deca102

File tree

318 files changed

+63266
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+63266
-966
lines changed

Installer Build Script.iss

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<img src="http://i.stack.imgur.com/jnBEp.jpg" width=100% />
1+
<img src="https://user-images.githubusercontent.com/5751684/38372412-c3247d70-38bc-11e8-8eaa-2f2d19595a42.png" width=100% />
22

33
<!-- campaign is no longer accepting donations
44
### Donate!

Rubberduck.API/API/VBA/Accessibility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Rubberduck.API.VBA
44
{
5-
[ComVisible(true)]
5+
[ComVisible(true), Guid(RubberduckGuid.AccessibilityGuid)]
66
public enum Accessibility
77
{
88
Implicit,

Rubberduck.API/API/VBA/DeclarationType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Rubberduck.API.VBA
44
{
5-
[ComVisible(true)]
5+
[ComVisible(true), Guid(RubberduckGuid.DeclarationTypeGuid)]
66
//[Flags]
77
public enum DeclarationType
88
{

Rubberduck.API/Rubberduck.API.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,8 @@
7474
<ItemGroup>
7575
<Folder Include="API\Plugin\" />
7676
</ItemGroup>
77+
<ItemGroup>
78+
<None Include="app.config" />
79+
</ItemGroup>
7780
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7881
</Project>

Rubberduck.API/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

Rubberduck.Core/App.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Rubberduck.Parsing.Inspections.Resources;
1414
using Rubberduck.Parsing.UIContext;
1515
using Rubberduck.UI.Command;
16-
using Rubberduck.VBEditor.ComManagement;
1716
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
1817
using Rubberduck.VBEditor.Utility;
1918
using Rubberduck.VersionCheck;

0 commit comments

Comments
 (0)