Merge pull request #72 from xamarin/v26.x

26.0.2
xamarin · Oct 13, 2017 · d34a7f3 · d34a7f3
2 parents bb628b9 + 2d158a6
commit d34a7f3
Show file tree

Hide file tree

Showing 113 changed files with 694 additions and 700 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ packages/
 externals/
 output/
 docs/
+.vs/
 
 *.xam
 *.DS_Store
@@ -26,3 +27,4 @@ Resource.designer.cs
 component.yaml
 Details.md
 /generated.targets
+*.commit
diff --git a/AndroidSupport.sln b/AndroidSupport.sln
@@ -57,9 +57,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "support-anno
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAnimation", "support-dynamic-animation\source\DynamicAnimation.csproj", "{157F6FC3-90D1-40D5-91D0-A2552034B41A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantVideo", "instantvideo\source\InstantVideo.csproj", "{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV-Provider", "support-tv-provider\source\TV-Provider.csproj", "{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wearable", "wearable\source\Wearable.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-Bundled", "support-emoji-bundled\source\Emoji-Bundled.csproj", "{44CC369D-0196-4C80-88D1-C2016998263F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-AppCompat", "support-emoji-appcompat\source\Emoji-AppCompat.csproj", "{6824FF5C-9F50-4DE2-BF34-0314071FF83C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\source\Emoji.csproj", "{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wear", "wear\source\Wear.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -179,10 +185,22 @@ Global
 		{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Metadata.common.xml b/Metadata.common.xml
@@ -0,0 +1,3 @@
+<metadata>
+  <remove-node path="/api/package/class[contains(@name, 'IcsImpl') or contains(@name, 'JellyBeanImpl') or contains(@name, 'JellyBeanMr2Impl') or contains(@name, 'Api16') or contains(@name, 'Api17') or contains(@name, 'Api18') or contains(@name, 'Api19') or contains(@name, 'Api20') or contains(@name, 'Api21') or contains(@name, 'Api22') or contains(@name, 'Api23') or contains(@name, 'Api24') or contains(@name, 'Api25') or contains(@name, 'Api26') or contains(@name, 'Api27') or contains(@name, 'Api28') or contains(@name, 'Api29') or contains(@name, 'Api30') or contains(@name, 'Honeycomb') or contains(@name, 'IceCreamSandwich') or contains(@name, 'Jellybean') or contains(@name, 'KitKat') or contains(@name, 'Lollipop') or contains(@name, 'Marshmallow') or contains(@name, 'Nougat') or contains(@name, 'Oreo') or contains(@name, 'ImplJB') or contains(@name, 'ImplICS') or contains(@name, 'ImplIcs') or contains(@name, 'ImplHC') or contains(@name, 'HcMr1') or contains(@name, 'HcMr2') or contains(@name, 'HcMr3') or contains(@name, 'JbMr2') or contains(@name, 'JbMr2') or contains(@name, 'JbMr1') or contains(@name, 'ICSMr1') or contains(@name, 'ICSMr2') or contains(@name, 'ImplV11') or contains(@name, 'ImplV21')]" />>
+</metadata>