Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit d34a7f3

Browse files
RedthRedth
authored
Merge pull request #72 from xamarin/v26.x
26.0.2
2 parents bb628b9 + 2d158a6 commit d34a7f3

File tree

113 files changed

+694
-700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+694
-700
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ packages/
55
externals/
66
output/
77
docs/
8+
.vs/
89

910
*.xam
1011
*.DS_Store
@@ -26,3 +27,4 @@ Resource.designer.cs
2627
component.yaml
2728
Details.md
2829
/generated.targets
30+
*.commit

‎AndroidSupport.sln

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "support-anno
5757
EndProject
5858
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAnimation", "support-dynamic-animation\source\DynamicAnimation.csproj", "{157F6FC3-90D1-40D5-91D0-A2552034B41A}"
5959
EndProject
60-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantVideo", "instantvideo\source\InstantVideo.csproj", "{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}"
60+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV-Provider", "support-tv-provider\source\TV-Provider.csproj", "{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}"
6161
EndProject
62-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wearable", "wearable\source\Wearable.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-Bundled", "support-emoji-bundled\source\Emoji-Bundled.csproj", "{44CC369D-0196-4C80-88D1-C2016998263F}"
63+
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-AppCompat", "support-emoji-appcompat\source\Emoji-AppCompat.csproj", "{6824FF5C-9F50-4DE2-BF34-0314071FF83C}"
65+
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\source\Emoji.csproj", "{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wear", "wear\source\Wear.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
6369
EndProject
6470
Global
6571
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -179,10 +185,22 @@ Global
179185
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.Build.0 = Debug|Any CPU
180186
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.ActiveCfg = Release|Any CPU
181187
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.Build.0 = Release|Any CPU
182-
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183-
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.Build.0 = Debug|Any CPU
184-
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.ActiveCfg = Release|Any CPU
185-
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.Build.0 = Release|Any CPU
188+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
189+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
190+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
191+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.Build.0 = Release|Any CPU
192+
{44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
193+
{44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.Build.0 = Debug|Any CPU
194+
{44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.ActiveCfg = Release|Any CPU
195+
{44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.Build.0 = Release|Any CPU
196+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
197+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
198+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
199+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.Build.0 = Release|Any CPU
200+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
201+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
202+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
203+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.Build.0 = Release|Any CPU
186204
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187205
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
188206
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎Metadata.common.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<metadata>
2+
<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')]" />>
3+
</metadata>

0 commit comments

Comments
 (0)