Skip to content

Commit

Permalink
Remove OpenMacroBoard Submodule and add it via nuget.
Browse files Browse the repository at this point in the history
Improved build script.
  • Loading branch information
Christian Wischenbart committed Aug 25, 2018
1 parent e15e4fa commit af6dd0e
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 16 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,6 +1,3 @@
[submodule "src/HidLibrary"]
path = src/HidLibrary
url = https://github.com/OpenStreamDeck/HidLibrary
[submodule "src/OpenMacroBoard"]
path = src/OpenMacroBoard
url = https://github.com/OpenMacroBoard/OpenMacroBoard-Core
2 changes: 0 additions & 2 deletions build/create-nugetpackage.bat

This file was deleted.

19 changes: 19 additions & 0 deletions build/post-release-build.bat
@@ -0,0 +1,19 @@
@echo off
pushd
cd /D "%~dp0"

REM Cleanup target directory
del "..\src\StreamDeckSharp\bin\Release\Merged\*.dll"
del "..\src\StreamDeckSharp\bin\Release\Merged\*.xml"
del "..\src\StreamDeckSharp\bin\Release\Merged\*.pdb"
del "..\src\StreamDeckSharp\bin\Release\Merged\*.nupkg"

REM Merge hidlib and streamdecksharp
ILRepack.exe /out:"..\src\StreamDeckSharp\bin\Release\Merged\StreamDeckSharp.dll" /xmldocs /internalize "..\src\StreamDeckSharp\bin\Release\StreamDeckSharp.dll" "..\src\StreamDeckSharp\bin\Release\HidLibrary.dll"

REM Create nuget package
nuget.exe pack "..\src\StreamDeckSharp\StreamDeckSharp.nuspec" -OutputDirectory "..\src\StreamDeckSharp\bin\Release\Merged"

popd

exit /b 0
2 changes: 0 additions & 2 deletions build/repack-release.bat

This file was deleted.

1 change: 0 additions & 1 deletion src/OpenMacroBoard
Submodule OpenMacroBoard deleted from d3323b
4 changes: 2 additions & 2 deletions src/StreamDeckSharp/StreamDeck.cs
Expand Up @@ -17,9 +17,9 @@ public static class StreamDeck
/// </summary>
/// <returns>The default <see cref="IMacroBoard"/> HID</returns>
/// <exception cref="StreamDeckNotFoundException">Thrown if no Stream Deck is found</exception>
public static IMacroBoard OpenDevice()
public static IMacroBoard OpenDevice(params IUsbHidHardware[] hardware)
{
var dev = EnumerateDevices().FirstOrDefault();
var dev = EnumerateDevices(hardware).FirstOrDefault();
return dev?.Open() ?? throw new StreamDeckNotFoundException();
}

Expand Down
10 changes: 10 additions & 0 deletions src/StreamDeckSharp/StreamDeckSharp.csproj
Expand Up @@ -45,6 +45,9 @@
</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenMacroBoard.SDK, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenMacroBoard.SDK.0.2.0\lib\net40\OpenMacroBoard.SDK.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand Down Expand Up @@ -86,10 +89,17 @@
<Name>HidLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
</Target>
<PropertyGroup>
<PostBuildEvent>"$(SolutionDir)..\build\post-release-build.bat"
</PostBuildEvent>
</PropertyGroup>
</Project>
15 changes: 9 additions & 6 deletions src/StreamDeckSharp/StreamDeckSharp.nuspec
@@ -1,16 +1,19 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>streamdecksharp</id>
<version>0.1.10</version>
<id>StreamDeckSharp</id>
<version>0.2.0</version>
<title>StreamDeckSharp</title>
<authors>Christian Wischenbart</authors>
<licenseUrl>https://github.com/OpenStreamDeck/StreamDeckSharp/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/OpenStreamDeck/StreamDeckSharp</projectUrl>
<iconUrl>https://raw.githubusercontent.com/OpenStreamDeck/StreamDeckSharp/master/doc/icon64.png</iconUrl>
<licenseUrl>https://github.com/OpenMacroBoard/StreamDeckSharp/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/OpenMacroBoard/StreamDeckSharp</projectUrl>
<iconUrl>https://raw.githubusercontent.com/OpenMacroBoard/StreamDeckSharp/master/doc/icon64.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A simple .NET interface for the Stream Deck HID</description>
<tags>streamdeck elgato stream deck</tags>
<tags>streamdeck elgato stream deck open macro board openmacroboard</tags>
<dependencies>
<dependency id="OpenMacroBoard.SDK" version="[0.2,0.3)" />
</dependencies>
</metadata>
<files>
<file src="bin\Release\Merged\StreamDeckSharp.xml" target="lib\net40\" />
Expand Down
4 changes: 4 additions & 0 deletions src/StreamDeckSharp/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OpenMacroBoard.SDK" version="0.2.0" targetFramework="net40" />
</packages>

0 comments on commit af6dd0e

Please sign in to comment.