Upgrading WaveLinkSDK, and adding ILMerge for fixing dependency hell.

oddbear · Aug 11, 2022 · dbe4b10 · dbe4b10
1 parent a7f873e
commit dbe4b10
Show file tree

Hide file tree

Showing 4 changed files with 136 additions and 0 deletions.
diff --git a/WaveLinkPlugin/FodyWeavers.xml b/WaveLinkPlugin/FodyWeavers.xml
@@ -0,0 +1,5 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+ <ILMerge NamespacePrefix='WaveLink'>
+ <ExcludeAssemblies>PluginAPI</ExcludeAssemblies>
+ </ILMerge>
+</Weavers>
diff --git a/WaveLinkPlugin/FodyWeavers.xsd b/WaveLinkPlugin/FodyWeavers.xsd
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+ <xs:element name="Weavers">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="ILMerge" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="IncludeAssemblies" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the assembly names to include in merging.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ExcludeAssemblies" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the assembly names to exclude from merging.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="IncludeResources" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the resource names to include in merging.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ExcludeResources" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the resource names to exclude from merging.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HideImportedTypes" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true'</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="NamespacePrefix" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A string that is used as prefix for the namespace of the imported types.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FullImport" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A switch to control whether to import the full assemblies or only the referenced types. Default is 'false'</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompactMode" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:all>
+ <xs:attribute name="IncludeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the assembly names to include in merging.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="ExcludeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the assembly names to exclude from merging.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="IncludeResources" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the resource names to include in merging.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="ExcludeResources" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A regular expression matching the resource names to exclude from merging.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="HideImportedTypes" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true'</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="NamespacePrefix" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A string that is used as prefix for the namespace of the imported types.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="FullImport" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>A switch to control whether to import the full assemblies or only the referenced types. Default is 'false'</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="CompactMode" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:all>
+ <xs:attribute name="VerifyAssembly" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="GenerateXsd" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/WaveLinkPlugin/WaveLinkPlugin.csproj b/WaveLinkPlugin/WaveLinkPlugin.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\ILMerge.Fody.1.23.0\build\ILMerge.Fody.props" Condition="Exists('..\packages\ILMerge.Fody.1.23.0\build\ILMerge.Fody.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
  <AssemblyName>WaveLinkPlugin</AssemblyName>
  <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
  <FileAlignment>512</FileAlignment>
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup>
  <BaseIntermediateOutputPath>$(SolutionDir)..\obj\</BaseIntermediateOutputPath>
@@ -38,6 +41,9 @@
  <Reference Include="ElgatoWaveSDK">
  <HintPath>..\..\ElgatoWaveLinkSDK\ElgatoWaveSDK\bin\Release\net472\ElgatoWaveSDK.dll</HintPath>
  </Reference>
+ <Reference Include="ILMerge, Version=1.23.0.0, Culture=neutral, PublicKeyToken=4d0e9a1cbec0d397, processorArchitecture=MSIL">
+ <HintPath>..\packages\ILMerge.Fody.1.23.0\lib\net452\ILMerge.dll</HintPath>
+ </Reference>
  <Reference Include="PluginApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
  <SpecificVersion>False</SpecificVersion>
  <HintPath>C:\Program Files (x86)\Loupedeck\Loupedeck2\PluginApi.dll</HintPath>
@@ -67,6 +73,7 @@
  </ItemGroup>
  <ItemGroup>
  <None Include="App.config" />
+ <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
  <EmbeddedResource Include="Resources\Icons\Icon-16.png" />
@@ -76,4 +83,12 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="..\packages\Fody.6.6.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.3\build\Fody.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <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>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\packages\Fody.6.6.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.3\build\Fody.targets'))" />
+ <Error Condition="!Exists('..\packages\ILMerge.Fody.1.23.0\build\ILMerge.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.Fody.1.23.0\build\ILMerge.Fody.props'))" />
+ </Target>
 </Project>
diff --git a/WaveLinkPlugin/packages.config b/WaveLinkPlugin/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Fody" version="6.6.3" targetFramework="net472" developmentDependency="true" />
+ <package id="ILMerge.Fody" version="1.23.0" targetFramework="net472" />
+</packages>