Skip to content

Commit 91f0a31

Browse files
authored
Merge pull request #3739 from Vogel612/tech-debt-debris
@rubberduck-vba/dev - with this merge, your debug builds will break. Please run `regasm.exe "path to last registered build DLL" /u`, pull, build, and then re-register with the new path using `/codebase /tlb` switches, as if this was the very first time you registered a RD debug build. Failure to de-register your current debug build may leave stale registry keys dangling.
2 parents 2a09ccf + ff55aac commit 91f0a31

File tree

793 files changed

+1095
-575
lines changed

Some content is hidden

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

793 files changed

+1095
-575
lines changed

Installer Build Script.iss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#define BuildDir SourcePath + "RetailCoder.VBE\bin\Release"
1+
#define BuildDir SourcePath + "Rubberduck.Main\bin\Release"
22
#define AppName "Rubberduck"
33
#define AddinDLL "Rubberduck.dll"
4-
#define InspectionsDLL "Rubberduck.Inspections.dll"
5-
#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\Release\Rubberduck.dll")
4+
#define AppVersion GetFileVersion(SourcePath + "Rubberduck.Main\bin\Release\Rubberduck.dll")
65
#define AppPublisher "Rubberduck"
76
#define AppURL "http://rubberduckvba.com"
87
#define License SourcePath + "\License.rtf"
@@ -42,7 +41,6 @@ Source: "{#BuildDir}\lib\win32\x64\*"; DestDir: "{app}"; Flags: ignoreversion; E
4241
Source: "{#BuildDir}\lib\win32\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled
4342

4443
Source: "{#BuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Excludes: "{#AddinDLL},\NativeBinaries"
45-
Source: "{#BuildDir}\{#InspectionsDLL}"; DestDir: "{app}"; Flags: ignoreversion
4644
Source: "{#BuildDir}\{#AddinDLL}"; DestDir: "{app}"; Flags: ignoreversion; AfterInstall: RegisterAddin
4745

4846
[Run]

RetailCoder.VBE/Rubberduck.csproj.DotSettings

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

RetailCoder.VBE/UnitTesting/FakesProviderFactory.cs

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

RetailCoder.VBE/API/VBA/ParserState.cs renamed to Rubberduck.API/API/VBA/ParserState.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
using Rubberduck.Parsing.PreProcessing;
99
using Rubberduck.Parsing.Symbols.DeclarationLoaders;
1010
using Rubberduck.Parsing.VBA;
11-
using Rubberduck.UI.Command.MenuItems;
1211
using Rubberduck.Parsing.Symbols;
1312
using Rubberduck.Parsing.UIContext;
1413
using Rubberduck.VBEditor.ComManagement;
15-
using Rubberduck.VBEditor.Events;
1614
using Rubberduck.VBEditor.SafeComWrappers.VBA;
1715

1816
namespace Rubberduck.API.VBA
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("Rubberduck.API")]
9+
[assembly: AssemblyDescription("API for programmatic access to Rubberduck's Code Analysis features.")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("Rubberduck-VBA")]
12+
[assembly: AssemblyProduct("Rubberduck.API")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
14+
[assembly: AssemblyCulture("en")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: InternalsVisibleTo("RubberduckTests")]
17+
18+
// Setting ComVisible to false makes the types in this assembly not visible
19+
// to COM components. If you need to access a type in this assembly from
20+
// COM, set the ComVisible attribute to true on that type.
21+
[assembly: ComVisible(false)]
22+
23+
// The following GUID is for the ID of the typelib if this project is exposed to COM
24+
[assembly: Guid("ac1b4a57-364a-4f90-a0cd-6ee818349ce5")]
25+
26+
// Version information for an assembly consists of the following four values:
27+
//
28+
// Major Version
29+
// Minor Version
30+
// Build Number
31+
// Revision
32+
//
33+
// You can specify all the values or you can default the Build and Revision Numbers
34+
// by using the '*' as shown below:
35+
// [assembly: AssemblyVersion("1.0.*")]
36+
[assembly: AssemblyVersion("2.1.*")]

Rubberduck.API/Rubberduck.API.csproj

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{AC1B4A57-364A-4F90-A0CD-6EE818349CE5}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Rubberduck.API</RootNamespace>
11+
<AssemblyName>Rubberduck.API</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>pdbonly</DebugType>
27+
<Optimize>true</Optimize>
28+
<OutputPath>bin\Release\</OutputPath>
29+
<DefineConstants>TRACE</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="Microsoft.VB6.Interop.VBIDE">
35+
<HintPath>..\libs\Microsoft.VB6.Interop.VBIDE.dll</HintPath>
36+
<EmbedInteropTypes>False</EmbedInteropTypes>
37+
</Reference>
38+
<Reference Include="Microsoft.Vbe.Interop, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
39+
<SpecificVersion>False</SpecificVersion>
40+
<EmbedInteropTypes>False</EmbedInteropTypes>
41+
<HintPath>..\libs\Microsoft.Vbe.Interop.dll</HintPath>
42+
</Reference>
43+
<Reference Include="Microsoft.Vbe.Interop.Forms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
44+
<SpecificVersion>False</SpecificVersion>
45+
<EmbedInteropTypes>False</EmbedInteropTypes>
46+
<HintPath>..\libs\Microsoft.Vbe.Interop.Forms.dll</HintPath>
47+
</Reference>
48+
<Reference Include="System" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="Microsoft.CSharp" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="API\VBA\Accessibility.cs" />
54+
<Compile Include="API\VBA\Declaration.cs" />
55+
<Compile Include="API\VBA\DeclarationType.cs" />
56+
<Compile Include="API\VBA\IdentifierReference.cs" />
57+
<Compile Include="API\VBA\ParserState.cs" />
58+
<Compile Include="Properties\AssemblyInfo.cs" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
62+
<Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
63+
<Name>Rubberduck.Core</Name>
64+
</ProjectReference>
65+
<ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
66+
<Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
67+
<Name>Rubberduck.Parsing</Name>
68+
</ProjectReference>
69+
<ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
70+
<Project>{8ce35eb3-8852-4ba1-84dd-df3f5d2967b0}</Project>
71+
<Name>Rubberduck.VBEditor</Name>
72+
</ProjectReference>
73+
</ItemGroup>
74+
<ItemGroup>
75+
<Folder Include="API\Plugin\" />
76+
</ItemGroup>
77+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
78+
</Project>

0 commit comments

Comments
 (0)