Skip to content

Commit df61c56

Browse files
yfakariyayfakariya
committed
Fix Xamarin.Android test projects.
Xamarin Android project system does not recognized linked resources in common property files, so I copied them to each project files. This commit also add deployment settings for all Xamarin Android test projects in the solution file.
1 parent d96befc commit df61c56

18 files changed

Lines changed: 445 additions & 269 deletions

File tree

‎MsgPack.Xamarin.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,7 @@ Global
597597
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
598598
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
599599
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
600+
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
600601
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
601602
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
602603
{AE931C31-C472-4F0C-B988-6EDCA66E0C2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -648,6 +649,7 @@ Global
648649
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
649650
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
650651
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
652+
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
651653
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
652654
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
653655
{A10B7CCB-3CD2-48E2-8715-F8186BCAE4E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -699,6 +701,7 @@ Global
699701
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
700702
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
701703
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.Debug|Any CPU.Build.0 = Debug|Any CPU
704+
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
702705
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.Debug|iPhone.ActiveCfg = Debug|Any CPU
703706
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
704707
{87803450-73E2-4EC3-9A11-B4A399C6FD47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -750,6 +753,7 @@ Global
750753
{64868F91-8537-4CC7-9900-A29D5E51FB52}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
751754
{64868F91-8537-4CC7-9900-A29D5E51FB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
752755
{64868F91-8537-4CC7-9900-A29D5E51FB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
756+
{64868F91-8537-4CC7-9900-A29D5E51FB52}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
753757
{64868F91-8537-4CC7-9900-A29D5E51FB52}.Debug|iPhone.ActiveCfg = Debug|Any CPU
754758
{64868F91-8537-4CC7-9900-A29D5E51FB52}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
755759
{64868F91-8537-4CC7-9900-A29D5E51FB52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -801,6 +805,7 @@ Global
801805
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
802806
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
803807
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
808+
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
804809
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
805810
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
806811
{F08FFEDD-1158-40D8-ACC2-02DD6A5C84A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -852,6 +857,7 @@ Global
852857
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
853858
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
854859
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
860+
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
855861
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
856862
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
857863
{436EDA6D-0FF9-40E9-BB74-08D0DCDF94AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

‎test/MsgPack.UnitTest.ArraySerialization.Xamarin.Android/MsgPack.UnitTest.ArraySerialization.Xamarin.Android.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,5 +1530,14 @@
15301530
</Compile>
15311531
<Compile Include="Resources\Resource.Designer.cs" />
15321532
</ItemGroup>
1533+
<ItemGroup>
1534+
<AndroidResource Include="..\MsgPack.UnitTest.Xamarin.Android\Resources\drawable\Icon.png">
1535+
<Link>Resources\drawable\Icon.png</Link>
1536+
</AndroidResource>
1537+
<AndroidResource Include="..\MsgPack.UnitTest.Xamarin.Android\Resources\values\Strings.xml">
1538+
<Link>Resources\values\Strings.xml</Link>
1539+
<SubType>Designer</SubType>
1540+
</AndroidResource>
1541+
</ItemGroup>
15331542
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
15341543
</Project>

‎test/MsgPack.UnitTest.ArraySerialization.Xamarin.Android/Resources/Resource.Designer.cs‎

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

‎test/MsgPack.UnitTest.MapSerialization.Xamarin.Android/MsgPack.UnitTest.MapSerialization.Xamarin.Android.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,5 +1530,14 @@
15301530
</Compile>
15311531
<Compile Include="Resources\Resource.Designer.cs" />
15321532
</ItemGroup>
1533+
<ItemGroup>
1534+
<AndroidResource Include="..\MsgPack.UnitTest.Xamarin.Android\Resources\drawable\Icon.png">
1535+
<Link>Resources\drawable\Icon.png</Link>
1536+
</AndroidResource>
1537+
<AndroidResource Include="..\MsgPack.UnitTest.Xamarin.Android\Resources\values\Strings.xml">
1538+
<Link>Resources\values\Strings.xml</Link>
1539+
<SubType>Designer</SubType>
1540+
</AndroidResource>
1541+
</ItemGroup>
15331542
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
15341543
</Project>

‎test/MsgPack.UnitTest.MapSerialization.Xamarin.Android/Resources/Resource.Designer.cs‎

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

‎test/MsgPack.UnitTest.Packer.Xamarin.Android/MsgPack.UnitTest.Packer.Xamarin.Android.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,14 @@
5454
</Compile>
5555
<Compile Include="Resources\Resource.Designer.cs" />
5656
</ItemGroup>
57+
<ItemGroup>
58+
<AndroidResource Include="..\MsgPack.UnitTest.Xamarin.Android\Resources\drawable\Icon.png">
59+
<Link>Resources\drawable\Icon.png</Link>
60+
</AndroidResource>
61+
<AndroidResource Include="..\MsgPack.UnitTest.Xamarin.Android\Resources\values\Strings.xml">
62+
<Link>Resources\values\Strings.xml</Link>
63+
<SubType>Designer</SubType>
64+
</AndroidResource>
65+
</ItemGroup>
5766
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
5867
</Project>

0 commit comments

Comments
 (0)