From 6669a42dcd33f1e062464c912e51d33f4dcded26 Mon Sep 17 00:00:00 2001
From: Frank Skare <frank.skare.de@gmail.com>
Date: Thu, 28 Mar 2019 01:42:36 +0100
Subject: [PATCH] -

---
 CSScriptAddon/CSScriptAddon.vb                              | 1 -
 CSScriptAddon/CSScriptAddon.vbproj                          | 4 ++--
 RatingAddon/RatingAddon.csproj                              | 4 ++--
 mpv.net/mpv.net.csproj                                      | 4 ++--
 mpvSettingsEditor/MainWindow.xaml.cs                        | 2 +-
 mpvSettingsEditor/mpvSettingsEditor.csproj                  | 6 +++---
 .../{Definitions.toml => mpvSettingsEditor.toml}            | 0
 release.ps1                                                 | 4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename mpvSettingsEditor/{Definitions.toml => mpvSettingsEditor.toml} (100%)

diff --git a/CSScriptAddon/CSScriptAddon.vb b/CSScriptAddon/CSScriptAddon.vb
index 2edeabd..e6e2049 100644
--- a/CSScriptAddon/CSScriptAddon.vb
+++ b/CSScriptAddon/CSScriptAddon.vb
@@ -3,7 +3,6 @@ Imports System.IO
 Imports System.Windows.Forms
 
 Imports mpvnet
-Imports mpvnet.StaticUsing
 
 Imports CSScriptLibrary
 
diff --git a/CSScriptAddon/CSScriptAddon.vbproj b/CSScriptAddon/CSScriptAddon.vbproj
index 3aaf90f..ec49331 100644
--- a/CSScriptAddon/CSScriptAddon.vbproj
+++ b/CSScriptAddon/CSScriptAddon.vbproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>..\mpv.net\bin\Debug\Addons\CSScriptAddon\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\CSScriptAddon\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
     <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
@@ -29,7 +29,7 @@
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\CSScriptAddon\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
     <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
diff --git a/RatingAddon/RatingAddon.csproj b/RatingAddon/RatingAddon.csproj
index 8fc24c8..c12f809 100644
--- a/RatingAddon/RatingAddon.csproj
+++ b/RatingAddon/RatingAddon.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\mpv.net\bin\Debug\Addons\RatingAddon\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\RatingAddon\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\mpv.net\bin\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\Addons\RatingAddon\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/mpv.net/mpv.net.csproj b/mpv.net/mpv.net.csproj
index 6b64d8b..781131f 100644
--- a/mpv.net/mpv.net.csproj
+++ b/mpv.net/mpv.net.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/mpvSettingsEditor/MainWindow.xaml.cs b/mpvSettingsEditor/MainWindow.xaml.cs
index 1209eba..1b5128f 100644
--- a/mpvSettingsEditor/MainWindow.xaml.cs
+++ b/mpvSettingsEditor/MainWindow.xaml.cs
@@ -15,7 +15,7 @@ namespace mpvSettingsEditor
     public partial class MainWindow : Window
     {
         public string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        private List<SettingBase> DynamicSettings = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\Definitions.toml");
+        private List<SettingBase> DynamicSettings = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvSettingsEditor.toml");
 
         public MainWindow()
         {
diff --git a/mpvSettingsEditor/mpvSettingsEditor.csproj b/mpvSettingsEditor/mpvSettingsEditor.csproj
index f20d3a3..7b44662 100644
--- a/mpvSettingsEditor/mpvSettingsEditor.csproj
+++ b/mpvSettingsEditor/mpvSettingsEditor.csproj
@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
+    <OutputPath>..\mpv.net\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -34,7 +34,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
+    <OutputPath>..\mpv.net\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -124,7 +124,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Definitions.toml">
+    <None Include="mpvSettingsEditor.toml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/mpvSettingsEditor/Definitions.toml b/mpvSettingsEditor/mpvSettingsEditor.toml
similarity index 100%
rename from mpvSettingsEditor/Definitions.toml
rename to mpvSettingsEditor/mpvSettingsEditor.toml
diff --git a/release.ps1 b/release.ps1
index 1142c38..f68f697 100644
--- a/release.ps1
+++ b/release.ps1
@@ -1,9 +1,9 @@
 $scriptDir = Split-Path -Path $PSCommandPath -Parent
-$exePath = $scriptDir + "\mpv.net\bin\Debug\mpvnet.exe"
+$exePath = $scriptDir + "\mpv.net\bin\mpvnet.exe"
 $version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
 $desktopDir = [Environment]::GetFolderPath("Desktop")
 $targetDir = $desktopDir + "\mpv.net-" + $version
-Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
+Copy-Item $scriptDir\mpv.net\bin $targetDir -Recurse -Exclude System.Management.Automation.xml -Force
 Copy-Item $scriptDir\README.md $targetDir\README.md -Force
 $7zPath = "C:\Program Files\7-Zip\7z.exe"
 $args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*"