Skip to content

Commit bb5075b

Browse files
NelsonVidesNelsonVides
committed
Reinstalled LibGit native libraries, now VS copies the native .dlls. Modified the .iss script to copy this time these new .dlls.
1 parent de3de3f commit bb5075b

File tree

10 files changed

+20
-9
lines changed

10 files changed

+20
-9
lines changed

‎Installer Build Script.iss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#define BuildDir SourcePath + "RetailCoder.VBE\bin\release"
1+
#define BuildDir SourcePath + "RetailCoder.VBE\bin\Release"
22
#define AppName "Rubberduck"
33
#define AddinDLL "Rubberduck.dll"
44
#define InspectionsDLL "Rubberduck.Inspections.dll"
5-
#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\release\Rubberduck.dll")
5+
#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\Release\Rubberduck.dll")
66
#define AppPublisher "Rubberduck"
77
#define AppURL "http://rubberduckvba.com"
88
#define License SourcePath + "\License.rtf"
@@ -37,9 +37,9 @@ ArchitecturesInstallIn64BitMode=x64
3737
Name: "English"; MessagesFile: "compiler:Default.isl"
3838

3939
[Files]
40-
; Install the correct bitness binaries.
41-
Source: "libs\NativeBinaries\amd64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is64BitOfficeInstalled
42-
Source: "libs\NativeBinaries\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled
40+
; Install the correct bitness binaries.
41+
Source: "{#BuildDir}\lib\win32\x64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is64BitOfficeInstalled
42+
Source: "{#BuildDir}\lib\win32\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled
4343

4444
Source: "{#BuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Excludes: "{#AddinDLL},\NativeBinaries"
4545
Source: "{#BuildDir}\{#InspectionsDLL}"; DestDir: "{app}"; Flags: ignoreversion

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,6 @@
11001100
</ItemGroup>
11011101
<ItemGroup>
11021102
<Folder Include="API\Plugin\" />
1103-
<Folder Include="NewFolder1\" />
11041103
<Folder Include="Properties\DataSources\" />
11051104
</ItemGroup>
11061105
<ItemGroup>

‎RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ private void InitRepo()
663663

664664
private void SetChildPresenterSourceControlProviders(ISourceControlProvider provider)
665665
{
666-
if (Provider.CurrentBranch == null)
666+
if (Provider?.CurrentBranch == null)
667667
{
668668
HandleViewModelError(null,
669669
new ErrorEventArgs(RubberduckUI.SourceControl_NoBranchesTitle, RubberduckUI.SourceControl_NoBranchesMessage, NotificationType.Error));

‎Rubberduck.Inspections/Rubberduck.Inspections.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,12 @@
209209
<ItemGroup />
210210
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
211211
<PropertyGroup>
212-
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)RetailCoder.VBE\bin\Debug" /Y</PostBuildEvent>
212+
<PostBuildEvent>if "$(Configuration)" == "Debug" (
213+
copy "$(TargetPath)" "$(SolutionDir)RetailCoder.VBE\bin\Debug" /Y
214+
)
215+
if "$(Configuration)" == "Release" (
216+
copy "$(TargetPath)" "$(SolutionDir)RetailCoder.VBE\bin\Release" /Y
217+
)</PostBuildEvent>
213218
</PropertyGroup>
214219
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
215220
Other similar extension points exist, see Microsoft.Common.targets.

‎Rubberduck.SourceControl/Rubberduck.SourceControl.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.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')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +12,7 @@
1112
<AssemblyName>Rubberduck.SourceControl</AssemblyName>
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>a8fe7e5a</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp></NuGetPackageImportStamp>
1516
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1617
<RestorePackages>true</RestorePackages>
1718
</PropertyGroup>
@@ -109,6 +110,7 @@
109110
<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>
110111
</PropertyGroup>
111112
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
113+
<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'))" />
112114
</Target>
113115
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
114116
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎Rubberduck.SourceControl/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="LibGit2Sharp" version="0.24.0" targetFramework="net45" />
4+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
45
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
56
</packages>

‎RubberduckTests/RubberduckTests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.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')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -18,6 +19,7 @@
1819
<TestProjectType>UnitTest</TestProjectType>
1920
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2021
<RestorePackages>true</RestorePackages>
22+
<NuGetPackageImportStamp></NuGetPackageImportStamp>
2123
</PropertyGroup>
2224
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2325
<DebugSymbols>true</DebugSymbols>
@@ -473,6 +475,7 @@
473475
<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>
474476
</PropertyGroup>
475477
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
478+
<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'))" />
476479
</Target>
477480
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
478481
Other similar extension points exist, see Microsoft.Common.targets.

‎RubberduckTests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<package id="Castle.Core" version="4.1.1" targetFramework="net45" />
44
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
55
<package id="LibGit2Sharp" version="0.24.0" targetFramework="net45" />
6+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
67
<package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
78
<package id="NLog" version="4.0.1" targetFramework="net45" />
89
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />

‎libs/NativeBinaries/amd64/git2-9bbc8f3.dll

-1010 KB
Binary file not shown.

‎libs/NativeBinaries/x86/git2-9bbc8f3.dll

-757 KB
Binary file not shown.

0 commit comments

Comments
 (0)