Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@sahailee
sahailee committed Jan 1, 2021
1 parent 190fc12 commit 1ecc50d
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 18 deletions.
92 changes: 83 additions & 9 deletions GTASpot/GTASpot/GTASpot.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,95 @@
<Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="ScriptHookVDotNet3, Version=3.0.4.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\ScriptHookVDotNet3.3.0.4\lib\net48\ScriptHookVDotNet3.dll</HintPath>
<Reference Include="ScriptHookVDotNet3, Version=3.1.0.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\ScriptHookVDotNet3.3.1.0\lib\net48\ScriptHookVDotNet3.dll</HintPath>
</Reference>
<Reference Include="SpotifyAPI.Web, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SpotifyAPI.Web.6.0.0-beta.11\lib\netstandard2.0\SpotifyAPI.Web.dll</HintPath>
<HintPath>..\packages\SpotifyAPI.Web.6.0.0\lib\netstandard2.0\SpotifyAPI.Web.dll</HintPath>
</Reference>
<Reference Include="SpotifyAPI.Web.Auth, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SpotifyAPI.Web.Auth.6.0.0-beta.11\lib\netstandard2.0\SpotifyAPI.Web.Auth.dll</HintPath>
<HintPath>..\packages\SpotifyAPI.Web.Auth.6.0.0\lib\netstandard2.0\SpotifyAPI.Web.Auth.dll</HintPath>
</Reference>
<Reference Include="Swan.Lite, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30c707c872729fff, processorArchitecture=MSIL">
<HintPath>..\packages\Unosquare.Swan.Lite.3.0.0\lib\net461\Swan.Lite.dll</HintPath>
<Reference Include="SuperSocket.ClientEngine, Version=0.10.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
</Reference>
<Reference Include="Swan.Lite, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Unosquare.Swan.Lite.3.1.0\lib\net461\Swan.Lite.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Specialized, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Security, Version=4.0.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
Expand All @@ -108,8 +182,8 @@
<Reference Include="System.Xml" />
<Reference Include="UIAutomationClient" />
<Reference Include="UIAutomationTypes" />
<Reference Include="WebSocket4Net, Version=0.14.1.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll</HintPath>
<Reference Include="WebSocket4Net, Version=0.15.2.11, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocket4Net.0.15.2\lib\net45\WebSocket4Net.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -141,6 +215,6 @@
<Error Condition="!Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.41\build\ILMerge.props'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\packages\ILMerge.3.0.41\tools\net452\ilmerge.exe /out:C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\GTASpotify.dll EmbedIO.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\GTASpot.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\Newtonsoft.Json.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\RestSharp.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\SpotifyAPI.Web.Auth.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\SpotifyAPI.Web.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\Swan.Lite.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\System.ValueTuple.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\WebSocket4Net.dll /log</PostBuildEvent>
<PostBuildEvent>C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\packages\ILMerge.3.0.41\tools\net452\ilmerge.exe /out:C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\GTASpotify.dll EmbedIO.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\GTASpot.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\Newtonsoft.Json.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\RestSharp.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\SpotifyAPI.Web.Auth.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\SpotifyAPI.Web.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\Swan.Lite.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\System.ValueTuple.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\WebSocket4Net.dll C:\Users\sahail\Documents\CSDevelopment\gta_mod\GTASpot\GTASpot\bin\x64\x64\SuperSocket.ClientEngine.dll /log</PostBuildEvent>
</PropertyGroup>
</Project>
27 changes: 22 additions & 5 deletions GTASpot/GTASpot/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,27 @@
<package id="ILMerge" version="3.0.41" targetFramework="net48" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
<package id="RestSharp" version="106.11.7" targetFramework="net48" />
<package id="ScriptHookVDotNet3" version="3.0.4" targetFramework="net48" />
<package id="SpotifyAPI.Web" version="6.0.0-beta.11" targetFramework="net48" />
<package id="SpotifyAPI.Web.Auth" version="6.0.0-beta.11" targetFramework="net48" />
<package id="ScriptHookVDotNet3" version="3.1.0" targetFramework="net48" />
<package id="SpotifyAPI.Web" version="6.0.0" targetFramework="net48" />
<package id="SpotifyAPI.Web.Auth" version="6.0.0" targetFramework="net48" />
<package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net48" />
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net48" />
<package id="System.IO" version="4.3.0" targetFramework="net48" />
<package id="System.Linq" version="4.3.0" targetFramework="net48" />
<package id="System.Net.NameResolution" version="4.3.0" targetFramework="net48" />
<package id="System.Net.Security" version="4.3.2" targetFramework="net48" />
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net48" />
<package id="System.Runtime" version="4.3.1" targetFramework="net48" />
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net48" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net48" />
<package id="System.Threading" version="4.3.0" targetFramework="net48" />
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
<package id="Unosquare.Swan.Lite" version="3.0.0" targetFramework="net48" />
<package id="WebSocket4Net" version="0.14.1" targetFramework="net48" />
<package id="Unosquare.Swan.Lite" version="3.1.0" targetFramework="net48" />
<package id="WebSocket4Net" version="0.15.2" targetFramework="net48" />
</packages>
10 changes: 6 additions & 4 deletions GTASpot/GTASpot/radio.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ private void SetupPlaylistMenu()
playlistSubMenu.RefreshIndex();


playlistSubMenu.OnItemSelect += async (sender, item, index) =>
playlistSubMenu.OnItemSelect += (sender, item, index) =>
{
if (item == setPlaylist)
{
Expand All @@ -218,7 +218,7 @@ private void SetupPlaylistMenu()
{
spotify.ResumePlayback(playlistUris[listIndex]);
}
time = (int)(moodUpdateTime - GTA.Game.FPS);
modMenuPool.CloseAllMenus();
}
else if(item == refresh)
Expand Down Expand Up @@ -284,15 +284,17 @@ private void SetupActiveDevicesMenu()
string deviceID = deviceIDs[listIndex];
try {
spotify.ResumePlayback(deviceID, defaultPlaylistId);
time = (int)(moodUpdateTime - GTA.Game.FPS);
hasDevice = true;
if (isSpotifyRadio)
{
Wait(1000);
spotify.SetVolume(volume);
}
else
{
spotify.SetVolume(0);
}
hasDevice = true;
modMenuPool.CloseAllMenus();
}
catch(AggregateException ex)
Expand All @@ -309,11 +311,11 @@ private void SetupActiveDevicesMenu()
{
Logger.Log("Transfer Device: " + ex.Message);
}
hasDevice = false;
modMenuPool.CloseAllMenus();
}
catch(NoActiveDeviceException ex)
{
hasDevice = false;
Logger.Log("Transfer Device: " + ex.Message);
modMenuPool.CloseAllMenus();
}
Expand Down

0 comments on commit 1ecc50d

Please sign in to comment.