Skip to content

Commit 3c73da6

Browse files
gbiellemgbiellem
committed
Merge branch 'develop'
2 parents 606689e + 4f9140f commit 3c73da6

File tree

9 files changed

+96
-22
lines changed

9 files changed

+96
-22
lines changed

‎installer/ServicePulse.aip‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,18 @@
4545
<ROW Component="AI_DisableModify" ComponentId="{DF00D24A-7668-4F3D-9629-2A1537091C3F}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
4646
<ROW Component="AI_ExePath" ComponentId="{CD4BC5FC-47B0-4899-856E-C252440A24FB}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
4747
<ROW Component="APPDIR" ComponentId="{C52555BD-B541-4AA9-BB71-4EA74F875CA3}" Directory_="APPDIR" Attributes="0"/>
48-
<ROW Component="Nancy.Hosting.Self.dll" ComponentId="{E6589644-C94A-42A2-A25E-BACC2C9E44DD}" Directory_="APPDIR" Attributes="0" KeyPath="Nancy.Hosting.Self.dll"/>
49-
<ROW Component="Nancy.Hosting.Self.xml" ComponentId="{C7839FDE-D826-4E46-9C41-7CBEEDE2ABDB}" Directory_="APPDIR" Attributes="0" KeyPath="Nancy.Hosting.Self.xml" Type="0"/>
50-
<ROW Component="Nancy.dll" ComponentId="{92BB4EF1-6CF7-4407-B7E1-EA0D0F2CAB8A}" Directory_="APPDIR" Attributes="0" KeyPath="Nancy.dll"/>
5148
<ROW Component="ParticularSoftware" ComponentId="{3D19C20F-940E-4A60-ACEF-ACDDF010F2D9}" Directory_="APPDIR" Attributes="4" KeyPath="ParticularSoftware"/>
5249
<ROW Component="ProductInformation" ComponentId="{E871FDAC-CF7D-45FA-A1C9-73006CE87216}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
5350
<ROW Component="SHORTCUTDIR" ComponentId="{7C9E09BA-EAB2-4EF3-B35C-E7497EE433DE}" Directory_="SHORTCUTDIR" Attributes="0"/>
5451
<ROW Component="ServicePulse" ComponentId="{02519674-CE1F-48C0-8F22-78B2827C507D}" Directory_="APPDIR" Attributes="4" KeyPath="ServicePulse"/>
5552
<ROW Component="ServicePulse.Host.exe" ComponentId="{AE9BCD73-377B-49A1-812D-AEBB7013AA5F}" Directory_="APPDIR" Attributes="0" KeyPath="ServicePulse.Host.exe"/>
5653
</COMPONENT>
5754
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
58-
<ROW Feature="ServicePulse" Title="NServiceBus ServicePulse" Description="Management Pack provides auditing and analysis features for NServiceBus." Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath APPDIR Nancy.Hosting.Self.dll Nancy.Hosting.Self.xml Nancy.dll ParticularSoftware ProductInformation SHORTCUTDIR ServicePulse ServicePulse.Host.exe"/>
55+
<ROW Feature="ServicePulse" Title="NServiceBus ServicePulse" Description="Management Pack provides auditing and analysis features for NServiceBus." Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath APPDIR ParticularSoftware ProductInformation SHORTCUTDIR ServicePulse ServicePulse.Host.exe"/>
5956
<ATTRIBUTE name="CurrentFeature" value="ServicePulse"/>
6057
</COMPONENT>
6158
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
62-
<ROW File="Nancy.Hosting.Self.dll" Component_="Nancy.Hosting.Self.dll" FileName="NancyH~1.dll|Nancy.Hosting.Self.dll" Attributes="0" SourcePath="binaries\Nancy.Hosting.Self.dll" SelfReg="false" NextFile="Nancy.Hosting.Self.xml"/>
63-
<ROW File="Nancy.Hosting.Self.xml" Component_="Nancy.Hosting.Self.xml" FileName="NancyH~1.xml|Nancy.Hosting.Self.xml" Attributes="0" SourcePath="binaries\Nancy.Hosting.Self.xml" SelfReg="false" NextFile="Nancy.xml"/>
64-
<ROW File="Nancy.dll" Component_="Nancy.dll" FileName="Nancy.dll" Attributes="0" SourcePath="binaries\Nancy.dll" SelfReg="false" NextFile="Nancy.Hosting.Self.dll"/>
65-
<ROW File="Nancy.xml" Component_="Nancy.Hosting.Self.xml" FileName="Nancy.xml" Attributes="0" SourcePath="binaries\Nancy.xml" SelfReg="false" NextFile="ServicePulse.Host.pdb"/>
66-
<ROW File="ServicePulse.Host.exe" Component_="ServicePulse.Host.exe" FileName="Servic~1.exe|ServicePulse.Host.exe" Attributes="0" SourcePath="binaries\ServicePulse.Host.exe" SelfReg="false" NextFile="Nancy.dll" DigSign="true"/>
67-
<ROW File="ServicePulse.Host.pdb" Component_="ServicePulse.Host.exe" FileName="Servic~1.pdb|ServicePulse.Host.pdb" Attributes="0" SourcePath="binaries\ServicePulse.Host.pdb" SelfReg="false"/>
59+
<ROW File="ServicePulse.Host.exe" Component_="ServicePulse.Host.exe" FileName="Servic~1.exe|ServicePulse.Host.exe" Attributes="0" SourcePath="binaries\ServicePulse.Host.exe" SelfReg="false" DigSign="true"/>
6860
</COMPONENT>
6961
<COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
7062
<ROW RemoveFile="_" Options="3"/>
@@ -335,7 +327,7 @@
335327
<ROW Action="Install_Service" Type="3074" Source="viewer.exe" Target="/HideWindow &quot;[#ServicePulse.Host.exe]&quot; --install --serviceName=&quot;Particular.ServicePulse&quot; --description=&quot;Monitoring and operations for NServiceBus&quot; --url=http://localhost:[INST_PORT_PULSE] --serviceControlUrl=[INST_URI] --autostart" Options="1"/>
336328
<ROW Action="Invalid_ServiceControlUrl_Msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER_4"/>
337329
<ROW Action="Invalid_ServicePulseUrl_Msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER_3"/>
338-
<ROW Action="Launch_Url" Type="1090" Source="viewer.exe" Target="http://www.particular.net/Installation-completed?installer=ServicePulse&amp;version=[ProductVersion]&amp;localURL=[INST_URI_PULSE]" Options="1"/>
330+
<ROW Action="Launch_Url" Type="1090" Source="viewer.exe" Target="http://www.particular.net/Installation-completed?installer=ServicePulse&amp;version=[ProductVersion]&amp;localURL=http://localhost:[INST_PORT_PULSE]" Options="1"/>
339331
<ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFilesFolder]\Particular Software\ServicePulse\"/>
340332
<ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]" MultiBuildTarget="DefaultBuild:[ProgramMenuFolder]\Particular Software\"/>
341333
<ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
@@ -349,7 +341,7 @@
349341
<ROW Name="Operations_1.exe" SourcePath="res\Operations.ico" Index="0"/>
350342
</COMPONENT>
351343
<COMPONENT cid="caphyon.advinst.msicomp.MsiIniFileComponent">
352-
<ROW IniFile="URL" FileName="Servic~1.url|ServicePulse Web Application.url" DirProperty="SHORTCUTDIR" Section="InternetShortcut" Key="URL" Value="[INST_URI_PULSE]" Action="0" Component_="ServicePulse.Host.exe"/>
344+
<ROW IniFile="URL" FileName="Servic~1.url|ServicePulse Web Application.url" DirProperty="SHORTCUTDIR" Section="InternetShortcut" Key="URL" Value="http://localhost:[INST_PORT_PULSE]" Action="0" Component_="ServicePulse.Host.exe"/>
353345
<ROW IniFile="WorkingDirectory" FileName="Servic~1.url|ServicePulse Web Application.url" DirProperty="SHORTCUTDIR" Section="InternetShortcut" Key="WorkingDirectory" Value="[SHORTCUTDIR]" Action="0" Component_="ServicePulse.Host.exe"/>
354346
</COMPONENT>
355347
<COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">

