Skip to content

Commit a90e314

Browse files
yfakariyayfakariya
committed
Add Xamain.iOS unfied assembly. Issue #181.
1 parent c4f75f9 commit a90e314

7 files changed

Lines changed: 847 additions & 8 deletions

File tree

‎MsgPack.Xamarin.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{60EC42E9-D79B-4ADF-8F80-4DCD580061FD}"
77
ProjectSection(SolutionItems) = preProject
@@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.Xamarin.iOS", "src\
2828
EndProject
2929
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.Xamarin.iOS", "test\MsgPack.UnitTest.Xamarin.iOS\MsgPack.UnitTest.Xamarin.iOS.csproj", "{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}"
3030
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.Xamarin.iOS.Unified", "src\MsgPack.Xamarin.iOS.Unified\MsgPack.Xamarin.iOS.Unified.csproj", "{C9710C8A-2FA9-47FE-812C-992C283471CC}"
32+
EndProject
3133
Global
3234
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3335
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -153,6 +155,38 @@ Global
153155
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
154156
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
155157
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|Mixed Platforms.ActiveCfg = Release|iPhone
158+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
159+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
160+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
161+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
162+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
163+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
164+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
165+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
166+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
167+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|Any CPU.Build.0 = Release|Any CPU
168+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|iPhone.ActiveCfg = Release|Any CPU
169+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|iPhone.Build.0 = Release|Any CPU
170+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
171+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
172+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
173+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
174+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
176+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
177+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|iPhone.Build.0 = Debug|Any CPU
178+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
179+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
180+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
181+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
182+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
183+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|Any CPU.Build.0 = Release|Any CPU
184+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|iPhone.ActiveCfg = Release|Any CPU
185+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|iPhone.Build.0 = Release|Any CPU
186+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
187+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
188+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
189+
{C9710C8A-2FA9-47FE-812C-992C283471CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
156190
EndGlobalSection
157191
GlobalSection(SolutionProperties) = preSolution
158192
HideSolutionNode = FALSE
@@ -163,6 +197,7 @@ Global
163197
{5EDECDB4-5179-4441-974F-EC26B4F54528} = {87A17015-9338-431E-B338-57BDA03984C1}
164198
{346B55F0-94FA-4B90-9C11-06031043B685} = {BA5E7D16-23AB-44B5-BAF5-6E9C9F51E67A}
165199
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C} = {87A17015-9338-431E-B338-57BDA03984C1}
200+
{C9710C8A-2FA9-47FE-812C-992C283471CC} = {BA5E7D16-23AB-44B5-BAF5-6E9C9F51E67A}
166201
EndGlobalSection
167202
GlobalSection(MonoDevelopProperties) = preSolution
168203
StartupItem = src\MsgPack.Xamarin.Android\MsgPack.Xamarin.Android.csproj

‎Sync.Test.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,19 @@
4646
<Exclude Path="Serialization\MessagePackMemberAttributeTest.cs" />
4747
</Project>
4848

49+
<Project Name="MsgPack.UnitTest.Xamarin.iOS.Unified" Base="MsgPack.UnitTest.Xamarin.iOS">
50+
<Preserve Path="Properties\*" />
51+
<Preserve Path="Resources\*" />
52+
<Preserve File="*.config" />
53+
<Preserve File="*.json" />
54+
<Preserve File="*.mpac" />
55+
<Preserve File="*.snk" />
56+
<Preserve File="*.plist" />
57+
<Preserve Path="Main.cs" />
58+
<Preserve Path="AppDelegate.cs" />
59+
<Exclude Path="UnitTestAppDelegate.cs" />
60+
</Project>
61+
4962
<Project Name="MsgPack.UnitTest.Xamarin.Android" Base="MsgPack.UnitTest.Xamarin.iOS">
5063
<Preserve Path="Properties\*" />
5164
<Preserve Path="Resources\*" />

‎Sync.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@
8686
<Exclude Path="NetStandardCompatibility.cs" />
8787
<Exclude Path="project.json" />
8888
</Project>
89+
90+
<!-- TOOD: should be project.json -->
91+
<Project Name="MsgPack.Xamarin.iOS.Unified" Base="MsgPack.Xamarin.iOS">
92+
<Preserve Path="Properties\AssemblyInfo.cs" />
93+
</Project>
94+
95+
8996

9097
<!-- TOOD: should be project.json -->
9198
<Project Name="MsgPack.Xamarin.Android" Base="MsgPack.Xamarin.iOS">

‎build/Build.ps1‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,6 @@ if ( $LastExitCode -ne 0 )
158158
exit $LastExitCode
159159
}
160160

161-
if ( $buildConfig -eq 'Release' )
162-
{
163-
Copy-Item ../bin/MonoTouch10 ../bin/Xamarin.iOS10 -Recurse
164-
}
165-
166161
dotnet restore $projCoreClr
167162
if ( $LastExitCode -ne 0 )
168163
{

0 commit comments

Comments
 (0)