diff --git a/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj b/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj index 6e98065..f20926b 100644 --- a/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj +++ b/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ShiftOS.MFSProfiler ShiftOS.MFSProfiler - v4.5.2 + v4.5.1 512 true @@ -81,11 +81,11 @@ - {a069089a-8962-4607-b2b2-4cf4a371066e} + {A069089A-8962-4607-B2B2-4CF4A371066E} ShiftOS.Objects - {7c979b07-0585-4033-a110-e5555b9d6651} + {7C979B07-0585-4033-A110-E5555B9D6651} ShiftOS.Engine diff --git a/ShiftOS.Objects/ShiftOS.Objects.csproj b/ShiftOS.Objects/ShiftOS.Objects.csproj index e9b74f7..022a511 100644 --- a/ShiftOS.Objects/ShiftOS.Objects.csproj +++ b/ShiftOS.Objects/ShiftOS.Objects.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ShiftOS.Objects ShiftOS.Objects - v4.5.2 + v4.5.1 512 @@ -39,10 +39,6 @@ ..\Libraries\Discoursistency.Util.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - @@ -52,6 +48,9 @@ + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs index 099df86..0219590 100644 --- a/ShiftOS.Server/Program.cs +++ b/ShiftOS.Server/Program.cs @@ -131,7 +131,7 @@ namespace ShiftOS.Server server.OnStarted += (o, a) => { Console.WriteLine($"Server started on address {server.Address}, port {server.Port}."); - ServerStarted?.Invoke(server.Address.MapToIPv4().ToString()); + ServerStarted?.Invoke(server.Address.ToString()); }; server.OnStopped += (o, a) => diff --git a/ShiftOS.Server/ShiftOS.Server.csproj b/ShiftOS.Server/ShiftOS.Server.csproj index ae6248c..6c039c2 100644 --- a/ShiftOS.Server/ShiftOS.Server.csproj +++ b/ShiftOS.Server/ShiftOS.Server.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ShiftOS.Server ShiftOS.Server - v4.5.2 + v4.5.1 512 true @@ -33,17 +33,9 @@ 4 - - ..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll - True - ..\Libraries\NetSockets.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - @@ -52,6 +44,12 @@ + + ..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll + + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + @@ -68,7 +66,7 @@ - {a069089a-8962-4607-b2b2-4cf4a371066e} + {A069089A-8962-4607-B2B2-4CF4A371066E} ShiftOS.Objects diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 1c782d1..f3a2efa 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ShiftOS.WinForms ShiftOS.WinForms - v4.5.2 + v4.5.1 512 true @@ -33,10 +33,6 @@ 4 - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - @@ -48,6 +44,9 @@ + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + @@ -307,11 +306,11 @@ - {a069089a-8962-4607-b2b2-4cf4a371066e} + {A069089A-8962-4607-B2B2-4CF4A371066E} ShiftOS.Objects - {7c979b07-0585-4033-a110-e5555b9d6651} + {7C979B07-0585-4033-A110-E5555B9D6651} ShiftOS.Engine diff --git a/ShiftOS_TheReturn.userprefs b/ShiftOS_TheReturn.userprefs new file mode 100644 index 0000000..d1e20c2 --- /dev/null +++ b/ShiftOS_TheReturn.userprefs @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/ShiftOS_TheReturn/AudioManager.cs b/ShiftOS_TheReturn/AudioManager.cs deleted file mode 100644 index d95c884..0000000 --- a/ShiftOS_TheReturn/AudioManager.cs +++ /dev/null @@ -1,66 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json; -using WMPLib; - -namespace ShiftOS.Engine -{ - public static class AudioManager - { - public static WindowsMediaPlayer player = null; - - public static void Init() - { - player = new WindowsMediaPlayer(); - player.PlayStateChange += (o) => - { - switch ((WMPPlayState)o) - { - case WMPPlayState.wmppsPlaying: - case WMPPlayState.wmppsBuffering: - case WMPPlayState.wmppsReconnecting: - - break; - case WMPPlayState.wmppsReady: - PickRandomSong(); - break; - } - }; - PickRandomSong(); - } - - public static void PickRandomSong() - { - var lst = JsonConvert.DeserializeObject>(Properties.Resources.Songs); - - player.URL = lst[new Random().Next(0, lst.Count)]; - } - } -} diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj index 30bd703..18fac1d 100644 --- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj +++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ShiftOS.Engine ShiftOS.Engine - v4.5.2 + v4.5.1 512 true publish\ @@ -29,7 +29,6 @@ true - AnyCPU true full false @@ -37,6 +36,7 @@ DEBUG;TRACE prompt 4 + 6 AnyCPU @@ -46,13 +46,11 @@ TRACE prompt 4 + 6 false - - - ..\Libraries\Discoursistency.Base.dll @@ -63,49 +61,9 @@ ..\Libraries\Discoursistency.Util.dll - - ..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll - True - - - ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll - True - ..\Libraries\NetSockets.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - @@ -123,6 +81,36 @@ + + ..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\IronPython.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll + + + ..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll + + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + @@ -133,7 +121,6 @@ - @@ -193,11 +180,11 @@ - {a069089a-8962-4607-b2b2-4cf4a371066e} + {A069089A-8962-4607-B2B2-4CF4A371066E} ShiftOS.Objects - {226c63b4-e60d-4949-b4e7-7a2ddbb96776} + {226C63B4-E60D-4949-B4E7-7A2DDBB96776} ShiftOS.Server