Skip to content

Commit 7cc6d4c

Browse files
author
Steve Salas
committed
Squashed 'dotnet-tracer/' changes from 07f52be5..86cf1879
86cf1879 Updated solution configuration for installer git-subtree-dir: dotnet-tracer git-subtree-split: 86cf18798aa11254ebca5cc54a71e778945c0f34
1 parent 435d0bf commit 7cc6d4c

File tree

5 files changed

+210
-6
lines changed

5 files changed

+210
-6
lines changed

main/CodePulse.Bundle/CodePulse.Bundle.wixproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,24 @@
3535
<Content Include="AppIcon.ico" />
3636
<Content Include="License.rtf" />
3737
</ItemGroup>
38+
<ItemGroup>
39+
<ProjectReference Include="..\CodePulse.Installer.x64\CodePulse.Installer.x64.wixproj">
40+
<Name>CodePulse.Installer.x64</Name>
41+
<Project>{f18922e1-bef6-44eb-8d76-b06a0669dcb9}</Project>
42+
<Private>True</Private>
43+
<DoNotHarvest>True</DoNotHarvest>
44+
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
45+
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
46+
</ProjectReference>
47+
<ProjectReference Include="..\CodePulse.Installer\CodePulse.Installer.wixproj">
48+
<Name>CodePulse.Installer</Name>
49+
<Project>{65367a51-7b99-4cdf-be38-bc9515c597b6}</Project>
50+
<Private>True</Private>
51+
<DoNotHarvest>True</DoNotHarvest>
52+
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
53+
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
54+
</ProjectReference>
55+
</ItemGroup>
3856
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
3957
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
4058
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

main/CodePulse.Client/CodePulse.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<SignAssembly>true</SignAssembly>
3434
</PropertyGroup>
3535
<PropertyGroup>
36-
<AssemblyOriginatorKeyFile>..\..\build\Version\opencover.snk</AssemblyOriginatorKeyFile>
36+
<AssemblyOriginatorKeyFile>$(SolutionDir)..\build\Version\opencover.snk</AssemblyOriginatorKeyFile>
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-40 Bytes
Binary file not shown.

main/OpenCover.Profiler/OpenCover.Profiler.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
</Midl>
136136
<ResourceCompile>
137137
<Culture>0x0409</Culture>
138-
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories);$(SolutionDir)..\build\Version</AdditionalIncludeDirectories>
139139
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140140
</ResourceCompile>
141141
<Link>
@@ -173,7 +173,7 @@
173173
</Midl>
174174
<ResourceCompile>
175175
<Culture>0x0409</Culture>
176-
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
176+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories);$(SolutionDir)..\build\Version</AdditionalIncludeDirectories>
177177
<PreprocessorDefinitions>_WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178178
</ResourceCompile>
179179
<Link>
@@ -212,7 +212,7 @@
212212
</Midl>
213213
<ResourceCompile>
214214
<Culture>0x0409</Culture>
215-
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
215+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories);$(SolutionDir)..\build\Version</AdditionalIncludeDirectories>
216216
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217217
</ResourceCompile>
218218
<Link>
@@ -252,7 +252,7 @@
252252
</Midl>
253253
<ResourceCompile>
254254
<Culture>0x0409</Culture>
255-
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
255+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories);$(SolutionDir)..\build\Version</AdditionalIncludeDirectories>
256256
<PreprocessorDefinitions>_WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
257257
</ResourceCompile>
258258
<Link>

0 commit comments

Comments
 (0)