Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hirschmann committed May 29, 2017
2 parents d427277 + 34fddfd commit 2e86ddd
Show file tree
Hide file tree
Showing 69 changed files with 1,346 additions and 947 deletions.
5 changes: 1 addition & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
version: '{build}'
clone_depth: 5
image: Visual Studio 2015
image: Visual Studio 2017
configuration: ReleaseWindows
platform: Any CPU

install:
- cinst wixtoolset --version 3.10.3.3007 --checksumtype=sha256 --checksum=3C125E3551C035F69ED24ACD8FB4EF7B74C1311ECACF1F8FC1EB7E0DD47D9C75

before_build:
- nuget restore

Expand Down
File renamed without changes.
55 changes: 14 additions & 41 deletions Core/NbfcCli/NbfcCli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,29 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWindows|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>bin\DebugWindows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<appConfig>App.Windows.config</appConfig>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWindows|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>bin\ReleaseWindows\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<appConfig>App.Windows.config</appConfig>
</PropertyGroup>
<PropertyGroup>
<StartupObject>NbfcCli.Program</StartupObject>
Expand All @@ -60,7 +47,6 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<appConfig>App.Linux.config</appConfig>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
Expand All @@ -74,13 +60,11 @@
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<appConfig>App.Linux.config</appConfig>
<appConfig>App.Linux.config</appConfig>
</PropertyGroup>
<ItemGroup>
<Reference Include="clipr, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\clipr.1.5.1\lib\net35\clipr.dll</HintPath>
<Private>True</Private>
<Reference Include="clipr, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\clipr.1.6.0\lib\net35\clipr.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -112,7 +96,7 @@
<None Include="App.Linux.config">
<SubType>Designer</SubType>
</None>
<None Include="App.config">
<None Include="App.Windows.config">
<SubType>Designer</SubType>
</None>
<None Include="App.manifest" />
Expand Down Expand Up @@ -152,23 +136,12 @@
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild" Condition="'$(Configuration)' == 'ReleaseLinux'">
<Copy SourceFiles="$(TargetPath);$(TargetPath).config;$(TargetDir)clipr.dll" DestinationFolder="$(ProjectDir)\..\..\Linux\bin\$(Configuration)\" ContinueOnError="true" />
<Target Name="AfterBuild">
<Copy Condition="'$(Configuration)' == 'ReleaseLinux'" SourceFiles="$(TargetPath);$(TargetPath).config;$(TargetDir)clipr.dll" DestinationFolder="$(ProjectDir)\..\..\Linux\bin\Release\" ContinueOnError="true" />
<Copy Condition="'$(Configuration)' == 'DebugLinux'" SourceFiles="$(TargetPath);$(TargetPath).config;$(TargetDir)clipr.dll" DestinationFolder="$(ProjectDir)\..\..\Linux\bin\Debug\" ContinueOnError="true" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down
2 changes: 1 addition & 1 deletion Core/NbfcCli/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="clipr" version="1.5.1" targetFramework="net45" />
<package id="clipr" version="1.6.0" targetFramework="net45" />
</packages>
27 changes: 16 additions & 11 deletions Core/NbfcProbe/NbfcProbe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F6104868-81A7-4D09-8AD2-8CF261D58319}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>NbfcProbe</RootNamespace>
Expand All @@ -13,7 +11,7 @@
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWindows|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand All @@ -25,7 +23,7 @@
<Externalconsole>true</Externalconsole>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWindows|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
Expand All @@ -42,17 +40,23 @@
<ApplicationManifest>App.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
<OutputPath>bin\ReleaseLinux\</OutputPath>
<OutputPath>bin\Release\</OutputPath>
<Optimize>true</Optimize>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="clipr, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\clipr.1.5.1\lib\net35\clipr.dll</HintPath>
<Private>True</Private>
<Reference Include="clipr, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\clipr.1.6.0\lib\net35\clipr.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Expand All @@ -66,8 +70,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild" Condition="'$(Configuration)' == 'ReleaseLinux'">
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(ProjectDir)\..\..\Linux\bin\$(Configuration)\" ContinueOnError="true" />
<Target Name="AfterBuild">
<Copy Condition="'$(Configuration)' == 'ReleaseLinux'" SourceFiles="$(TargetPath)" DestinationFolder="$(ProjectDir)\..\..\Linux\bin\Release\" ContinueOnError="true" />
<Copy Condition="'$(Configuration)' == 'DebugLinux'" SourceFiles="$(TargetPath)" DestinationFolder="$(ProjectDir)\..\..\Linux\bin\Debug\" ContinueOnError="true" />
</Target>
<ItemGroup>
<ProjectReference Include="..\NbfcCli\NbfcCli.csproj">
Expand Down
2 changes: 1 addition & 1 deletion Core/NbfcProbe/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="clipr" version="1.5.1" targetFramework="net45" />
<package id="clipr" version="1.6.0" targetFramework="net45" />
</packages>
77 changes: 69 additions & 8 deletions Core/NbfcService/App.Linux.config
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
</configSections>

