Skip to content

Commit 52b48b7

Browse files
committed
Merge branch 'rubberduck-vba/next' into next
2 parents 46fae23 + 263eb75 commit 52b48b7

Some content is hidden

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

56 files changed

+3755
-442
lines changed

Installer Build Script.iss

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

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/Rubberduck.Core.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -256,10 +255,6 @@
256255
<Reference Include="Infralution.Localization.Wpf">
257256
<HintPath>..\libs\Infralution.Localization.Wpf.dll</HintPath>
258257
</Reference>
259-
<Reference Include="LibGit2Sharp, Version=0.24.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
260-
<SpecificVersion>False</SpecificVersion>
261-
<HintPath>..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll</HintPath>
262-
</Reference>
263258
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
264259
<HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
265260
</Reference>
@@ -1401,7 +1396,6 @@
14011396
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
14021397
</PropertyGroup>
14031398
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
1404-
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
14051399
</Target>
14061400
<PropertyGroup>
14071401
<PostBuildEvent>

Rubberduck.Core/RubberduckGuid.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ namespace Rubberduck
44
{
55
public static class RubberduckGuid
66
{
7+
// TypeLib Guid:
8+
public const string RubberduckTypeLibGuid = "e07c841c-14b4-4890-83e9-8c80b06dd59d";
9+
710
// Addin Guids:
811
public const string ExtensionGuid = "8D052AD8-BBD2-4C59-8DEC-F697CA1F8A66"; // shipped
912
public const string DockableWindowHostGuid = "9CF1392A-2DC9-48A6-AC0B-E601A9802608"; // shipped
@@ -13,7 +16,7 @@ public static class RubberduckGuid
1316
public const string IdentifierReferenceClassGuid = "57F78E64-8ADF-4D81-A467-A0139B877D14"; // shipped prior to 2.0.14
1417
public const string ParserStateClassGuid = "28754D11-10CC-45FD-9F6A-525A65412B7A"; // shipped prior to 2.0.14
1518
public const string IParserStateEventsGuid = "3D8EAA28-8983-44D5-83AF-2EEC4C363079"; // shipped prior to 2.0.14
16-
19+
1720
// Unit testing Guids:
1821
private const string UnitTestingGuidspace = "-43F0-3B33-B105-9B8188A6F040";
1922
public const string AssertClassGuid = "69E194DA" + UnitTestingGuidspace; // shipped prior to 2.0.14
@@ -24,5 +27,9 @@ public static class RubberduckGuid
2427
public const string IFakeGuid = "69E194DF" + UnitTestingGuidspace; // added for 2.0.14
2528
public const string IVerifyGuid = "69E194E0" + UnitTestingGuidspace; // added for 2.0.14
2629
public const string IStubGuid = "69E194E1" + UnitTestingGuidspace; // added for 2.0.14
30+
31+
// Enum Guids:
32+
public const string DeclarationTypeGuid = "3E077C17-5678-3605-8449-FEABE42C9725";
33+
public const string AccessibilityGuid = "6BD869B8-C7C6-3970-8ED4-AC74DD2EBA92";
2734
}
2835
}

Rubberduck.Core/UnitTesting/IFakes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface IFakes
88

99
public interface IFakesFactory
1010
{
11-
IFakes GetFakes();
11+
IFakes Create();
1212
void Release(IFakes fakes);
1313
}
1414
}

Rubberduck.Core/UnitTesting/TestEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void Run(IEnumerable<TestMethod> tests)
7474
.Where(test => test.Declaration.QualifiedName.QualifiedModuleName.ProjectId == capturedModule.Key.ProjectId
7575
&& test.Declaration.QualifiedName.QualifiedModuleName.ComponentName == capturedModule.Key.ComponentName);
7676

77-
var fakes = _fakesFactory.GetFakes();
77+
var fakes = _fakesFactory.Create();
7878
try
7979
{
8080
Run(module.Key.FindModuleInitializeMethods(_state));

0 commit comments

Comments
 (0)