Merge branch 'stable'

* stable: (GH-1148) API - Merge AlphaFS Dependency
chocolatey · Jan 21, 2017 · 6effcc9 · 6effcc9
2 parents 60ae7d8 + 24b8251
commit 6effcc9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.build.custom/ilmergeDLL.build b/.build.custom/ilmergeDLL.build
@@ -52,6 +52,7 @@
           <include name="${dirs.merge.from}${path.separator}Rhino.Licensing.dll" />
           <include name="${dirs.merge.from}${path.separator}System.Reactive*.dll" />
           <include name="${dirs.merge.from}${path.separator}SimpleInjector.dll" />
+          <include name="${dirs.merge.from}${path.separator}AlphaFS.dll" />
           <!-- <exclude name="${dirs.merge.from}${path.separator}*" /> -->
         </items>
       </in>