<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>

<system.serviceModel>
<services>
<service name="StagWare.FanControl.Service.FanControlService">
<endpoint
address=""
binding="netTcpBinding"
bindingConfiguration=""
<endpoint
address=""
binding="netTcpBinding"
bindingConfiguration=""
contract="StagWare.FanControl.Service.IFanControlService">
<identity>
<dns value="localhost"/>
</identity>
</endpoint>

<host>
<baseAddresses>
<add baseAddress="net.tcp://localhost:8523/StagWare.FanControl.Service/FanControlService"/>
Expand All @@ -31,7 +39,60 @@
</behaviors>
</system.serviceModel>

<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
</startup>
<nlog
xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
useInvariantCulture="true">

<variable name="logdir" value="/etc/NbfcService"/>

<targets>
<target
xsi:type="Console"
name="stdout"
error="false"
detectConsoleAvailable="false">

<layout xsi:type="CsvLayout" delimiter="Semicolon" withHeader="false">
<column name="time" layout="${longdate}" />
<column name="level" layout="${level}"/>
<column name="message" layout="${message}" />
<column name="exception" layout="${exception}"/>
<column name="callsite" layout="${callsite:includeSourcePath=true}" />
<column name="stacktrace" layout="${stacktrace:topFrames=20}" />
</layout>
</target>

<target
name="logfile"
xsi:type="AsyncWrapper"
timeToSleepBetweenBatches="0"
queueLimit="1000"
overflowAction="Grow">
<target
xsi:type="File"
fileName="${logdir}/NbfcServiceLog.txt"
archiveFileName="${logdir}/NbfcServiceLog.{#}.txt"
archiveNumbering="Date"
archiveDateFormat="yyyy-MM-dd"
archiveEvery="Monday"
maxArchiveFiles="3"
encoding="utf-8">

<layout xsi:type="CsvLayout" delimiter="Semicolon" withHeader="true">
<column name="time" layout="${longdate}" />
<column name="level" layout="${level}"/>
<column name="message" layout="${message}" />
<column name="exception" layout="${exception}"/>
<column name="callsite" layout="${callsite:includeSourcePath=true}" />
<column name="stacktrace" layout="${stacktrace:topFrames=20}" />
</layout>
</target>
</target>
</targets>

<rules>
<logger name="*" minlevel="Info" writeTo="logfile" />
</rules>
</nlog>
</configuration>
89 changes: 89 additions & 0 deletions Core/NbfcService/App.Windows.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
</configSections>

<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>

<system.serviceModel>
<services>
<service name="StagWare.FanControl.Service.FanControlService">
<endpoint
address=""
binding="netNamedPipeBinding"
bindingConfiguration=""
contract="StagWare.FanControl.Service.IFanControlService">
<identity>
<dns value="localhost"/>
</identity>
</endpoint>

<host>
<baseAddresses>
<add baseAddress="net.pipe://localhost/StagWare.FanControl.Service/FanControlService"/>
</baseAddresses>
</host>
</service>
</services>

<behaviors>
<serviceBehaviors>
<behavior>
<serviceMetadata httpGetEnabled="False" httpsGetEnabled="False"/>
<serviceDebug includeExceptionDetailInFaults="True"/>
</behavior>
</serviceBehaviors>
</behaviors>
</system.serviceModel>

<nlog
xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
useInvariantCulture="true">

<variable name="logdir" value="${specialfolder:folder=CommonApplicationData}\NbfcService"/>

<targets>
<target
xsi:type="EventLog"
name="eventlog"
log="Application"
source="NoteBookFanControlService"
layout="Message: ${message}${newline}Exception: ${exception}${newline}Callsite: ${callsite:includeSourcePath=true}${newline}Stacktrace: ${stacktrace:topFrames=20}"/>

<target
name="logfile"
xsi:type="AsyncWrapper"
timeToSleepBetweenBatches="0"
queueLimit="1000"
overflowAction="Grow">
<target
xsi:type="File"
fileName="${logdir}\NbfcServiceLog.txt"
archiveFileName="${logdir}\NbfcServiceLog.{#}.txt"
archiveNumbering="Date"
archiveDateFormat="yyyy-MM-dd"
archiveEvery="Monday"
maxArchiveFiles="3"
encoding="utf-8">

<layout xsi:type="CsvLayout" delimiter="Semicolon" withHeader="true">
<column name="time" layout="${longdate}" />
<column name="level" layout="${level}"/>
<column name="message" layout="${message}" />
<column name="exception" layout="${exception}"/>
<column name="callsite" layout="${callsite:includeSourcePath=true}" />
<column name="stacktrace" layout="${stacktrace:topFrames=20}" />
</layout>
</target>
</target>
</targets>

<rules>
<logger name="*" minlevel="Info" writeTo="logfile" />
</rules>
</nlog>
</configuration>
Loading

0 comments on commit 2e86ddd

Please sign in to comment.