Skip to content

Commit 41bdedb

Browse files
gbiellemgbiellem
committed
Merge branch 'develop'
2 parents 25f51e7 + 2a32b05 commit 41bdedb

File tree

55 files changed

+1296
-511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1296
-511
lines changed

‎installer/License.rtf‎

Lines changed: 291 additions & 87 deletions
Large diffs are not rendered by default.

‎installer/ServiceControl.aip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,8 @@
376376
<ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
377377
</COMPONENT>
378378
<COMPONENT cid="caphyon.advinst.msicomp.MsiLockPermComponent">
379-
<ROW LockObject="ServiceControl_Dir" Table="CreateFolder" User="Users" Permission="1610809791"/>
380-
<ROW LockObject="ServiceControl_Dir" Table="CreateFolder" User="Administrators" Permission="1880096767"/>
379+
<ROW LockObject="ServiceControl_Dir" Table="CreateFolder" User="[GRP_USERS]" Permission="1610809791"/>
380+
<ROW LockObject="ServiceControl_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1880096767"/>
381381
<ROW LockObject="ServiceControl_Dir" Table="CreateFolder" User="System" Permission="1880096767"/>
382382
</COMPONENT>
383383
<COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">

‎ripple.config‎

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

‎src/Chocolatey/Chocolatey.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@
3131
<Target Name="Build" DependsOnTargets="Build" />
3232
<Target Name="ReBuild" DependsOnTargets="Build" />
3333
<UsingTask TaskName="GitVersionTask.GetVersion" AssemblyFile="$(SolutionDir)..\buildsupport\GitVersionTask\GitVersionTask.dll" />
34-
<UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(SolutionDir)..\buildsupport\PepitaPackage.dll" />
35-
<UsingTask TaskName="MSBuild.Community.Tasks.FileUpdate" AssemblyFile="$(SolutionDir)..\buildsupport\MSBuild.Community.Tasks.dll" />
34+
<UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(ProjectDir)PepitaPackage.dll" />
35+
<UsingTask TaskName="MSBuild.Community.Tasks.FileUpdate" AssemblyFile="$(ProjectDir)MSBuild.Community.Tasks.dll" />
3636
<Target Name="Build">
3737
<GetVersion SolutionDirectory="$(SolutionDir)">
3838
<Output TaskParameter="SemVer" PropertyName="SemVer" />
3939
<Output TaskParameter="LegacySemVerPadded" PropertyName="ChocoVersion" />
4040
</GetVersion>
41-
4241
<ItemGroup>
4342
<FilesToDelete Include="$(ProjectDir)Build\**\*.*" />
4443
</ItemGroup>
@@ -55,8 +54,7 @@
5554
</ItemGroup>
5655
<FileUpdate Files="@(InstallFile)" Regex="{{FileVersion}}" ReplacementText="$(SemVer)" />
5756
<FileUpdate Files="@(InstallFile)" Regex="{{ReleaseName}}" ReplacementText="$(ChocoVersion)" />
58-
59-
<CreatePackageTask NuGetBuildDirectory="$(ProjectDir)Build" Version="$(ChocoVersion)" TargetDir="$(SolutionDir)..\nugets" />
57+
<CreatePackageTask NuGetBuildDirectory="$(ProjectDir)Build" Version="$(ChocoVersion)" TargetDir="$(SolutionDir)..\nugets" />
6058
</Target>
6159
<Target Name="Clean">
6260
</Target>

‎src/Chocolatey/MSBuild.Community.Tasks.dll‎

623 KB
Binary file not shown.

‎src/Chocolatey/PepitaPackage.dll‎

14.5 KB
Binary file not shown.

‎src/ServiceControl.AcceptanceTests/AcceptanceTest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,10 @@ static void Delete(string path)
215215
Directory.SetAccessControl(path, directorySecurity);
216216
}
217217

218-
Directory.Delete(path);
218+
if (! (Directory.GetFiles(path).Any() || Directory.GetDirectories(path).Any()))
219+
{
220+
Directory.Delete(path);
221+
}
219222
}
220223
finally
221224
{

‎src/ServiceControl.AcceptanceTests/App.config‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,47 @@
1-
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
44
</appSettings>
55
<connectionStrings>
66
</connectionStrings>
7+
<runtime>
8+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-5.6.2.0" newVersion="5.6.2.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-5.6.2.0" newVersion="5.6.2.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="NServiceBus.Core" publicKeyToken="9fc386479f8a226c" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="NServiceBus" publicKeyToken="9fc386479f8a226c" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="Raven.Client.Lightweight" publicKeyToken="37f41c7f99471593" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="Raven.Abstractions" publicKeyToken="37f41c7f99471593" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.1" newVersion="3.1.0.1" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-5.6.2.0" newVersion="5.6.2.0" />
44+
</dependentAssembly>
45+
</assemblyBinding>
46+
</runtime>
747
</configuration>

‎src/ServiceControl.AcceptanceTests/Properties/AssemblyInfo.cs‎

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

‎src/ServiceControl.AcceptanceTests/SagaAudit/When_a_message_that_is_handled_by_a_saga.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public void Message_should_be_enriched_with_saga_state_changes()
4646
AssertInitiatedHas2Sagas(messages, context);
4747
}
4848

49+
// ReSharper disable once UnusedParameter.Local
4950
static void AssertInitiatedHas2Sagas(IEnumerable<MessagesView> messages, MyContext context)
5051
{
5152
var m = messages.First(message => message.MessageType == typeof(InitiateSaga).FullName);

0 commit comments

Comments
 (0)