Skip to content

Commit 46f312a

Browse files
darkldarkl
committed
Adding Xamarin.iOS10 support
1 parent 710c14b commit 46f312a

File tree

17 files changed

+402
-7
lines changed

17 files changed

+402
-7
lines changed

‎NuGet/WampSharp.Default.Client.nuspec‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
<dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
3434
<dependency id="WampSharp.WebSockets" version="[$version$]" />
3535
</group>
36+
<group targetFramework="Xamarin.iOS10">
37+
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
38+
<dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
39+
<dependency id="WampSharp.WebSockets" version="[$version$]" />
40+
</group>
3641
</dependencies>
3742
<id>WampSharp.Default.Client</id>
3843
<title>WampSharp default client binding</title>
@@ -54,5 +59,7 @@
5459
<file src="$bin$\netstandard1.3\WampSharp.Default.Client.xml" target="lib\netstandard1.3\WampSharp.Default.Client.xml" />
5560
<file src="$bin$\netstandard2.0\WampSharp.Default.Client.dll" target="lib\netstandard2.0\WampSharp.Default.Client.dll" />
5661
<file src="$bin$\netstandard2.0\WampSharp.Default.Client.xml" target="lib\netstandard2.0\WampSharp.Default.Client.xml" />
62+
<file src="$bin$\Xamarin.iOS10\WampSharp.Default.Client.dll" target="lib\Xamarin.iOS10\WampSharp.Default.Client.dll" />
63+
<file src="$bin$\Xamarin.iOS10\WampSharp.Default.Client.xml" target="lib\Xamarin.iOS10\WampSharp.Default.Client.xml" />
5764
</files>
5865
</package>

‎NuGet/WampSharp.Default.nuspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<group targetFramework=".NETStandard2.0">
2323
<dependency id="WampSharp.Default.Client" version="[$version$]" />
2424
</group>
25+
<group targetFramework="Xamarin.iOS10">
26+
<dependency id="WampSharp.Default.Client" version="[$version$]" />
27+
</group>
2528
</dependencies>
2629
<id>WampSharp.Default</id>
2730
<title>WampSharp default binding</title>

‎NuGet/WampSharp.NewtonsoftJson.nuspec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<dependency id="WampSharp" version="[$version$]" />
2626
<dependency id="Newtonsoft.Json" version="[9.0.1, )" />
2727
</group>
28+
<group targetFramework="Xamarin.iOS10">
29+
<dependency id="WampSharp" version="[$version$]" />
30+
<dependency id="Newtonsoft.Json" version="[9.0.1, )" />
31+
</group>
2832
<group targetFramework="uap10.0">
2933
<dependency id="WampSharp" version="[$version$]" />
3034
<dependency id="Newtonsoft.Json" version="[9.0.1, )" />
@@ -48,5 +52,7 @@
4852
<file src="$bin$\netstandard1.3\WampSharp.NewtonsoftJson.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.xml" />
4953
<file src="$bin$\netstandard2.0\WampSharp.NewtonsoftJson.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftJson.dll" />
5054
<file src="$bin$\netstandard2.0\WampSharp.NewtonsoftJson.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftJson.xml" />
55+
<file src="$bin$\Xamarin.iOS10\WampSharp.NewtonsoftJson.dll" target="lib\Xamarin.iOS10\WampSharp.NewtonsoftJson.dll" />
56+
<file src="$bin$\Xamarin.iOS10\WampSharp.NewtonsoftJson.xml" target="lib\Xamarin.iOS10\WampSharp.NewtonsoftJson.xml" />
5157
</files>
5258
</package>

