Skip to content

Commit 67a443b

Browse files
committed
Fixing various build issues in VS2022 (64-bit):
- Updated `TargetFramework` in `RubberduckBaseProject.csproj` from `net461` to `net462` since 4.6.2 is the latest supported 4.6 version. - Updated `TargetFramework` in `RubberduckBaseMetaProject.csproj` from `net46` to `net462` since 4.6.2 is the latest supported 4.6 version. - Updated `RubberduckPostBuildTask.NetToolsDir` in `Rubberduck.Deployment.csproj` to point to `NETFX 4.6.2 Tools`. - Converted the `stdole` reference in both the `Rubberduck.VBEditor` and `Rubberduck.VBEditor.VBA` projects from using the MS Build Tools Program Files install to using the `stdole` NuGet package (version 7.0.3300.0) to correct a reference error. - Added 64-bit versions of `olewoo.dll` and `olewoo_interop.dll` as received from @bclothier.
1 parent 92a0bff commit 67a443b

File tree

7 files changed

+5
-10
lines changed

7 files changed

+5
-10
lines changed
-2.5 KB
Binary file not shown.
Binary file not shown.

Rubberduck.Deployment/Rubberduck.Deployment.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<CreateProperty Value="$(ProjectDir)$(OutputPath)$(TargetFileName)">
5858
<Output TaskParameter="Value" PropertyName="TargetAssembly" />
5959
</CreateProperty>
60-
<RubberduckPostBuildTask Config="$(ConfigurationName)" NetToolsDir="$(SdkPath)bin\NETFX 4.6.1 Tools\" WixToolsDir="$(ProjectDir)WixToolset\" SourceDir="$(TargetDir)" TargetDir="$(TargetDir)" ProjectDir="$(ProjectDir)" IncludeDir="$(ProjectDir)InnoSetup\Includes\" FilesToExtract="Rubberduck.dll" />
60+
<RubberduckPostBuildTask Config="$(ConfigurationName)" NetToolsDir="$(SdkPath)bin\NETFX 4.6.2 Tools\" WixToolsDir="$(ProjectDir)WixToolset\" SourceDir="$(TargetDir)" TargetDir="$(TargetDir)" ProjectDir="$(ProjectDir)" IncludeDir="$(ProjectDir)InnoSetup\Includes\" FilesToExtract="Rubberduck.dll" />
6161
<Message Text="Ran Rubberduck postbuild task" Importance="normal" />
6262
</Target>
6363
</Project>

Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<Import Project="..\RubberduckBaseProject.csproj" />
1616
<ItemGroup>
1717
<Reference Include="CustomMarshalers" />
18-
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
19-
<EmbedInteropTypes>False</EmbedInteropTypes>
20-
<HintPath>$(MSBuildProgramFiles32)\Common Files\microsoft shared\MSEnv\PublicAssemblies\stdole.dll</HintPath>
21-
</Reference>
2218
<Reference Include="System.Windows.Forms" />
2319
</ItemGroup>
2420
<ItemGroup>
@@ -32,6 +28,7 @@
3228
<PackageReference Include="NLog.Schema">
3329
<Version>4.5.10</Version>
3430
</PackageReference>
31+
<PackageReference Include="stdole" Version="7.0.3300" />
3532
<PackageReference Include="System.ValueTuple">
3633
<Version>4.5.0</Version>
3734
</PackageReference>

Rubberduck.VBEditor.VBA/Rubberduck.VBEditor.VBA.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@
9090
<HintPath>..\libs\Office.dll</HintPath>
9191
<EmbedInteropTypes>False</EmbedInteropTypes>
9292
</Reference>
93-
<Reference Include="stdole">
94-
<HintPath>$(MSBuildProgramFiles32)\Common Files\microsoft shared\MSEnv\PublicAssemblies\stdole.dll</HintPath>
95-
</Reference>
9693
<Reference Include="System.Windows.Forms" />
9794
</ItemGroup>
9895
<ItemGroup>
@@ -109,5 +106,6 @@
109106
<PackageReference Include="NLog.Schema">
110107
<Version>4.5.10</Version>
111108
</PackageReference>
109+
<PackageReference Include="stdole" Version="7.0.3300" />
112110
</ItemGroup>
113111
</Project>

RubberduckBaseMetaProject.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Library</OutputType>
55
<Company>Rubberduck-VBA</Company>
66
<AppDesignerFolder>Properties</AppDesignerFolder>
7-
<TargetFramework>net46</TargetFramework>
7+
<TargetFramework>net462</TargetFramework>
88
<LangVersion>7.2</LangVersion>
99
<SolutionDir>$(MSBuildProjectDirectory)</SolutionDir>
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

RubberduckBaseProject.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OutputType>Library</OutputType>
88
<Company>Rubberduck-VBA</Company>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<TargetFramework>net461</TargetFramework>
10+
<TargetFramework>net462</TargetFramework>
1111
<LangVersion>7.2</LangVersion>
1212
<SolutionDir>$(MSBuildProjectDirectory)</SolutionDir>
1313
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

0 commit comments

Comments
 (0)