Skip to content

Commit 6cca275

Browse files
mattqsmattqs
committed
v1.0.0.1-beta1
1 parent 8f102a5 commit 6cca275

File tree

9 files changed

+36
-37
lines changed

9 files changed

+36
-37
lines changed

‎Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.sln‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.net35", "EngineIoClientDotNet.net35.csproj", "{568D67D0-3253-4601-9B04-7730A9EC5CC0}"
77
EndProject
@@ -26,29 +26,29 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt(2)", "http://localhos
2626
SlnRelativePath = "..\..\grunt\"
2727
EndProjectSection
2828
EndProject
29-
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "TestServer(2)", "http://localhost:48775", "{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}"
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.net35", "..\EngineIoClientDotNet.Tests.net35\EngineIoClientDotNet.Tests.net35.csproj", "{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}"
30+
EndProject
31+
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "EngineIoClientDotNet", "..\..\", "{3EB481DF-5B0B-4E72-90A1-039165F580E1}"
3032
ProjectSection(WebsiteProperties) = preProject
31-
UseIISExpress = "true"
3233
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
33-
Debug.AspNetCompiler.VirtualPath = "/localhost_48775"
34-
Debug.AspNetCompiler.PhysicalPath = "..\..\TestServer\"
35-
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_48775\"
34+
Debug.AspNetCompiler.VirtualPath = "/localhost_11863"
35+
Debug.AspNetCompiler.PhysicalPath = "..\..\..\EngineIoClientDotNet\"
36+
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_11863\"
3637
Debug.AspNetCompiler.Updateable = "true"
3738
Debug.AspNetCompiler.ForceOverwrite = "true"
3839
Debug.AspNetCompiler.FixedNames = "false"
3940
Debug.AspNetCompiler.Debug = "True"
40-
Release.AspNetCompiler.VirtualPath = "/localhost_48775"
41-
Release.AspNetCompiler.PhysicalPath = "..\..\TestServer\"
42-
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_48775\"
41+
Release.AspNetCompiler.VirtualPath = "/localhost_11863"
42+
Release.AspNetCompiler.PhysicalPath = "..\..\..\EngineIoClientDotNet\"
43+
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_11863\"
4344
Release.AspNetCompiler.Updateable = "true"
4445
Release.AspNetCompiler.ForceOverwrite = "true"
4546
Release.AspNetCompiler.FixedNames = "false"
4647
Release.AspNetCompiler.Debug = "False"
47-
SlnRelativePath = "..\..\TestServer\"
48+
VWDPort = "11863"
49+
SlnRelativePath = "..\..\..\EngineIoClientDotNet\"
4850
EndProjectSection
4951
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.net35", "..\EngineIoClientDotNet.Tests.net35\EngineIoClientDotNet.Tests.net35.csproj", "{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}"
51-
EndProject
5252
Global
5353
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5454
Debug|Any CPU = Debug|Any CPU
@@ -63,14 +63,14 @@ Global
6363
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|Any CPU.Build.0 = Debug|Any CPU
6464
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.ActiveCfg = Debug|Any CPU
6565
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.Build.0 = Debug|Any CPU
66-
{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67-
{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
68-
{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
69-
{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}.Release|Any CPU.Build.0 = Debug|Any CPU
7066
{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7167
{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Debug|Any CPU.Build.0 = Debug|Any CPU
7268
{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Release|Any CPU.ActiveCfg = Release|Any CPU
7369
{BA788BBE-0FE8-4C2F-8A02-457A5E9E2703}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Release|Any CPU.ActiveCfg = Debug|Any CPU
73+
{3EB481DF-5B0B-4E72-90A1-039165F580E1}.Release|Any CPU.Build.0 = Debug|Any CPU
7474
EndGlobalSection
7575
GlobalSection(SolutionProperties) = preSolution
7676
HideSolutionNode = FALSE

‎Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.0")]
35-
[assembly: AssemblyFileVersion("1.0.0")]
34+
[assembly: AssemblyVersion("1.0.0.1")]
35+
[assembly: AssemblyFileVersion("1.0.0.1")]

‎Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.0")]
35-
[assembly: AssemblyFileVersion("1.0.0")]
34+
[assembly: AssemblyVersion("1.0.0.1")]
35+
[assembly: AssemblyFileVersion("1.0.0.1")]

‎Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.0")]
35-
[assembly: AssemblyFileVersion("1.0.0")]
34+
[assembly: AssemblyVersion("1.0.0.1")]
35+
[assembly: AssemblyFileVersion("1.0.0.1")]

‎Src/EngineIoClientDotNet.netstandard1.3/EngineIoClientDotNet.netstandard1.3.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
66
<Description>This is the Engine.IO Client Library for C#.</Description>
77
<PackageProjectUrl>https://github.com/Quobject/EngineIoClientDotNet/</PackageProjectUrl>
8-
<Version>1.0.0-beta0</Version>
8+
<Version>1.0.0.1-beta1</Version>
99
<Copyright>Copyright © 2017</Copyright>
1010
<RepositoryUrl>https://github.com/Quobject/EngineIoClientDotNet/</RepositoryUrl>
11+
<AssemblyVersion>1.0.0.1</AssemblyVersion>
12+
<FileVersion>1.0.0.1</FileVersion>
13+
<RootNamespace>Quobject.EngineIoClientDotNet</RootNamespace>
14+
<AssemblyName>EngineIoClientDotNet</AssemblyName>
1115
</PropertyGroup>
1216

1317
<ItemGroup>
@@ -43,7 +47,7 @@
4347
</ItemGroup>
4448

4549
<ItemGroup>
46-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
50+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
4751
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
4852
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
4953
</ItemGroup>

‎grunt/Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
1111
{ "Name": "EngineIoClientDotNet.net35", "NuGetDir": "net35", "SourceDir": "net35", copyOnly: true },
1212
{ "Name": "EngineIoClientDotNet.net40", "NuGetDir": "net40", "SourceDir": "net40", copyOnly: true },
1313
{ "Name": "EngineIoClientDotNet.net45", "NuGetDir": "net45", "SourceDir": "net45", copyOnly: true },
14-
{ "Name": "EngineIoClientDotNet.netstandard1.3", "NuGetDir": "netstandard1.3", "SourceDir": "netstandard1.3", "SourceFileName": "EngineIoClientDotNet.netstandard1.3.dll", copyOnly: true },
14+
{ "Name": "EngineIoClientDotNet.netstandard1.3", "NuGetDir": "netstandard1.3", "SourceDir": "netstandard1.3", copyOnly: true },
1515
];
1616

1717
grunt.log.writeln(util.inspect(config));

‎grunt/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0",
2+
"version": "1.0.0.1",
33
"server": {
44
"port": 80,
55
"ssl_port": 443,

‎grunt/tasks/createNugetPackage.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,10 @@
6969

7070

7171

72-
function addBuildWithTitle(title, destsubdir, srcsubdir, filename) {
72+
function addBuildWithTitle(title, destsubdir, srcsubdir) {
7373
var src_path = string.format('{0}/../../Src/{1}/{2}{3}/', __dirname, title, output_path_base, srcsubdir);
7474
var dst_path = package_lib_path + destsubdir + '/';
75-
if (!filename) {
76-
filename = 'EngineIoClientDotNet.dll';
77-
}
75+
var filename = 'EngineIoClientDotNet.dll';
7876
var src_file = string.format('{0}{1}', src_path, filename);
7977
var dst_file = string.format('{0}EngineIoClientDotNet.dll', dst_path);
8078

@@ -88,7 +86,7 @@
8886
}
8987

9088
for (i = 0; i < nuget_builds.length; i++) {
91-
addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir, nuget_builds[i].SourceDir, nuget_builds[i].SourceFileName);
89+
addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir, nuget_builds[i].SourceDir);
9290
}
9391
tasks.push('C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe pwd');
9492
tasks.push(string.format('{0} pack EngineIoClientDotNet.nuspec', config.win.nuget));

‎grunt/templates/EngineIoClientDotNet.nuspec‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>EngineIoClientDotNet</id>
5-
<version>@VERSION@-beta0</version>
5+
<version>@VERSION@-beta1</version>
66
<title>EngineIoClientDotNet</title>
77
<authors>Matthias Ludwig</authors>
88
<licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
@@ -34,9 +34,6 @@
3434
<projectUrl>https://github.com/Quobject/EngineIoClientDotNet/</projectUrl>
3535
<description>This is the Engine.IO Client Library for C#.</description>
3636
<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>
37-
<tags>engine.io.client</tags>
38-
<frameworkAssemblies>
39-
<frameworkAssembly assemblyName="System.Web" targetFramework="net45" />
40-
</frameworkAssemblies>
37+
<tags>engine.io.client</tags>
4138
</metadata>
4239
</package>

0 commit comments

Comments
 (0)