Skip to content

Commit b068316

Browse files
author
Steve Salas
committed
Squashed 'dotnet-tracer/' changes from 00af81e2..6bbc7c6f
6bbc7c6f Adds installers to solution configurations 00623385 Updates to support build script git-subtree-dir: dotnet-tracer git-subtree-split: 6bbc7c6f298d81a3e419f381beb22c125109b577
1 parent 6f8c9d2 commit b068316

File tree

7 files changed

+13
-5
lines changed

7 files changed

+13
-5
lines changed

‎main/CodePulse.Bundle/Bundle.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<?define x86OutputFolder = "..\CodePulse.Installer\bin\Release\" ?>
88
<?define x64OutputFolder = "..\CodePulse.Installer.x64\bin\x64\Release\" ?>
99

10-
<Bundle Name="Code Pulse .NET Tracer" Version="$(var.Version)" Manufacturer="Secure Decisions" UpgradeCode="d390f301-798f-4b2d-a740-061ab6941645">
10+
<Bundle Name="Code Pulse .NET Tracer" IconSourceFile="AppIcon.ico" Version="$(var.Version)" Manufacturer="Secure Decisions" UpgradeCode="d390f301-798f-4b2d-a740-061ab6941645">
1111
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
1212
<bal:WixStandardBootstrapperApplication LicenseFile="License.rtf" LogoFile="AppIcon.ico"/>
1313
</BootstrapperApplicationRef>

‎main/CodePulse.Bundle/CodePulse.Bundle.wixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<SchemaVersion>2.0</SchemaVersion>
99
<OutputName>CodePulse.DotNet.Tracer.Bundle</OutputName>
1010
<OutputType>Bundle</OutputType>
11+
<DefineSolutionProperties>false</DefineSolutionProperties>
1112
</PropertyGroup>
1213
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1314
<OutputPath>bin\$(Configuration)\</OutputPath>

‎main/CodePulse.Installer.x64/CodePulse.Installer.x64.wixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<SchemaVersion>2.0</SchemaVersion>
99
<OutputName>CodePulse.DotNet.Tracer.x64</OutputName>
1010
<OutputType>Package</OutputType>
11+
<DefineSolutionProperties>false</DefineSolutionProperties>
1112
</PropertyGroup>
1213
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1314
<OutputPath>bin\$(Configuration)\</OutputPath>

‎main/CodePulse.Installer.x64/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<?define x64OutputFolder = "$(var.OutputFolder)x64\" ?>
77

88
<Product Id="*" Name="Code Pulse .NET Tracer (x64 Profiler)" Language="1033" Version="$(var.Version)" Manufacturer="Secure Decisions" UpgradeCode="00bd7e54-e424-49bb-8e3c-151a75affda0">
9-
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
9+
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" />
1010

1111
<Icon Id="AppIcon" SourceFile="AppIcon.ico"/>
1212
<Property Id="ARPPRODUCTICON" Value="AppIcon" />

‎main/CodePulse.Installer/CodePulse.Installer.wixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<SchemaVersion>2.0</SchemaVersion>
99
<OutputName>CodePulse.DotNet.Tracer</OutputName>
1010
<OutputType>Package</OutputType>
11+
<DefineSolutionProperties>false</DefineSolutionProperties>
1112
</PropertyGroup>
1213
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1314
<OutputPath>bin\$(Configuration)\</OutputPath>

‎main/CodePulse.Installer/Product.wxs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
</Component>
6060
<Component Id="CodePulseRegistryKey" Directory="INSTALLFOLDER" Guid="{3f52dfaa-7de3-48cc-b185-b6bcdb9d5960}">
6161
<RegistryKey Root="HKLM"
62-
Key="Software\Secure Decisions\Code Pulse .NET Tracer"
63-
Action="createAndRemoveOnUninstall">
62+
Key="Software\Secure Decisions\Code Pulse .NET Tracer">
6463
<RegistryValue Type="string" Name="ApplicationPath" Value="[INSTALLFOLDER]" KeyPath="yes"/>
6564
<RegistryValue Type="string" Value="Default Value"/>
6665
</RegistryKey>

