Skip to content

Commit adf5862

Browse files
mattqsmattqs
committed
0.9.12 Release
1 parent 3e63986 commit adf5862

10 files changed

Lines changed: 47 additions & 32 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ More examples can be found in [unit tests](https://github.com/Quobject/SocketIoC
4242
This library supports all of the features the JS client does, including events, options and upgrading transport.
4343

4444
## Framework Versions
45-
.Net Framework 3.5, .Net Framework 4.0, .Net Framework 4.5, Windows 8, Windows 8.1, Windows Phone 8, Windows Phone 8.1, Mono, Unity
45+
.Net Framework 3.5, .Net Framework 4.0, .Net Framework 4.5, Windows 8, Windows 8.1, Windows Phone 8, Windows Phone 8.1, Mono, Unity3D, Xamarin-iOS, Xamarin-MonoTouch, Xamarin-Android
4646

4747
## License
4848

‎Src/SocketIoClientDotNet.Tests.Xamarin-Android.TestApp/Resources/Resource.designer.cs‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Src/SocketIoClientDotNet.Tests.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("0.9.11")]
35-
[assembly: AssemblyFileVersion("0.9.11")]
34+
[assembly: AssemblyVersion("0.9.12")]
35+
[assembly: AssemblyFileVersion("0.9.12")]

‎Src/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android.csproj‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
77
<ProjectGuid>{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}</ProjectGuid>
@@ -14,26 +14,18 @@
1414
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1515
<AssemblyName>SocketIoClientDotNet</AssemblyName>
1616
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug</OutputPath>
23-
<DefineConstants>DEBUG;</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<ConsolePause>false</ConsolePause>
2717
<AndroidLinkMode>None</AndroidLinkMode>
18+
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
2819
</PropertyGroup>
2920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
3023
<Optimize>true</Optimize>
3124
<OutputPath>bin\Release</OutputPath>
25+
<DefineConstants>TRACE</DefineConstants>
3226
<ErrorReport>prompt</ErrorReport>
3327
<WarningLevel>4</WarningLevel>
3428
<ConsolePause>false</ConsolePause>
35-
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
36-
<DefineConstants>TRACE</DefineConstants>
3729
</PropertyGroup>
3830
<ItemGroup>
3931
<Reference Include="System" />

‎Src/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Global
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
14+
{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}.Debug|Any CPU.ActiveCfg = Release|Any CPU
15+
{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}.Debug|Any CPU.Build.0 = Release|Any CPU
1616
{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
1717
{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}.Release|Any CPU.Build.0 = Release|Any CPU
1818
{4A0DAB5D-5A84-49E2-AD98-443D1A656C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

‎Src/SocketIoClientDotNet.Xamarin-MonoTouch/SocketIoClientDotNet.Xamarin-MonoTouch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<RootNamespace>SocketIoClientDotNet</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
11-
<AssemblyName>SocketIoClientDotNet.Xamarin-MonoTouch</AssemblyName>
11+
<AssemblyName>SocketIoClientDotNet</AssemblyName>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎Src/SocketIoClientDotNet.Xamarin-iOS/SocketIoClientDotNet.Xamarin-iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<RootNamespace>SocketIoClientDotNet</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
11-
<AssemblyName>SocketIoClientDotNet.Xamarin-iOS</AssemblyName>
11+
<AssemblyName>SocketIoClientDotNet</AssemblyName>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎grunt/Gruntfile.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ module.exports = function (grunt) {
66
util = require('util'),
77
os = node_os.platform() === 'win32' ? 'win' : 'linux',
88
nuget_builds = [
9-
{ "Name": "SocketIoClientDotNet.net35", "NuGetDir": "net35" },
10-
{ "Name": "SocketIoClientDotNet.net40", "NuGetDir": "net40" },
11-
{ "Name": "SocketIoClientDotNet.net45", "NuGetDir": "net45" },
12-
{ "Name": "SocketIoClientDotNet.windowsphone8", "NuGetDir": "windowsphone8" },
9+
{ "Name": "SocketIoClientDotNet.net35", "NuGetDir": "net35", "SourceDir": "net35" },
10+
{ "Name": "SocketIoClientDotNet.net40", "NuGetDir": "net40", "SourceDir": "net40" },
11+
{ "Name": "SocketIoClientDotNet.net45", "NuGetDir": "net45", "SourceDir": "net45" },
12+
{ "Name": "SocketIoClientDotNet.windowsphone8", "NuGetDir": "windowsphone8", "SourceDir": "windowsphone8" },
1313
{ "Name": "SocketIoClientDotNet.Xamarin-iOS", "NuGetDir": "xamarinios10", "SourceDir": "xamarinios10" },
1414
{ "Name": "SocketIoClientDotNet.Xamarin-MonoTouch", "NuGetDir": "monotouch10", "SourceDir": "monotouch10" },
1515
{ "Name": "SocketIoClientDotNet.Xamarin-Android", "NuGetDir": "monoandroid10", "SourceDir": "", copyOnly: true },
16-
{ "Name": "SocketIoClientDotNet.netcore45", "NuGetDir": "netcore45" },
17-
{ "Name": "SocketIoClientDotNet.portable-wpa81+wp81", "NuGetDir": "portable-wpa81+wp81" },
18-
{ "Name": "SocketIoClientDotNet.portable-win81+wpa81", "NuGetDir": "portable-win81+wpa81" }
16+
{ "Name": "SocketIoClientDotNet.netcore45", "NuGetDir": "netcore45","SourceDir": "", copyOnly: true },
17+
{ "Name": "SocketIoClientDotNet.portable-wpa81+wp81", "NuGetDir": "portable-wpa81+wp81", "SourceDir": "", copyOnly: true },
18+
{ "Name": "SocketIoClientDotNet.portable-win81+wpa81", "NuGetDir": "portable-win81+wpa81", "SourceDir": "" }
1919
];
2020

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

‎grunt/tasks/build-client.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848

4949
if (os === 'win') {
5050
for (i = 0; i < nuget_builds.length; i++) {
51-
addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir);
51+
if (!nuget_builds[i].copyOnly) {
52+
addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir);
53+
}
5254
}
5355
} else {
5456
addBuildWithTitle('SocketIoClientDotNet.mono');

‎grunt/tasks/createNugetPackage.js‎

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

7070

7171

72-
function addBuildWithTitle(title, dir) {
72+
function addBuildWithTitle(title, destsubdir, srcsubdir) {
7373
var
74-
src_path = string.format('{0}/../../Src/{1}/{2}{3}/', __dirname,title, output_path_base, dir),
75-
dst_path = package_lib_path + dir + '/',
74+
src_path = string.format('{0}/../../Src/{1}/{2}{3}/', __dirname, title, output_path_base, srcsubdir),
75+
dst_path = package_lib_path + destsubdir + '/',
7676
//src_file = string.format('{0}SocketIoClientDotNet.dll', src_path),
7777
src_file = string.format('{0}SocketIoClientDotNet.dll', src_path),
7878
dst_file = string.format('{0}SocketIoClientDotNet.dll', dst_path);
@@ -87,7 +87,7 @@
8787
}
8888

8989
for (i = 0; i < nuget_builds.length; i++) {
90-
addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir);
90+
addBuildWithTitle(nuget_builds[i].Name, nuget_builds[i].NuGetDir, nuget_builds[i].SourceDir);
9191
}
9292
tasks.push('C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe pwd');
9393
tasks.push(string.format('{0} pack SocketIoClientDotNet.nuspec', config.win.nuget));

0 commit comments

Comments
 (0)