Merge pull request #34 from Scordo/dev/SilverlightAndWP7Removal

Removed support for Windows Phone 7 and Silverlight

Author: Scordo

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.

Deployment/Deploy.target

@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy">
 	<Import Project="Assemblies\CommTasks\MSBuild.Community.Tasks.Targets"/>
 	<Import Project="Assemblies\ExtPack\MSBuild.ExtensionPack.tasks"/>
 
@@ -24,7 +24,7 @@
 
   <Target Name="ChangeFileVersion">
     <PropertyGroup>
-      <AssemblyInfoFile>$(RootDirectory)\TS3QueryLib.Core.Silverlight\Properties\AssemblyInfo.cs</AssemblyInfoFile>
+      <AssemblyInfoFile>$(RootDirectory)\TS3QueryLib.Core.Framework\Properties\AssemblyInfo.cs</AssemblyInfoFile>
     </PropertyGroup>
 
     <Exec Command="attrib -r $(AssemblyInfoFile)"/>
@@ -33,34 +33,22 @@
   </Target>
 
   <Target Name="Build">
-    <Message Text="Cleaning Solution"/>
-    <MSBuild Projects="$(RootDirectory)\TS3QueryLib.Net 2010.sln" Properties="Configuration=$(Config)" Targets="Clean"/>
-
-    <Message Text="Building Solution"/>
-    <MSBuild Projects="$(RootDirectory)\TS3QueryLib.Net 2010.sln" Properties="Configuration=$(Config)"/>
+    <Message Text="Cleaning and Building Solution"/>
+    <MSBuild Projects="$(RootDirectory)\TS3QueryLib.Net.sln" Properties="Configuration=$(Config)" Targets="Clean;Build"/>
   </Target>
 
   <Target Name="CopyFiles">
     <PropertyGroup>
-      <SilverlightDirectory>$(RootDirectory)\TS3QueryLib.Core.Silverlight</SilverlightDirectory>
-      <SilverlightBinDirectory>$(SilverlightDirectory)\bin\$(Config)</SilverlightBinDirectory>
-      <WP7Directory>$(RootDirectory)\TS3QueryLib.Core.WP7</WP7Directory>
-      <WP7BinDirectory>$(WP7Directory)\bin\$(Config)</WP7BinDirectory>
-      <NonSilverlightDirectory>$(RootDirectory)\TS3QueryLib.Core.Framework</NonSilverlightDirectory>
-      <NonSilverlightBinDirectory>$(NonSilverlightDirectory)\bin\$(Config)</NonSilverlightBinDirectory>
+      <BinDirectory>$(RootDirectory)\TS3QueryLib.Core.Framework\bin\$(Config)</BinDirectory>
     </PropertyGroup>
 
     <ItemGroup>
-      <SilverlightFiles Include="$(SilverlightBinDirectory)\**\*.dll;$(SilverlightBinDirectory)\**\*.pdb;$(SilverlightBinDirectory)\**\*.xml"/>
-      <WP7Files Include="$(WP7BinDirectory)\**\*.dll;$(WP7BinDirectory)\**\*.pdb;$(WP7BinDirectory)\**\*.xml"/>
-      <NonSilverlightFiles Include="$(NonSilverlightBinDirectory)\**\*.dll;$(NonSilverlightBinDirectory)\**\*.pdb;$(NonSilverlightBinDirectory)\**\*.xml"/>
+      <AssemblyAndDocumentationFiles Include="$(BinDirectory)\**\*.dll;$(BinDirectory)\**\*.pdb;$(BinDirectory)\**\*.xml"/>
     </ItemGroup>
 
     <RemoveDir Directories="$(ReleaseDirectory)" ContinueOnError="true"/>
 
-    <Copy SourceFiles="@(SilverlightFiles)" DestinationFiles="@(SilverlightFiles->'$(ReleaseDirectory)\Silverlight\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(WP7Files)" DestinationFiles="@(WP7Files->'$(ReleaseDirectory)\Windows Phone 7.1\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(NonSilverlightFiles)" DestinationFiles="@(NonSilverlightFiles->'$(ReleaseDirectory)\Non Silverlight\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(AssemblyAndDocumentationFiles)" DestinationFiles="@(AssemblyAndDocumentationFiles->'$(ReleaseDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="Changelog.txt;ReleaseNotes.txt" DestinationFolder="$(ReleaseDirectory)"/>
   </Target>
 
@@ -71,5 +59,4 @@
 
     <Zip Files="@(ZipFiles)" WorkingDirectory="$(ReleaseDirectory)" ZipFileName="$(ReleaseDirectory)\$(ReleaseName).zip" ZipLevel="9" />
   </Target>
-  
 </Project>

Deployment/DeployLocal.bat

@@ -1,3 +1,2 @@
-
-"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" Deploy.target /target:Deploy /verbosity:m
-pause
+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

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)
       {