Merge branch 'master' of github.com:jeroenwalter/ComicRackWeborigin/linq2db

Conflicts:
	ComicRackWebViewer/ComicRackWebViewer.csproj

5 files changed, 17 insertions, 59 deletions

diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
deleted file mode 100644
index 6a318ad..0000000
--- a/.nuget/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<configuration>

-  <solution>

-    <add key="disableSourceControlIntegration" value="true" />

-  </solution>

-</configuration>
\ No newline at end of file
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
deleted file mode 100644
index 34ad49b..0000000
--- a/.nuget/NuGet.exe
+++ /dev/null
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
deleted file mode 100644
index 8993f4e..0000000
--- a/.nuget/NuGet.targets
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-    <PropertyGroup>

-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>

-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>

-        <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>

-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>

-        <PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>

-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>

-

-        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->

-        <PackageSources>""</PackageSources>

-

-        <!-- Enable the restore command to run before builds -->

-        <RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages>

-

-        <!-- Property that enables building a package from a project -->

-        <BuildPackage Condition="$(BuildPackage) == ''">false</BuildPackage>

-

-        <!-- Commands -->

-        <RestoreCommand>"$(NuGetExePath)" install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>

-        <BuildCommand>"$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>

-

-        <!-- Make the build depend on restore packages -->

-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">

-            RestorePackages;

-            $(BuildDependsOn);

-        </BuildDependsOn>

-

-        <!-- Make the build depend on restore packages -->

-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">

-            $(BuildDependsOn);

-            BuildPackage;

-        </BuildDependsOn>

-    </PropertyGroup>

-    

-    <Target Name="CheckPrerequisites">

-        <!-- Raise an error if we're unable to locate nuget.exe  -->

-        <Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />

-    </Target>

-    

-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">

-        <Exec Command="$(RestoreCommand)"

-              LogStandardErrorAsError="true"

-              Condition="Exists('$(PackagesConfig)')" />

-    </Target>

-

-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">

-        <Exec Command="$(BuildCommand)"

-              LogStandardErrorAsError="true" />

-    </Target>

-</Project>
\ No newline at end of file
diff --git a/ComicRackWebViewer/ComicRackWebViewer.csproj b/ComicRackWebViewer/ComicRackWebViewer.csproj
index 30b8387..aa5e7e7 100644
--- a/ComicRackWebViewer/ComicRackWebViewer.csproj
+++ b/ComicRackWebViewer/ComicRackWebViewer.csproj
@@ -1577,7 +1577,10 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

+  <PropertyGroup>

+    <PostBuildEvent>$(ProjectDir)postbuild.bat "$(ProjectDir)" "$(TargetDir)"

+</PostBuildEvent>

+  </PropertyGroup>

   <!-- 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">

diff --git a/ComicRackWebViewer/postbuild.bat b/ComicRackWebViewer/postbuild.bat
new file mode 100644
index 0000000..836a9d5
--- /dev/null
+++ b/ComicRackWebViewer/postbuild.bat
@@ -0,0 +1,13 @@
+xcopy "%~1FreeImage\FreeImage.32bit.dll" "%~2" /y
+xcopy "%~1FreeImage\FreeImage.64bit.dll" "%~2" /y
+xcopy "%~1SQLite\SQLite.Interop.32bit.dll" "%~2" /y
+xcopy "%~1SQLite\SQLite.Interop.64bit.dll" "%~2" /y
+
+IF NOT EXIST "%~2\tablet\index.html" GOTO copy_tablet
+
+exit /b 0
+
+:copy_tablet
+rem md "%~2\tablet"
+rem xcopy "%~1tablet\*.*" "%~2\tablet" /y /E
+mklink /D /J "%~2\tablet" "%~1tablet"
\ No newline at end of file