Merge branch 'development'

tibmeister · Jul 31, 2017 · b2f6f24 · b2f6f24
2 parents 8169316 + a2d9ec9
commit b2f6f24
Show file tree

Hide file tree

Showing 21 changed files with 1,134 additions and 1,131 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/CoreSpeed.sln b/CoreSpeed.sln
@@ -1,69 +1,69 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EC1550F-BDE7-441F-808D-04242F2E7358}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{82864B3B-4B60-4C02-BCC8-533FBE478169}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreSpeed", "src\CoreSpeed\CoreSpeed.csproj", "{717FF9B2-9C64-4964-875F-1844B818D1C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleClient", "src\ConsoleClient\ConsoleClient.csproj", "{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{717FF9B2-9C64-4964-875F-1844B818D1C9} = {717FF9B2-9C64-4964-875F-1844B818D1C9}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|ARM.Build.0 = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x64.Build.0 = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x86.Build.0 = Debug|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|ARM.ActiveCfg = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|ARM.Build.0 = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x64.ActiveCfg = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x64.Build.0 = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x86.ActiveCfg = Release|Any CPU
-		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x86.Build.0 = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x64.Build.0 = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|ARM.Build.0 = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x64.Build.0 = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{717FF9B2-9C64-4964-875F-1844B818D1C9} = {8EC1550F-BDE7-441F-808D-04242F2E7358}
-		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF} = {8EC1550F-BDE7-441F-808D-04242F2E7358}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EC1550F-BDE7-441F-808D-04242F2E7358}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{82864B3B-4B60-4C02-BCC8-533FBE478169}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreSpeed", "src\CoreSpeed\CoreSpeed.csproj", "{717FF9B2-9C64-4964-875F-1844B818D1C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleClient", "src\ConsoleClient\ConsoleClient.csproj", "{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{717FF9B2-9C64-4964-875F-1844B818D1C9} = {717FF9B2-9C64-4964-875F-1844B818D1C9}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x64.Build.0 = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Debug|x86.Build.0 = Debug|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|ARM.Build.0 = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x64.ActiveCfg = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x64.Build.0 = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{717FF9B2-9C64-4964-875F-1844B818D1C9}.Release|x86.Build.0 = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|ARM.Build.0 = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x64.Build.0 = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{717FF9B2-9C64-4964-875F-1844B818D1C9} = {8EC1550F-BDE7-441F-808D-04242F2E7358}
+		{96AE2E6F-A6E9-4460-95C2-2ACC7EA3E1FF} = {8EC1550F-BDE7-441F-808D-04242F2E7358}
+	EndGlobalSection
+EndGlobal
diff --git a/README.md b/README.md
@@ -1,16 +1,15 @@
-CoreSpeed
+# CoreSpeed
 =========
 
-CoreSpeed is an implementation of SpeedTest.Net using .Net Standard.  Included is a test client for both .NET Core (ConsoleClient) and a UWP console app (UWPConsoleClient) for testing.  
+CoreSpeed is an implementation of SpeedTest.Net using .Net Standard for the library.  Included is a test client for .NET Core (ConsoleClient).  
 
 Currently the only CLI cross-platform solution is a Python script, so I wanted to build a robust compiled solution that can run cross-platform and independent of having to have Python and it's various modules installed.
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------
 
 
-### Build status of branches
+## Build status of branches
 
 | Source  |   Master Build   |   Development Build   |
 |--------:|-----------------:|----------------------:|
-| AppVeyor| [![Build status](https://ci.appveyor.com/api/projects/status/o4ysawi7nqumr03w/branch/master?svg=true)](https://ci.appveyor.com/project/tibmeister/corespeed/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/o4ysawi7nqumr03w/branch/development?svg=true)](https://ci.appveyor.com/project/tibmeister/corespeed/branch/development)|
-
+| AppVeyor| [![Build status](https://ci.appveyor.com/api/projects/status/o4ysawi7nqumr03w/branch/master?svg=true)](https://ci.appveyor.com/project/tibmeister/corespeed/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/o4ysawi7nqumr03w/branch/development?svg=true)](https://ci.appveyor.com/project/tibmeister/corespeed/branch/development)|
diff --git a/src/ConsoleClient/ConsoleClient.csproj b/src/ConsoleClient/ConsoleClient.csproj
@@ -1,23 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <AssemblyName>ConsoleClient</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>ConsoleClient</PackageId>
-    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <ProjectReference Include="..\CoreSpeed\CoreSpeed.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreSpeed\CoreSpeed.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <AssemblyName>ConsoleClient</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>ConsoleClient</PackageId>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <ProjectReference Include="..\CoreSpeed\CoreSpeed.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreSpeed\CoreSpeed.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/ConsoleClient/ConsoleSpinner.cs b/src/ConsoleClient/ConsoleSpinner.cs
@@ -1,55 +1,55 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-
-namespace ConsoleClient
-{
-    internal class ConsoleSpinner
-    {
-        private int _currentAnimationFrame;
-        private Timer tmr;
-
-        public ConsoleSpinner()
-        {
-            SpinnerAnimationFrames = new[]
-            {
-                '|',
-                '/',
-                '-',
-                '\\'
-            };
-
-        }
-
-        private void statusChecker(object state)
-        {
-            throw new NotImplementedException();
-        }
-
-        public char[] SpinnerAnimationFrames { get; set; }
-
-        public void UpdateProgress()
-        {
-            //Hide the cursor
-            Console.CursorVisible = false;
-
-            // Store the current position of the cursor
-            var originalX = Console.CursorLeft;
-            var originalY = Console.CursorTop;
-
-            // Write the next frame (character) in the spinner animation
-            Console.Write(SpinnerAnimationFrames[_currentAnimationFrame]);
-
-            // Keep looping around all the animation frames
-            _currentAnimationFrame++;
-            if (_currentAnimationFrame == SpinnerAnimationFrames.Length)
-            {
-                _currentAnimationFrame = 0;
-            }
-
-            // Restore cursor to original position
-            Console.SetCursorPosition(originalX, originalY);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace ConsoleClient
+{
+    internal class ConsoleSpinner
+    {
+        private int _currentAnimationFrame;
+        private Timer tmr;
+
+        public ConsoleSpinner()
+        {
+            SpinnerAnimationFrames = new[]
+            {
+                '|',
+                '/',
+                '-',
+                '\\'
+            };
+
+        }
+
+        private void statusChecker(object state)
+        {
+            throw new NotImplementedException();
+        }
+
+        public char[] SpinnerAnimationFrames { get; set; }
+
+        public void UpdateProgress()
+        {
+            //Hide the cursor
+            Console.CursorVisible = false;
+
+            // Store the current position of the cursor
+            var originalX = Console.CursorLeft;
+            var originalY = Console.CursorTop;
+
+            // Write the next frame (character) in the spinner animation
+            Console.Write(SpinnerAnimationFrames[_currentAnimationFrame]);
+
+            // Keep looping around all the animation frames
+            _currentAnimationFrame++;
+            if (_currentAnimationFrame == SpinnerAnimationFrames.Length)
+            {
+                _currentAnimationFrame = 0;
+            }
+
+            // Restore cursor to original position
+            Console.SetCursorPosition(originalX, originalY);
+        }
+    }
+}