Skip to content

Commit 346cfab

Browse files
kornyskornys
authored
Merge pull request #2 from jdanekrh/jd_line_endings
FIX normalize line endings in the project
2 parents 025edab + f71f391 commit 346cfab

Some content is hidden

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

63 files changed

+5459
-5453
lines changed

‎.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Declare files that will always have fixed line endings on checkout.
5+
*.bat text eof=crlf
6+

‎.travis.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
language: csharp
2-
solution: cli-netlite.sln
3-
dotnet: 2.0.0
4-
1+
language: csharp
2+
solution: cli-netlite.sln
3+
dotnet: 2.0.0
4+
55
services:
6-
- docker
7-
8-
install:
9-
- nuget restore cli-netlite.sln
10-
- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
11-
- dotnet restore
12-
13-
script:
6+
- docker
7+
8+
install:
9+
- nuget restore cli-netlite.sln
10+
- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
11+
- dotnet restore
12+
13+
script:
1414
# https://docs.travis-ci.com/user/docker/
1515
- docker pull enkeys/alpine-openjdk-amq7-snapshot
1616
- docker run --rm -v`pwd`/scripts:/mnt -p 5672:5672 -p 61616:61616 --entrypoint ash enkeys/alpine-openjdk-amq7-snapshot /mnt/entrypoint.sh amq7-server &
17-
- sleep 10
18-
- xbuild /p:Configuration=TravisCI cli-netlite.sln
19-
- mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./ClientUnitTests/bin/Debug/ClientUnitTests.dll
20-
- dotnet build ./ClientLibNetCore
21-
- dotnet build ./NetCoreSender
22-
- dotnet build ./NetCoreReceiver
23-
- dotnet build ./NetCoreConnector
17+
- sleep 10
18+
- xbuild /p:Configuration=TravisCI cli-netlite.sln
19+
- mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./ClientUnitTests/bin/Debug/ClientUnitTests.dll
20+
- dotnet build ./ClientLibNetCore
21+
- dotnet build ./NetCoreSender
22+
- dotnet build ./NetCoreReceiver
23+
- dotnet build ./NetCoreConnector
2424
- dotnet test ./NetCoreClientUnitTest/NetCoreClientUnitTest.csproj --verbosity normal

‎CliNetliteInstaller/CliNetliteInstaller.wixproj

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>3.10</ProductVersion>
7-
<ProjectGuid>f13fb7ef-d892-4229-a1eb-8b595d71d64e</ProjectGuid>
8-
<SchemaVersion>2.0</SchemaVersion>
9-
<OutputName>cli-netlite-2.1.1</OutputName>
10-
<OutputType>Package</OutputType>
11-
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13-
<OutputPath>bin\$(Configuration)\</OutputPath>
14-
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15-
<DefineConstants>Debug</DefineConstants>
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
18-
<OutputPath>bin\$(Configuration)\</OutputPath>
19-
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
20-
</PropertyGroup>
21-
<ItemGroup>
22-
<Compile Include="Dialogs\CustomWelcomeDlg.wxs" />
23-
<Compile Include="Dialogs\CustomWixUI.wxs" />
24-
<Compile Include="Product.wxs" />
25-
</ItemGroup>
26-
<ItemGroup>
27-
<Folder Include="Dialogs" />
28-
<Folder Include="Lang" />
29-
<Folder Include="Lang\en-us" />
30-
</ItemGroup>
31-
<ItemGroup>
32-
<WixExtension Include="WixUIExtension">
33-
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
34-
<Name>WixUIExtension</Name>
35-
</WixExtension>
36-
</ItemGroup>
37-
<ItemGroup>
38-
<Content Include="Lang\en-us\LICENSE.rtf" />
39-
<Content Include="packages.config" />
40-
</ItemGroup>
41-
<ItemGroup>
42-
<EmbeddedResource Include="Lang\en-us\Loc_en-us.wxl" />
43-
</ItemGroup>
44-
<PropertyGroup>
45-
<WixToolPath>$(SolutionDir)packages\WiX.Toolset.UnofficialFork.3.11.0\tools\wix\</WixToolPath>
46-
<WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
47-
<WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
48-
</PropertyGroup>
49-
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
50-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
51-
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
52-
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
53-
</Target>
54-
<!--
55-
To modify your build process, add your task inside one of the targets below and uncomment it.
56-
Other similar extension points exist, see Wix.targets.
57-
<Target Name="BeforeBuild">
58-
</Target>
59-
<Target Name="AfterBuild">
60-
</Target>
61-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>3.10</ProductVersion>
7+
<ProjectGuid>f13fb7ef-d892-4229-a1eb-8b595d71d64e</ProjectGuid>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<OutputName>cli-netlite-2.1.1</OutputName>
10+
<OutputType>Package</OutputType>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13+
<OutputPath>bin\$(Configuration)\</OutputPath>
14+
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15+
<DefineConstants>Debug</DefineConstants>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
18+
<OutputPath>bin\$(Configuration)\</OutputPath>
19+
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
20+
</PropertyGroup>
21+
<ItemGroup>
22+
<Compile Include="Dialogs\CustomWelcomeDlg.wxs" />
23+
<Compile Include="Dialogs\CustomWixUI.wxs" />
24+
<Compile Include="Product.wxs" />
25+
</ItemGroup>
26+
<ItemGroup>
27+
<Folder Include="Dialogs" />
28+
<Folder Include="Lang" />
29+
<Folder Include="Lang\en-us" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<WixExtension Include="WixUIExtension">
33+
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
34+
<Name>WixUIExtension</Name>
35+
</WixExtension>
36+
</ItemGroup>
37+
<ItemGroup>
38+
<Content Include="Lang\en-us\LICENSE.rtf" />
39+
<Content Include="packages.config" />
40+
</ItemGroup>
41+
<ItemGroup>
42+
<EmbeddedResource Include="Lang\en-us\Loc_en-us.wxl" />
43+
</ItemGroup>
44+
<PropertyGroup>
45+
<WixToolPath>$(SolutionDir)packages\WiX.Toolset.UnofficialFork.3.11.0\tools\wix\</WixToolPath>
46+
<WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
47+
<WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
48+
</PropertyGroup>
49+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
50+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
51+
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
52+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
53+
</Target>
54+
<!--
55+
To modify your build process, add your task inside one of the targets below and uncomment it.
56+
Other similar extension points exist, see Wix.targets.
57+
<Target Name="BeforeBuild">
58+
</Target>
59+
<Target Name="AfterBuild">
60+
</Target>
61+
-->
6262
</Project>