‎src/Chocolatey/Chocolatey.csproj‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{83786CE5-D899-43DF-AD4E-C2CA3BACFFC2}</ProjectGuid>
7+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
8+
</PropertyGroup>
9+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
10+
<ConfigurationName>Debug</ConfigurationName>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
13+
<ConfigurationName>Release</ConfigurationName>
14+
</PropertyGroup>
15+
<PropertyGroup>
16+
<OutputType>Library</OutputType>
17+
</PropertyGroup>
18+
<PropertyGroup>
19+
<StartupObject />
20+
</PropertyGroup>
21+
<ItemGroup>
22+
<None Include="Package\chocolateyInstall.ps1" />
23+
<None Include="Package\chocolateyUninstall.ps1" />
24+
<None Include="Package\elevatedUninstall.ps1" />
25+
<None Include="Package\ServicePulse.install.nuspec" />
26+
</ItemGroup>
27+
<Target Name="ReBuild" DependsOnTargets="Build" />
28+
<UsingTask TaskName="GitVersionTask.GetVersion" AssemblyFile="$(SolutionDir)..\buildsupport\GitVersionTask\GitVersionTask.dll" />
29+
<UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(ProjectDir)PepitaPackage.dll" />
30+
<UsingTask TaskName="MSBuild.Community.Tasks.FileUpdate" AssemblyFile="$(ProjectDir)MSBuild.Community.Tasks.dll" />
31+
<Target Name="Clean">
32+
<ItemGroup>
33+
<FilesToDelete Include="$(ProjectDir)\Output`\**\*.*" />
34+
</ItemGroup>
35+
<Delete Files="@(FilesToDelete)" />
36+
</Target>
37+
<Target Name="Build" DependsOnTargets="Clean">
38+
<GetVersion SolutionDirectory="$(SolutionDir)">
39+
<Output TaskParameter="SemVer" PropertyName="SemVer" />
40+
<Output TaskParameter="BranchName" PropertyName="BranchName" />
41+
<Output TaskParameter="MajorMinorPatch" PropertyName="MajorMinorPatch" />
42+
<Output TaskParameter="LegacySemVerPadded" PropertyName="LegacySemVerPadded" />
43+
</GetVersion>
44+
<PropertyGroup Condition=" '$(BranchName)' == 'Master' ">
45+
<ChocoVersion>$(MajorMinorPatch)</ChocoVersion>
46+
</PropertyGroup>
47+
<PropertyGroup Condition=" '$(BranchName)' != 'Master' ">
48+
<ChocoVersion>$(LegacySemVerPadded)</ChocoVersion>
49+
</PropertyGroup>
50+
51+
52+
<MakeDir Directories="$(ProjectDir)Output" />
53+
<Copy SourceFiles="$(ProjectDir)Package\ServicePulse.install.nuspec" DestinationFolder="$(ProjectDir)Output" />
54+
<Copy SourceFiles="$(ProjectDir)Package\chocolateyInstall.ps1" DestinationFolder="$(ProjectDir)Output\Tools" />
55+
<Copy SourceFiles="$(ProjectDir)Package\chocolateyUninstall.ps1" DestinationFolder="$(ProjectDir)Output\Tools" />
56+
<Copy SourceFiles="$(ProjectDir)Package\elevatedUninstall.ps1" DestinationFolder="$(ProjectDir)Output\Tools" />
57+
<ItemGroup>
58+
<InstallFile Include="$(ProjectDir)Output\Tools\chocolateyInstall.ps1" />
59+
<InstallFile Include="$(ProjectDir)Output\Tools\chocolateyUninstall.ps1" />
60+
<InstallFile Include="$(ProjectDir)Output\Tools\elevatedUninstall.ps1" />
61+
</ItemGroup>
62+
<FileUpdate Files="@(InstallFile)" Regex="{{FileVersion}}" ReplacementText="$(SemVer)" />
63+
<FileUpdate Files="@(InstallFile)" Regex="{{ReleaseName}}" ReplacementText="$(ChocoVersion)" />
64+
<FileUpdate Files="@(InstallFile)" Regex="{{MajorMinorPatch}}" ReplacementText="$(MajorMinorPatch)" />
65+
<CreatePackageTask NuGetBuildDirectory="$(ProjectDir)Output" Version="$(ChocoVersion)" TargetDir="$(SolutionDir)..\nugets" />
66+
67+
</Target>
68+
</Project>