‎NuGet/WampSharp.NewtonsoftMsgpack.nuspec‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@
3838
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\net45\WampSharp.NewtonsoftMsgpack.xml" />
3939
<file src="$bin$\net40\WampSharp.NewtonsoftMsgpack.dll" target="lib\net40\WampSharp.NewtonsoftMsgpack.dll" />
4040
<file src="$bin$\net40\WampSharp.NewtonsoftMsgpack.xml" target="lib\net40\WampSharp.NewtonsoftMsgpack.xml" />
41-
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.dll" />
42-
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.xml" />
43-
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.dll" />
44-
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.xml" />
41+
<file src="$bin$\netstandard1.3\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.dll" />
42+
<file src="$bin$\netstandard1.3\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.xml" />
43+
<file src="$bin$\netstandard2.0\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.dll" />
44+
<file src="$bin$\netstandard2.0\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.xml" />
45+
<file src="$bin$\Xamarin.iOS10\WampSharp.NewtonsoftMsgpack.dll" target="lib\Xamarin.iOS10\WampSharp.NewtonsoftMsgpack.dll" />
46+
<file src="$bin$\Xamarin.iOS10\WampSharp.NewtonsoftMsgpack.xml" target="lib\Xamarin.iOS10\WampSharp.NewtonsoftMsgpack.xml" />
4547
</files>
4648
</package>

‎NuGet/WampSharp.WebSocket4Net.nuspec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<dependency id="WampSharp" version="[$version$]" />
1818
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
1919
</group>
20+
<group targetFramework="Xamarin.iOS10">
21+
<dependency id="WampSharp" version="[$version$]" />
22+
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
23+
</group>
2024
<group targetFramework=".NETStandard2.0">
2125
<dependency id="WampSharp" version="[$version$]" />
2226
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
@@ -38,5 +42,7 @@
3842
<file src="$bin$\netstandard1.3\WampSharp.WebSocket4Net.xml" target="lib\netstandard1.3\WampSharp.WebSocket4Net.xml" />
3943
<file src="$bin$\netstandard2.0\WampSharp.WebSocket4Net.dll" target="lib\netstandard2.0\WampSharp.WebSocket4Net.dll" />
4044
<file src="$bin$\netstandard2.0\WampSharp.WebSocket4Net.xml" target="lib\netstandard2.0\WampSharp.WebSocket4Net.xml" />
45+
<file src="$bin$\Xamarin.iOS10\WampSharp.WebSocket4Net.dll" target="lib\Xamarin.iOS10\WampSharp.WebSocket4Net.dll" />
46+
<file src="$bin$\Xamarin.iOS10\WampSharp.WebSocket4Net.xml" target="lib\Xamarin.iOS10\WampSharp.WebSocket4Net.xml" />
4147
</files>
4248
</package>

‎NuGet/WampSharp.WebSockets.nuspec‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<group targetFramework=".NETStandard2.0">
2121
<dependency id="WampSharp" version="[$version$]" />
2222
</group>
23+
<group targetFramework="Xamarin.iOS10">
24+
<dependency id="WampSharp" version="[$version$]" />
25+
</group>
2326
</dependencies>
2427
</metadata>
2528
<files>
@@ -29,5 +32,6 @@
2932
<file src="$bin$\netstandard1.3\WampSharp.WebSockets.xml" target="lib\netstandard1.3\WampSharp.WebSockets.xml" />
3033
<file src="$bin$\netstandard2.0\WampSharp.WebSockets.dll" target="lib\netstandard2.0\WampSharp.WebSockets.dll" />
3134
<file src="$bin$\netstandard2.0\WampSharp.WebSockets.xml" target="lib\netstandard2.0\WampSharp.WebSockets.xml" />
32-
</files>
35+
<file src="$bin$\Xamarin.iOS10\WampSharp.WebSockets.dll" target="lib\Xamarin.iOS10\WampSharp.WebSockets.dll" />
36+
<file src="$bin$\Xamarin.iOS10\WampSharp.WebSockets.xml" target="lib\Xamarin.iOS10\WampSharp.WebSockets.xml" /> </files>
3337
</package>