‎CliNetliteInstaller/Dialogs/CustomWelcomeDlg.wxs

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<Fragment>
4-
<UI>
5-
<Dialog Id="Custom_WelcomeEulaDlg" Width="370" Height="270" Title="!(loc.WelcomeEulaDlg_Title)">
6-
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeEulaDlgBitmap)" />
7-
<Control Id="Title" Type="Text" X="130" Y="6" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgTitle)" />
8-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
9-
<Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="10" Height="10" CheckBoxValue="1" Property="LicenseAccepted" />
10-
<Control Id="LicenseAcceptedText" Type="Text" X="144" Y="207" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
11-
<Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
12-
<Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
13-
</Control>
14-
<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
15-
<Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">
16-
<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
17-
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
18-
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
19-
<Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
20-
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
21-
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
22-
<Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
23-
<Condition Action="enable">LicenseAccepted = "1"</Condition>
24-
<Condition Action="show">ALLUSERS</Condition>
25-
</Control>
26-
<Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">
27-
<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
28-
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
29-
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
30-
<Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
31-
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
32-
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
33-
<Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
34-
<Condition Action="enable">LicenseAccepted = "1"</Condition>
35-
<Condition Action="show">NOT ALLUSERS</Condition>
36-
</Control>
37-
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
38-
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
39-
</Control>
40-
<Control Id="LicenseText" Type="ScrollableText" X="130" Y="36" Width="226" Height="162" Sunken="yes" TabSkip="no">
41-
<Text SourceFile="!(loc.LicenseRtf)" />
42-
</Control>
43-
</Dialog>
44-
</UI>
45-
</Fragment>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Fragment>
4+
<UI>
5+
<Dialog Id="Custom_WelcomeEulaDlg" Width="370" Height="270" Title="!(loc.WelcomeEulaDlg_Title)">
6+
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeEulaDlgBitmap)" />
7+
<Control Id="Title" Type="Text" X="130" Y="6" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgTitle)" />
8+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
9+
<Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="10" Height="10" CheckBoxValue="1" Property="LicenseAccepted" />
10+
<Control Id="LicenseAcceptedText" Type="Text" X="144" Y="207" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
11+
<Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
12+
<Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
13+
</Control>
14+
<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
15+
<Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">
16+
<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
17+
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
18+
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
19+
<Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
20+
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
21+
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
22+
<Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
23+
<Condition Action="enable">LicenseAccepted = "1"</Condition>
24+
<Condition Action="show">ALLUSERS</Condition>
25+
</Control>
26+
<Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">
27+
<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
28+
<Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
29+
<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
30+
<Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
31+
<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
32+
<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
33+
<Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
34+
<Condition Action="enable">LicenseAccepted = "1"</Condition>
35+
<Condition Action="show">NOT ALLUSERS</Condition>
36+
</Control>
37+
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
38+
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
39+
</Control>
40+
<Control Id="LicenseText" Type="ScrollableText" X="130" Y="36" Width="226" Height="162" Sunken="yes" TabSkip="no">
41+
<Text SourceFile="!(loc.LicenseRtf)" />
42+
</Control>
43+
</Dialog>
44+
</UI>
45+
</Fragment>
4646
</Wix>

0 commit comments

Comments
 (0)