Update streamlink.exe default path

Remove ThirdParty directory to avoid confusion.
Update NuGet packages.
Update AssemblyInfo.

README.md

@@ -8,7 +8,7 @@ The software is designed to be used together with `streamlink` (recommended) or
 
 * Get Twitch API client ID and client secret and add to `VattenMediaConfig.xml` (autogenerated at first boot)
 * Install streamlink or livestreamer (https://github.com/streamlink/streamlink/releases / http://docs.livestreamer.io/install.html)
-* Modify path to stream utility binary in `VattenMedia.exe.config` for value `StreamUtilityPath` (default is `ThirdParty\StreamUtility\Streamlink.exe`)
+* Modify path to stream utility binary in `VattenMedia.exe.config` for value `StreamUtilityPath` (default is `C:\Program Files (x86)\Streamlink\bin\streamlink.exe`)
 * Launch the program and press the `OAuth` button to perform OAuth authentication
 * Press `Launch` on the stream you want to watch
 

VattenMedia.Infrastructure/VattenMedia.Infrastructure.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="RestSharp" Version="106.6.7" />
+    <PackageReference Include="RestSharp" Version="106.6.9" />
   </ItemGroup>
 
   <ItemGroup>

VattenMedia/App.config

@@ -5,8 +5,8 @@
   </startup>
   <appSettings>
     <add key="TwitchApiUrl" value="https://api.twitch.tv/"/>
-    <add key="StreamUtilityPath" value="ThirdParty/StreamUtility/Streamlink.exe"/>
-    <add key="StreamUtilityRcPath" value="ThirdParty/vattenmediarc"/>
+    <add key="StreamUtilityPath" value="C:\Program Files (x86)\Streamlink\bin\streamlink.exe"/>
+    <add key="StreamUtilityRcPath" value="Config\vattenmediarc"/>
     <add key="TwitchEnabled" value="true"/>
     <add key="YoutubeEnabled" value="true"/>
   </appSettings>

VattenMedia/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -12,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Joacand")]
 [assembly: AssemblyProduct("VattenMedia")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

VattenMedia/VattenMedia.csproj

@@ -38,8 +38,8 @@
     <ApplicationIcon>vattenmedia8.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RestSharp, Version=106.6.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.6.7\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.6.9.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -80,11 +80,11 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Unity.Abstractions, Version=4.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.5.9.5\lib\net47\Unity.Abstractions.dll</HintPath>
+    <Reference Include="Unity.Abstractions, Version=4.1.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.5.10.1\lib\net47\Unity.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.Container, Version=5.9.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.5.9.5\lib\net47\Unity.Container.dll</HintPath>
+    <Reference Include="Unity.Container, Version=5.10.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.5.10.1\lib\net47\Unity.Container.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
@@ -144,10 +144,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="ThirdParty\StreamUtility\README.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="ThirdParty\vattenmediarc">
+    <None Include="Config\vattenmediarc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

VattenMedia/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="106.6.7" targetFramework="net471" />
+  <package id="RestSharp" version="106.6.9" targetFramework="net471" />
   <package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net471" />
@@ -9,5 +9,5 @@
   <package id="System.Security.Permissions" version="4.5.0" targetFramework="net471" />
   <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
-  <package id="Unity" version="5.9.5" targetFramework="net471" />
+  <package id="Unity" version="5.10.1" targetFramework="net471" />
 </packages>