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

Commit 42624af

Browse files
bholmesbholmes
authored
Merge pull request #14 from xamarin/v24.2.1
v24.2.1
2 parents 8b8f6c7 + 3666d63 commit 42624af

File tree

407 files changed

+6617
-13449
lines changed

Some content is hidden

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

407 files changed

+6617
-13449
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ output/
1414
*.a
1515
*.xcuserstate
1616
*.xcuserstate
17+
*.csproj.user
1718

1819
Resource.designer.cs
1920
component.yaml

‎AndroidSupport.TypeForwarders.sln

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V4", "v4\source\V4.csproj", "{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-UI", "support-core-ui\source\Core-UI.csproj", "{071EAE48-7BCE-4D68-8098-745B923A122F}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "support-fragment\source\Fragment.csproj", "{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
15+
EndProject
16+
Global
17+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18+
Debug|Any CPU = Debug|Any CPU
19+
Release|Any CPU = Release|Any CPU
20+
EndGlobalSection
21+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22+
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
46+
EndGlobalSection
47+
EndGlobal

‎AndroidSupport.sln

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2012
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V4", "v4\source\V4.csproj", "{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}"
5-
EndProject
64
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V13", "v13\source\V13.csproj", "{69351B41-DA07-42F6-9083-0080EBC6407D}"
75
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-CardView", "v7-cardview\source\V7-CardView.csproj", "{E9848EF1-14E6-4144-95A0-926A52F301B5}"
@@ -41,6 +39,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "vector-d
4139
EndProject
4240
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable-BuildTasks", "vector-drawable\buildtask\Vector-Drawable-BuildTasks.csproj", "{DB19F806-FEF2-4BBB-8A0B-37EA54DB3A0D}"
4341
EndProject
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
43+
EndProject
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-UI", "support-core-ui\source\Core-UI.csproj", "{071EAE48-7BCE-4D68-8098-745B923A122F}"
45+
EndProject
46+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
47+
EndProject
48+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "support-fragment\source\Fragment.csproj", "{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}"
49+
EndProject
50+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
51+
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Transition", "transition\source\Transition.csproj", "{BF8F6617-A16E-43B8-9985-3D1066D1A081}"
53+
EndProject
4454
Global
4555
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4656
Debug|Any CPU = Debug|Any CPU
@@ -99,10 +109,6 @@ Global
99109
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
100110
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
101111
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
102-
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103-
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
104-
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
105-
{BCE98C50-BDB6-49C4-AFB4-78EB1357A3F2}.Release|Any CPU.Build.0 = Release|Any CPU
106112
{D33F5F79-994B-4C34-BCC3-2B30CB630F1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107113
{D33F5F79-994B-4C34-BCC3-2B30CB630F1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
108114
{D33F5F79-994B-4C34-BCC3-2B30CB630F1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -127,5 +133,29 @@ Global
127133
{E9848EF1-14E6-4144-95A0-926A52F301B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
128134
{E9848EF1-14E6-4144-95A0-926A52F301B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
129135
{E9848EF1-14E6-4144-95A0-926A52F301B5}.Release|Any CPU.Build.0 = Release|Any CPU
136+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
138+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
139+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
140+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.Build.0 = Debug|Any CPU
142+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Release|Any CPU.ActiveCfg = Release|Any CPU
143+
{071EAE48-7BCE-4D68-8098-745B923A122F}.Release|Any CPU.Build.0 = Release|Any CPU
144+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{CA4194B2-8B2D-4C37-8790-C79C5803357A}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
150+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
151+
{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}.Release|Any CPU.Build.0 = Release|Any CPU
152+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
154+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
155+
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
156+
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157+
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Debug|Any CPU.Build.0 = Debug|Any CPU
158+
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Release|Any CPU.ActiveCfg = Release|Any CPU
159+
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Release|Any CPU.Build.0 = Release|Any CPU
130160
EndGlobalSection
131161
EndGlobal

‎SupportConsts.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
static class __SupportConsts {
2-
public const string Url = "https://dl-ssl.google.com/android/repository/android_m2repository_r32.zip";
3-
public const string Version = "23.4.0.0";
4-
public const string AarVersion = "23.4.0";
5-
}
2+
public const string Url = "https://dl-ssl.google.com/android/repository/android_m2repository_r38.zip";
3+
4+
// We get the Sha1 hash from google's xml feed: https://dl.google.com/android/repository/addon.xml
5+
// Search for the <sdk:checksum type="sha1">..</..> tag for the archive name android_m2repository_rXX.zip
6+
public const string Sha1sum = "2ad48ed61d6fc8d7d9351ce62873be60dac5187b";
7+
public const string Version = "24.2.1";
8+
public const string AarVersion = "24.2.1";
9+
public const string PackageName = "Xamarin.Android.Support";
10+
}

0 commit comments

Comments
 (0)