‎src/Chocolatey/ServicePulse.install.nuspec‎ renamed to ‎src/Chocolatey/Package/ServicePulse.install.nuspec‎

File renamed without changes.

‎src/Chocolatey/chocolateyInstall.ps1‎ renamed to ‎src/Chocolatey/Package/chocolateyInstall.ps1‎

File renamed without changes.

‎src/Chocolatey/chocolateyUninstall.ps1‎ renamed to ‎src/Chocolatey/Package/chocolateyUninstall.ps1‎

File renamed without changes.

‎src/Chocolatey/elevatedUninstall.ps1‎ renamed to ‎src/Chocolatey/Package/elevatedUninstall.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$productName = "ServicePulse";
2-
$version = "MajorMinorPatch";
2+
$version = "{{MajorMinorPatch}}";
33

44
$app = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -like "$productName*" -and ($_.Version -eq "$version") }
55
if($app -eq $null)

‎src/Chocolatey/readme.txt‎

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

‎src/ServicePulse.Chocolatey.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30501.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chocolatey", "Chocolatey\Chocolatey.csproj", "{83786CE5-D899-43DF-AD4E-C2CA3BACFFC2}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{83786CE5-D899-43DF-AD4E-C2CA3BACFFC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{83786CE5-D899-43DF-AD4E-C2CA3BACFFC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{83786CE5-D899-43DF-AD4E-C2CA3BACFFC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{83786CE5-D899-43DF-AD4E-C2CA3BACFFC2}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎src/ServicePulse.Host/app/js/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ angular.module('sc', [
2222
'dashboard']);
2323

2424
angular.module('sc')
25-
.constant('version', '1.1.0-unstable.30+30.Branch.develop.Sha.9f2c9e7e3f7001eb55dabb4937c50bade92b5842')
25+
.constant('version', '1.1.0')
2626
.constant('scConfig', SC.config);
2727

2828
angular.module('sc')

0 commit comments

Comments
 (0)