‎main/OpenCover.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,36 +562,42 @@ Global
562562
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Debug-Installer|Any CPU.ActiveCfg = Debug|x86
563563
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Debug-Installer|x64.ActiveCfg = Debug|x86
564564
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Debug-Installer|x86.ActiveCfg = Debug|x86
565+
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Debug-Installer|x86.Build.0 = Debug|x86
565566
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release|Any CPU.ActiveCfg = Release|x86
566567
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release|x64.ActiveCfg = Release|x86
567568
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release|x86.ActiveCfg = Release|x86
568569
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release-Installer|Any CPU.ActiveCfg = Release|x86
569570
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release-Installer|x64.ActiveCfg = Release|x86
570571
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release-Installer|x86.ActiveCfg = Release|x86
572+
{65367A51-7B99-4CDF-BE38-BC9515C597B6}.Release-Installer|x86.Build.0 = Release|x86
571573
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug|Any CPU.ActiveCfg = Debug|x64
572574
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug|x64.ActiveCfg = Debug|x64
573575
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug|x86.ActiveCfg = Debug|x64
574576
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug-Installer|Any CPU.ActiveCfg = Debug|x64
575577
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug-Installer|x64.ActiveCfg = Debug|x64
578+
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug-Installer|x64.Build.0 = Debug|x64
576579
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Debug-Installer|x86.ActiveCfg = Debug|x64
577580
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release|Any CPU.ActiveCfg = Release|x64
578581
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release|x64.ActiveCfg = Release|x64
579582
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release|x86.ActiveCfg = Release|x64
580583
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release-Installer|Any CPU.ActiveCfg = Release|x64
581584
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release-Installer|x64.ActiveCfg = Release|x64
585+
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release-Installer|x64.Build.0 = Release|x64
582586
{F18922E1-BEF6-44EB-8D76-B06A0669DCB9}.Release-Installer|x86.ActiveCfg = Release|x64
583587
{D390F301-798F-4B2D-A740-061AB6941645}.Debug|Any CPU.ActiveCfg = Debug|x86
584588
{D390F301-798F-4B2D-A740-061AB6941645}.Debug|x64.ActiveCfg = Debug|x86
585589
{D390F301-798F-4B2D-A740-061AB6941645}.Debug|x86.ActiveCfg = Debug|x86
586590
{D390F301-798F-4B2D-A740-061AB6941645}.Debug-Installer|Any CPU.ActiveCfg = Debug|x86
587591
{D390F301-798F-4B2D-A740-061AB6941645}.Debug-Installer|x64.ActiveCfg = Debug|x86
588592
{D390F301-798F-4B2D-A740-061AB6941645}.Debug-Installer|x86.ActiveCfg = Debug|x86
593+
{D390F301-798F-4B2D-A740-061AB6941645}.Debug-Installer|x86.Build.0 = Debug|x86
589594
{D390F301-798F-4B2D-A740-061AB6941645}.Release|Any CPU.ActiveCfg = Release|x86
590595
{D390F301-798F-4B2D-A740-061AB6941645}.Release|x64.ActiveCfg = Release|x86
591596
{D390F301-798F-4B2D-A740-061AB6941645}.Release|x86.ActiveCfg = Release|x86
592597
{D390F301-798F-4B2D-A740-061AB6941645}.Release-Installer|Any CPU.ActiveCfg = Release|x86
593598
{D390F301-798F-4B2D-A740-061AB6941645}.Release-Installer|x64.ActiveCfg = Release|x86
594599
{D390F301-798F-4B2D-A740-061AB6941645}.Release-Installer|x86.ActiveCfg = Release|x86
600+
{D390F301-798F-4B2D-A740-061AB6941645}.Release-Installer|x86.Build.0 = Release|x86
595601
EndGlobalSection
596602
GlobalSection(SolutionProperties) = preSolution
597603
HideSolutionNode = FALSE
@@ -625,7 +631,7 @@ Global
625631
{D390F301-798F-4B2D-A740-061AB6941645} = {D7453212-4AF9-426E-8D91-D5BF04B65B00}
626632
EndGlobalSection
627633
GlobalSection(ExtensibilityGlobals) = postSolution
628-
SolutionGuid = {07668570-E91E-4CCA-A9BF-EC3A83011035}
629634
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35
635+
SolutionGuid = {07668570-E91E-4CCA-A9BF-EC3A83011035}
630636
EndGlobalSection
631637
EndGlobal

0 commit comments

Comments
 (0)