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

Commit 73727d4

Browse files
RedthRedth
authored
Merge pull request #74 from xamarin/26.1.x
26.1.0
2 parents d34a7f3 + b1ed26d commit 73727d4

File tree

108 files changed

+1612
-132
lines changed

Some content is hidden

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

108 files changed

+1612
-132
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ Resource.designer.cs
2727
component.yaml
2828
Details.md
2929
/generated.targets
30-
*.commit
30+
*.commit
31+
cake.sh

‎AndroidSupport.sln

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "support-
3939
EndProject
4040
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable-BuildTasks", "support-vector-drawable\buildtask\Vector-Drawable-BuildTasks.csproj", "{DB19F806-FEF2-4BBB-8A0B-37EA54DB3A0D}"
4141
EndProject
42-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
43-
EndProject
4442
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-UI", "support-core-ui\source\Core-UI.csproj", "{071EAE48-7BCE-4D68-8098-745B923A122F}"
4543
EndProject
4644
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@@ -67,6 +65,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\sour
6765
EndProject
6866
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wear", "wear\source\Wear.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
6967
EndProject
68+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Architecture", "Architecture", "{3AC04D8E-9E4C-401F-AED5-239F226BF9C2}"
69+
EndProject
70+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
71+
EndProject
72+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
73+
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
75+
EndProject
76+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
77+
EndProject
7078
Global
7179
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7280
Debug|Any CPU = Debug|Any CPU
@@ -149,10 +157,6 @@ Global
149157
{E9848EF1-14E6-4144-95A0-926A52F301B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
150158
{E9848EF1-14E6-4144-95A0-926A52F301B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
151159
{E9848EF1-14E6-4144-95A0-926A52F301B5}.Release|Any CPU.Build.0 = Release|Any CPU
152-
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153-
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
154-
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
155-
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
156160
{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157161
{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.Build.0 = Debug|Any CPU
158162
{071EAE48-7BCE-4D68-8098-745B923A122F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -205,5 +209,26 @@ Global
205209
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
206210
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU
207211
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.Build.0 = Release|Any CPU
212+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
214+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
215+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
216+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
217+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
218+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
219+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
220+
{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
221+
{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
222+
{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
223+
{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
224+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
226+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
227+
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
228+
EndGlobalSection
229+
GlobalSection(NestedProjects) = preSolution
230+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
231+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
232+
{25CE44A9-FA51-4468-952F-21A13F066384} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
208233
EndGlobalSection
209234
EndGlobal

‎External-Dependency-Info.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ notice and the license under which Microsoft received such third party
77
material are set forth below. Microsoft reserves all other rights not
88
expressly granted, whether by implication, estoppel or otherwise.
99

10-
########################################
11-
# Google Android Support libraries
10+
#########################################################
11+
# Google Android Support libraries and Constraint Layout
1212
# https://maven.google.com/
13-
########################################
13+
#########################################################
1414

1515
Apache License
1616
Version 2.0, January 2004

‎animated-vector-drawable/component/component.template.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ samples:
2020
- Animated-Vector-Drawable
2121
- Annotations
2222
- Compat
23+
- Arch.Core.Common
24+
- Arch.Lifecycle.Common
25+
- Arch.Lifecycle.Runtime
2326
- Core-UI
2427
- Core-Utils
2528
- Fragment
@@ -32,6 +35,9 @@ samples:
3235
- Xamarin.Android.Support.Animated.Vector.Drawable
3336
- Xamarin.Android.Support.Annotations
3437
- Xamarin.Android.Support.Compat
38+
- Xamarin.Android.Arch.Core.Common
39+
- Xamarin.Android.Arch.Lifecycle.Common
40+
- Xamarin.Android.Arch.Lifecycle.Runtime
3541
- Xamarin.Android.Support.Core.UI
3642
- Xamarin.Android.Support.Core.Utils
3743
- Xamarin.Android.Support.Fragment

‎animated-vector-drawable/samples/VectorDrawableSample.sln

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appco
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
2323
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
25+
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
29+
EndProject
2430
Global
2531
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2632
Debug|Any CPU = Debug|Any CPU
@@ -67,5 +73,17 @@ Global
6773
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
6874
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
6975
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
76+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
77+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
78+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
79+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
80+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
82+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
83+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
84+
{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85+
{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
86+
{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
87+
{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
7088
EndGlobalSection
7189
EndGlobal

‎animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,18 @@
105105
<Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
106106
<Name>Annotations</Name>
107107
</ProjectReference>
108+
<ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
109+
<Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
110+
<Name>Arch.Core.Common</Name>
111+
</ProjectReference>
112+
<ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
113+
<Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
114+
<Name>Arch.Lifecycle.Common</Name>
115+
</ProjectReference>
116+
<ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
117+
<Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
118+
<Name>Arch.Lifecycle.Runtime</Name>
119+
</ProjectReference>
108120
</ItemGroup>
109121
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
110122
</Project>

‎animated-vector-drawable/source/Animated-Vector-Drawable.csproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,22 @@
7575
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
7676
<Name>Vector-Drawable</Name>
7777
</ProjectReference>
78+
<ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
79+
<Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
80+
<Name>Arch.Core.Common</Name>
81+
</ProjectReference>
82+
<ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
83+
<Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
84+
<Name>Arch.Lifecycle.Common</Name>
85+
</ProjectReference>
86+
<ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
87+
<Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
88+
<Name>Arch.Lifecycle.Runtime</Name>
89+
</ProjectReference>
90+
<ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
91+
<Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
92+
<Name>Annotations</Name>
93+
</ProjectReference>
7894
</ItemGroup>
7995
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
8096
<ItemGroup>

‎appcompat-v7/component/component.template.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ samples:
1919
removeProjects:
2020
- Annotations
2121
- Compat
22+
- Arch.Core.Common
23+
- Arch.Lifecycle.Common
24+
- Arch.Lifecycle.Runtime
2225
- Core-UI
2326
- Core-Utils
2427
- Fragment
@@ -31,6 +34,9 @@ samples:
3134
packages:
3235
- Xamarin.Android.Support.Annotations
3336
- Xamarin.Android.Support.Compat
37+
- Xamarin.Android.Arch.Core.Common
38+
- Xamarin.Android.Arch.Lifecycle.Common
39+
- Xamarin.Android.Arch.Lifecycle.Runtime
3440
- Xamarin.Android.Support.Core.UI
3541
- Xamarin.Android.Support.Core.Utils
3642
- Xamarin.Android.Support.Fragment

‎appcompat-v7/samples/AndroidSupportSample.sln

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\su
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
2525
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
29+
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
31+
EndProject
2632
Global
2733
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2834
Debug|Any CPU = Debug|Any CPU
@@ -73,5 +79,17 @@ Global
7379
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
7480
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
7581
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
90+
{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91+
{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
92+
{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
7694
EndGlobalSection
7795
EndGlobal

‎appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,18 @@
132132
<Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
133133
<Name>Annotations</Name>
134134
</ProjectReference>
135+
<ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
136+
<Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
137+
<Name>Arch.Core.Common</Name>
138+
</ProjectReference>
139+
<ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
140+
<Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
141+
<Name>Arch.Lifecycle.Common</Name>
142+
</ProjectReference>
143+
<ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
144+
<Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
145+
<Name>Arch.Lifecycle.Runtime</Name>
146+
</ProjectReference>
135147
</ItemGroup>
136148
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
137149
</Project>

0 commit comments

Comments
 (0)