v1.0.0.1-beta1

Quobject · Jul 20, 2017 · 6cca275 · 6cca275
1 parent 8f102a5
commit 6cca275
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 37 deletions.
diff --git a/Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.sln b/Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.net35", "EngineIoClientDotNet.net35.csproj", "{568D67D0-3253-4601-9B04-7730A9EC5CC0}"
 EndProject
@@ -26,29 +26,29 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt(2)", "http://localhos
 		SlnRelativePath = "..\..\grunt\"
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "TestServer(2)", "http://localhost:48775", "{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.net35", "..\EngineIoClientDotNet.Tests.net35\EngineIoClientDotNet.Tests.net35.csproj", "{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "EngineIoClientDotNet", "..\..\", "{3EB481DF-5B0B-4E72-90A1-039165F580E1}"
 	ProjectSection(WebsiteProperties) = preProject
-		UseIISExpress = "true"
 		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
-		Debug.AspNetCompiler.VirtualPath = "/localhost_48775"
-		Debug.AspNetCompiler.PhysicalPath = "..\..\TestServer\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_48775\"
+		Debug.AspNetCompiler.VirtualPath = "/localhost_11863"
+		Debug.AspNetCompiler.PhysicalPath = "..\..\..\EngineIoClientDotNet\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_11863\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/localhost_48775"
-		Release.AspNetCompiler.PhysicalPath = "..\..\TestServer\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_48775\"
+		Release.AspNetCompiler.VirtualPath = "/localhost_11863"
+		Release.AspNetCompiler.PhysicalPath = "..\..\..\EngineIoClientDotNet\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_11863\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		SlnRelativePath = "..\..\TestServer\"
+		VWDPort = "11863"
+		SlnRelativePath = "..\..\..\EngineIoClientDotNet\"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.net35", "..\EngineIoClientDotNet.Tests.net35\EngineIoClientDotNet.Tests.net35.csproj", "{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,14 +63,14 @@ Global
 		{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Release|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/Src/EngineIoClientDotNet.netstandard1.3/EngineIoClientDotNet.netstandard1.3.csproj b/Src/EngineIoClientDotNet.netstandard1.3/EngineIoClientDotNet.netstandard1.3.csproj
@@ -5,9 +5,13 @@
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Description>This is the Engine.IO Client Library for C#.</Description>
     <PackageProjectUrl>https://github.com/Quobject/EngineIoClientDotNet/</PackageProjectUrl>
-    <Version>1.0.0-beta0</Version>
+    <Version>1.0.0.1-beta1</Version>
     <Copyright>Copyright ©  2017</Copyright>
     <RepositoryUrl>https://github.com/Quobject/EngineIoClientDotNet/</RepositoryUrl>
+    <AssemblyVersion>1.0.0.1</AssemblyVersion>
+    <FileVersion>1.0.0.1</FileVersion>
+    <RootNamespace>Quobject.EngineIoClientDotNet</RootNamespace>
+    <AssemblyName>EngineIoClientDotNet</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -43,7 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
   </ItemGroup>

diff --git a/grunt/Gruntfile.js b/grunt/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
       { "Name": "EngineIoClientDotNet.net35", "NuGetDir": "net35", "SourceDir": "net35", copyOnly: true },
       { "Name": "EngineIoClientDotNet.net40", "NuGetDir": "net40", "SourceDir": "net40", copyOnly: true },
       { "Name": "EngineIoClientDotNet.net45", "NuGetDir": "net45", "SourceDir": "net45", copyOnly: true },
-      { "Name": "EngineIoClientDotNet.netstandard1.3", "NuGetDir": "netstandard1.3", "SourceDir": "netstandard1.3", "SourceFileName": "EngineIoClientDotNet.netstandard1.3.dll", copyOnly: true },
+      { "Name": "EngineIoClientDotNet.netstandard1.3", "NuGetDir": "netstandard1.3", "SourceDir": "netstandard1.3", copyOnly: true },
     ];
 
   grunt.log.writeln(util.inspect(config));

diff --git a/grunt/config.json b/grunt/config.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "1.0.0.1",
   "server": {
     "port": 80,
     "ssl_port": 443,

diff --git a/grunt/tasks/createNugetPackage.js b/grunt/tasks/createNugetPackage.js
@@ -69,12 +69,10 @@
 
 
 
-    function addBuildWithTitle(title, destsubdir, srcsubdir, filename) {
+    function addBuildWithTitle(title, destsubdir, srcsubdir) {
       var src_path = string.format('{0}/../../Src/{1}/{2}{3}/', __dirname, title, output_path_base, srcsubdir);
       var dst_path = package_lib_path + destsubdir + '/';
-      if (!filename) {
-        filename = 'EngineIoClientDotNet.dll';
-      }
+      var filename = 'EngineIoClientDotNet.dll';
       var src_file = string.format('{0}{1}', src_path, filename);
       var dst_file = string.format('{0}EngineIoClientDotNet.dll', dst_path);
 
@@ -88,7 +86,7 @@
     }
 
     for (i = 0; i < nuget_builds.length; i++) {
-      addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir, nuget_builds[i].SourceDir, nuget_builds[i].SourceFileName);
+      addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir, nuget_builds[i].SourceDir);
     }
     tasks.push('C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe pwd');
     tasks.push(string.format('{0} pack EngineIoClientDotNet.nuspec', config.win.nuget));

diff --git a/grunt/templates/EngineIoClientDotNet.nuspec b/grunt/templates/EngineIoClientDotNet.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>EngineIoClientDotNet</id>
-    <version>@VERSION@-beta0</version>
+    <version>@VERSION@-beta1</version>
     <title>EngineIoClientDotNet</title>
     <authors>Matthias Ludwig</authors>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
@@ -34,9 +34,6 @@
     <projectUrl>https://github.com/Quobject/EngineIoClientDotNet/</projectUrl>
     <description>This is the Engine.IO Client Library for C#.</description>
     <summary>This library supports all of the features the JS client does, including events, options and upgrading transport. EngineIoClientDotNet has a similar api to those of the JavaScript client.</summary>
-    <tags>engine.io.client</tags>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Web" targetFramework="net45" />
-    </frameworkAssemblies>
+    <tags>engine.io.client</tags>  
   </metadata>
 </package>