‎NuGet/WampSharp.nuspec‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@
4141
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
4242
<dependency id="System.ValueTuple" version="[4.4.0, )" />
4343
</group>
44+
<group targetFramework="Xamarin.iOS10">
45+
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
46+
<dependency id="System.DispatchProxy" version="[4.4.0, )" />
47+
<dependency id="System.Collections.Immutable" version="[1.3.1, )" />
48+
<dependency id="System.Reactive" version="[3.0.0, 3.1.1]" />
49+
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
50+
<dependency id="System.ValueTuple" version="[4.4.0, )" />
51+
</group>
4452
<group targetFramework="UAP10.0">
4553
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="[5.2.2 , )" />
4654
<dependency id="System.Reactive" version="[3.0.0, 3.1.1]" />
@@ -61,8 +69,8 @@
6169
<file src="$bin$\net40\WampSharp.xml" target="lib\net40\WampSharp.xml" />
6270
<file src="$bin$\pcl\WampSharp.dll" target="lib\portable-win81+wpa81\WampSharp.dll" />
6371
<file src="$bin$\pcl\WampSharp.xml" target="lib\portable-win81+wpa81\WampSharp.xml" />
64-
<file src="$bin$\pcl\WampSharp.dll" target="lib\Xamarin.iOS10\WampSharp.dll" />
65-
<file src="$bin$\pcl\WampSharp.xml" target="lib\Xamarin.iOS10\WampSharp.xml" />
72+
<file src="$bin$\Xamarin.iOS10\WampSharp.dll" target="lib\Xamarin.iOS10\WampSharp.dll" />
73+
<file src="$bin$\Xamarin.iOS10\WampSharp.xml" target="lib\Xamarin.iOS10\WampSharp.xml" />
6674
<file src="$bin$\netstandard1.3\WampSharp.dll" target="lib\netstandard1.3\WampSharp.dll" />
6775
<file src="$bin$\netstandard1.3\WampSharp.xml" target="lib\netstandard1.3\WampSharp.xml" />
6876
<file src="$bin$\netstandard2.0\WampSharp.dll" target="lib\netstandard2.0\WampSharp.dll" />

‎src/Xamarin.iOS10/Default/WampSharp.NewtonsoftJson/WampSharp.NewtonsoftJson.csproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
6+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
7+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
8+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
9+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
10+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
11+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
12+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
13+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<Compile Include="..\..\..\net45\Default\WampSharp.NewtonsoftJson\**\*.cs" Exclude="..\..\..\net45\Default\WampSharp.NewtonsoftJson\**\bin\**;..\..\..\net45\Default\WampSharp.NewtonsoftJson\**\obj\**;" />
18+
</ItemGroup>
19+
20+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
21+
<DefineConstants>NETCORE</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
25+
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
26+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
27+
</ItemGroup>
28+
29+
</Project>

‎src/Xamarin.iOS10/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
6+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
7+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
8+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
9+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
10+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
11+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
12+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
13+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<Compile Include="..\..\..\net45\Default\WampSharp.NewtonsoftMsgpack\**\*.cs" Exclude="..\..\..\net45\Default\WampSharp.NewtonsoftMsgpack\**\bin\**;..\..\..\net45\Default\WampSharp.NewtonsoftMsgpack\**\obj\**;" />
18+
</ItemGroup>
19+
20+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
21+
<DefineConstants>NETCORE</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
25+
<ProjectReference Include="..\WampSharp.NewtonsoftJson\WampSharp.NewtonsoftJson.csproj" />
26+
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
27+
</ItemGroup>
28+
29+
</Project>

‎src/Xamarin.iOS10/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
6+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
7+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
8+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
9+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
10+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
11+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
12+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
13+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\**\*.cs" Exclude="..\..\..\net45\Default\WampSharp.WebSocket4Net\**\bin\**;..\..\..\net45\Default\WampSharp.WebSocket4Net\**\obj\**;" />
18+
</ItemGroup>
19+
20+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
21+
<DefineConstants>NETCORE</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
26+
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
27+
</ItemGroup>
28+
29+
30+
</Project>

0 commit comments

Comments
 (0)