Upgrade LibMiniDisplay package to v1.1.7.
authorStephaneLenclud
Fri, 25 Sep 2015 19:25:35 +0200
changeset 16215aa52fe5795
parent 161 7b19bea5d73a
child 163 0c5930689ea1
Upgrade LibMiniDisplay package to v1.1.7.
Removing MiniDisplay DLL again.
PowerManager/PowerManager.cpp
Server/MiniDisplay.dll
Server/SharpDisplayManager.csproj
Server/packages.config
     1.1 --- a/PowerManager/PowerManager.cpp	Fri Sep 25 12:28:47 2015 +0200
     1.2 +++ b/PowerManager/PowerManager.cpp	Fri Sep 25 19:25:35 2015 +0200
     1.3 @@ -32,7 +32,7 @@
     1.4          iMonitorPowerHandle = NULL;
     1.5      }
     1.6  
     1.7 -    /// TODO: Make this generic by passing the HPOWERNOTIFY by reference and GUID as parameter too
     1.8 +    ///
     1.9      HPOWERNOTIFY SettingNotifier::RegisterPowerSettingNotification(LPCGUID aGuid)
    1.10  	{
    1.11          HANDLE handle = iHandle.ToPointer();
    1.12 @@ -61,8 +61,6 @@
    1.13                  }
    1.14              }
    1.15          }
    1.16 -
    1.17 -
    1.18      }
    1.19  
    1.20      ///
     2.1 Binary file Server/MiniDisplay.dll has changed
     3.1 --- a/Server/SharpDisplayManager.csproj	Fri Sep 25 12:28:47 2015 +0200
     3.2 +++ b/Server/SharpDisplayManager.csproj	Fri Sep 25 19:25:35 2015 +0200
     3.3 @@ -13,7 +13,8 @@
     3.4      <FileAlignment>512</FileAlignment>
     3.5      <TargetFrameworkProfile />
     3.6      <IsWebBootstrapper>true</IsWebBootstrapper>
     3.7 -    <NuGetPackageImportStamp>c59d0cd0</NuGetPackageImportStamp>
     3.8 +    <NuGetPackageImportStamp>
     3.9 +    </NuGetPackageImportStamp>
    3.10      <PublishUrl>ftp://lenclud%40monroe.dreamhost.com/publish.slions.net/SharpDisplayManager/</PublishUrl>
    3.11      <Install>true</Install>
    3.12      <InstallFrom>Web</InstallFrom>
    3.13 @@ -112,8 +113,8 @@
    3.14      </Reference>
    3.15      <Reference Include="Microsoft.VisualBasic" />
    3.16      <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    3.17 -    <Reference Include="MiniDisplayInterop">
    3.18 -      <HintPath>..\packages\LibMiniDisplay.1.1.4\lib\MiniDisplayInterop.dll</HintPath>
    3.19 +    <Reference Include="MiniDisplayInterop, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
    3.20 +      <HintPath>..\packages\LibMiniDisplay.1.1.7\lib\net20\MiniDisplayInterop.dll</HintPath>
    3.21        <Private>True</Private>
    3.22      </Reference>
    3.23      <Reference Include="NAudio, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
    3.24 @@ -273,23 +274,17 @@
    3.25      </COMReference>
    3.26    </ItemGroup>
    3.27    <ItemGroup>
    3.28 -    <WCFMetadata Include="Service References\" />
    3.29 -  </ItemGroup>
    3.30 -  <ItemGroup>
    3.31      <Content Include="libcec.dll">
    3.32        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    3.33      </Content>
    3.34 -    <Content Include="MiniDisplay.dll">
    3.35 -      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    3.36 -    </Content>
    3.37    </ItemGroup>
    3.38    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    3.39 -  <Import Project="..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets" Condition="Exists('..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets')" />
    3.40 +  <Import Project="..\packages\LibMiniDisplay.1.1.7\build\LibMiniDisplay.targets" Condition="Exists('..\packages\LibMiniDisplay.1.1.7\build\LibMiniDisplay.targets')" />
    3.41    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    3.42      <PropertyGroup>
    3.43 -      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    3.44 +      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    3.45      </PropertyGroup>
    3.46 -    <Error Condition="!Exists('..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibMiniDisplay.1.1.4\build\LibMiniDisplay.targets'))" />
    3.47 +    <Error Condition="!Exists('..\packages\LibMiniDisplay.1.1.7\build\LibMiniDisplay.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibMiniDisplay.1.1.7\build\LibMiniDisplay.targets'))" />
    3.48    </Target>
    3.49    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
    3.50         Other similar extension points exist, see Microsoft.Common.targets.
     4.1 --- a/Server/packages.config	Fri Sep 25 12:28:47 2015 +0200
     4.2 +++ b/Server/packages.config	Fri Sep 25 19:25:35 2015 +0200
     4.3 @@ -1,6 +1,6 @@
     4.4  <?xml version="1.0" encoding="utf-8"?>
     4.5  <packages>
     4.6 -  <package id="LibMiniDisplay" version="1.1.4" targetFramework="net45" />
     4.7 +  <package id="LibMiniDisplay" version="1.1.7" targetFramework="net46" />
     4.8    <package id="NAudio" version="1.7.3" targetFramework="net45" />
     4.9    <package id="SharpLibHid" version="1.2.1" targetFramework="net45" />
    4.10    <package id="SharpLibWin32" version="0.0.7" targetFramework="net45" />