diff --git a/Deployment/Changelog.txt b/Deployment/Changelog.txt index e9aa13a..3aebc75 100644 --- a/Deployment/Changelog.txt +++ b/Deployment/Changelog.txt @@ -1,3 +1,7 @@ +Version 2.0.0.0 +========================================== +- Dropped support for Silverligt and Windows Phone 7 + Version 1.2.2.0 ========================================== - Added "SubChannelIdList" property to "ChannelDeletedEventArgs". This allows to get the IDs of deleted sub-channels. diff --git a/Deployment/Deploy.target b/Deployment/Deploy.target index 034e64a..40efb85 100644 --- a/Deployment/Deploy.target +++ b/Deployment/Deploy.target @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ - $(RootDirectory)\TS3QueryLib.Core.Silverlight\Properties\AssemblyInfo.cs + $(RootDirectory)\TS3QueryLib.Core.Framework\Properties\AssemblyInfo.cs @@ -33,34 +33,22 @@ - - - - - + + - $(RootDirectory)\TS3QueryLib.Core.Silverlight - $(SilverlightDirectory)\bin\$(Config) - $(RootDirectory)\TS3QueryLib.Core.WP7 - $(WP7Directory)\bin\$(Config) - $(RootDirectory)\TS3QueryLib.Core.Framework - $(NonSilverlightDirectory)\bin\$(Config) + $(RootDirectory)\TS3QueryLib.Core.Framework\bin\$(Config) - - - + - - - + @@ -71,5 +59,4 @@ - \ No newline at end of file diff --git a/Deployment/DeployLocal.bat b/Deployment/DeployLocal.bat index b29a70e..c4444e1 100644 --- a/Deployment/DeployLocal.bat +++ b/Deployment/DeployLocal.bat @@ -1,3 +1,2 @@ - -"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" Deploy.target /target:Deploy /verbosity:m -pause \ No newline at end of file +SET MS_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" +call %MS_BUILD% Deploy.target /target:Deploy /verbosity:m || pause \ No newline at end of file diff --git a/Samples/Console/Connect/Program.cs b/Samples/Console/Connect/Program.cs index 86b208d..35e2a9d 100644 --- a/Samples/Console/Connect/Program.cs +++ b/Samples/Console/Connect/Program.cs @@ -5,6 +5,7 @@ using TS3QueryLib.Core.Common.Responses; using TS3QueryLib.Core.Communication; using TS3QueryLib.Core.Server; +using TS3QueryLib.Core.Server.Entities; using TS3QueryLib.Core.Server.Responses; namespace Connect @@ -54,8 +55,17 @@ private void QueryDispatcher_ReadyForSendingCommands(object sender, System.Event { // you can only run commands on the queryrunner when this event has been raised first! QueryRunner = new QueryRunner(QueryDispatcher); - - VersionResponse versionResponse = QueryRunner.GetVersion(); + SimpleResponse loginResponse = QueryRunner.Login("serveradmin", "RWkzzXu9"); + SimpleResponse selectVirtualServerById = QueryRunner.SelectVirtualServerById(1); + ChannelModification cm = new ChannelModification + { + Name = "randomName", + Description = "desc-test", + IsPermanent = true + }; + var response = QueryRunner.CreateChannel(cm); + + VersionResponse versionResponse = QueryRunner.GetVersion(); if (versionResponse.IsErroneous) { diff --git a/Samples/Silverlight/Connect/App.xaml b/Samples/Silverlight/Connect/App.xaml deleted file mode 100644 index 6ee5220..0000000 --- a/Samples/Silverlight/Connect/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/Samples/Silverlight/Connect/App.xaml.cs b/Samples/Silverlight/Connect/App.xaml.cs deleted file mode 100644 index a61a871..0000000 --- a/Samples/Silverlight/Connect/App.xaml.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Windows; -using Connect.BL; - -namespace Connect -{ - public partial class App - { - private readonly AppContext _appContext = new AppContext(); - - public static App Currennt - { - get { return (App)Current; } - } - - public AppContext Context - { - get { return _appContext; } - } - - public App() - { - Startup += Application_Startup; - Exit += Application_Exit; - UnhandledException += Application_UnhandledException; - - InitializeComponent(); - } - - private void Application_Startup(object sender, StartupEventArgs e) - { - RootVisual = new MainPage(); - } - - private void Application_Exit(object sender, EventArgs e) - { - - } - - private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e) - { - // If the app is running outside of the debugger then report the exception using - // the browser's exception mechanism. On IE this will display it a yellow alert - // icon in the status bar and Firefox will display a script error. - if (!System.Diagnostics.Debugger.IsAttached) - { - - // NOTE: This will allow the application to continue running after an exception has been thrown - // but not handled. - // For production applications this error handling should be replaced with something that will - // report the error to the website and stop the application. - e.Handled = true; - Deployment.Current.Dispatcher.BeginInvoke(delegate { ReportErrorToDOM(e); }); - } - } - - private void ReportErrorToDOM(ApplicationUnhandledExceptionEventArgs e) - { - try - { - string errorMsg = e.ExceptionObject.Message + e.ExceptionObject.StackTrace; - errorMsg = errorMsg.Replace('"', '\'').Replace("\r\n", @"\n"); - - System.Windows.Browser.HtmlPage.Window.Eval("throw new Error(\"Unhandled Error in Silverlight Application " + errorMsg + "\");"); - } - catch (Exception) - { - } - } - } -} diff --git a/Samples/Silverlight/Connect/BL/AppContext.cs b/Samples/Silverlight/Connect/BL/AppContext.cs deleted file mode 100644 index dfc3583..0000000 --- a/Samples/Silverlight/Connect/BL/AppContext.cs +++ /dev/null @@ -1,11 +0,0 @@ -using TS3QueryLib.Core; -using TS3QueryLib.Core.Server; - -namespace Connect.BL -{ - public class AppContext - { - public AsyncTcpDispatcher Dispatcher { get; set; } - public QueryRunner QueryRunner { get; set; } - } -} \ No newline at end of file diff --git a/Samples/Silverlight/Connect/BL/ConnectionState.cs b/Samples/Silverlight/Connect/BL/ConnectionState.cs deleted file mode 100644 index 43ea3bd..0000000 --- a/Samples/Silverlight/Connect/BL/ConnectionState.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Connect.BL -{ - public enum ConnectionState - { - Connecting, - Connected, - Disconnected - } -} diff --git a/Samples/Silverlight/Connect/BL/MainPageModel.cs b/Samples/Silverlight/Connect/BL/MainPageModel.cs deleted file mode 100644 index caa2c23..0000000 --- a/Samples/Silverlight/Connect/BL/MainPageModel.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System.ComponentModel; - -namespace Connect.BL -{ - public class MainPageModel : INotifyPropertyChanged - { - #region Members - - private bool _canConnect; - private string _serverAddress; - private ushort? _serverPort; - private ConnectionState _connectionState = ConnectionState.Disconnected; - #endregion - - #region Properties - - - - public ConnectionState ConnectionState - { - get { return _connectionState; } - set - { - if (_connectionState == value) - return; - - _connectionState = value; - OnPropertyChanged("ConnectionState"); - OnPropertyChanged("CanConnect"); - OnPropertyChanged("CanDisconnect"); - } - } - - public bool CanConnect - { - get { return ConnectionState == ConnectionState.Disconnected; } - } - - public bool CanDisconnect - { - get { return ConnectionState == ConnectionState.Connected; } - } - - public string ServerAddress - { - get { return _serverAddress; } - set - { - if (_serverAddress == value) - return; - - _serverAddress = value; - - OnPropertyChanged("ServerAddress"); - } - } - - public ushort? ServerPort - { - get { return _serverPort; } - set - { - if (_serverPort == value) - return; - - _serverPort = value; - - OnPropertyChanged("ServerPort"); - } - } - - #endregion - - #region INotifyPropertyChanged - - public event PropertyChangedEventHandler PropertyChanged; - - protected void OnPropertyChanged(string propertyName) - { - if (PropertyChanged != null) - PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - - #endregion - } -} diff --git a/Samples/Silverlight/Connect/Connect.csproj b/Samples/Silverlight/Connect/Connect.csproj deleted file mode 100644 index e482421..0000000 --- a/Samples/Silverlight/Connect/Connect.csproj +++ /dev/null @@ -1,130 +0,0 @@ - - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {7F758BD5-D239-40E7-BF36-A1E8B448CF20} - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Connect - Connect - Silverlight - v5.0 - $(TargetFrameworkVersion) - true - - - true - true - Connect.xap - Properties\AppManifest.xml - Connect.App - ConnectTestPage.html - true - true - false - Properties\OutOfBrowserSettings.xml - false - true - - - SAK - SAK - SAK - SAK - - - - - 4.0 - - - - v3.5 - - - true - full - false - Bin\Debug - DEBUG;TRACE;SILVERLIGHT - true - true - prompt - 4 - - - pdbonly - true - Bin\Release - TRACE;SILVERLIGHT - true - true - prompt - 4 - - - - - - - - - - - - - App.xaml - - - - - - MainPage.xaml - - - - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - - - - - - {BE2D6663-0B1E-40F3-ACA7-B06F4B04A952} - TS3QueryLib.Core.Silverlight - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/Silverlight/Connect/MainPage.xaml b/Samples/Silverlight/Connect/MainPage.xaml deleted file mode 100644 index 83a4bbb..0000000 --- a/Samples/Silverlight/Connect/MainPage.xaml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Server-Address - - Query-Port - - -