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

Commit a2ad14a

Browse files
RedthRedth
committed
Fix samples
1 parent 7ebf652 commit a2ad14a

File tree

12 files changed

+125
-124
lines changed

12 files changed

+125
-124
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>VectorDrawableSample</RootNamespace>
1111
<AssemblyName>VectorDrawableSample</AssemblyName>
12-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
1313
<AndroidApplication>True</AndroidApplication>
1414
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1515
<AndroidResgenClass>Resource</AndroidResgenClass>
@@ -69,18 +69,10 @@
6969
</ItemGroup>
7070
<ItemGroup />
7171
<ItemGroup>
72-
<ProjectReference Include="..\..\..\v7-appcompat\source\V7-AppCompat.csproj">
73-
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
74-
<Name>V7-AppCompat</Name>
75-
</ProjectReference>
76-
<ProjectReference Include="..\..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj">
72+
<ProjectReference Include="..\..\source\Animated-Vector-Drawable.csproj">
7773
<Project>{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}</Project>
7874
<Name>Animated-Vector-Drawable</Name>
7975
</ProjectReference>
80-
<ProjectReference Include="..\..\..\vector-drawable\source\Vector-Drawable.csproj">
81-
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
82-
<Name>Vector-Drawable</Name>
83-
</ProjectReference>
8476
<ProjectReference Include="..\..\..\support-compat\source\Compat.csproj">
8577
<Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
8678
<Name>Compat</Name>
@@ -101,6 +93,14 @@
10193
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
10294
<Name>Media-Compat</Name>
10395
</ProjectReference>
96+
<ProjectReference Include="..\..\..\appcompat-v7\source\V7-AppCompat.csproj">
97+
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
98+
<Name>V7-AppCompat</Name>
99+
</ProjectReference>
100+
<ProjectReference Include="..\..\..\support-vector-drawable\source\Vector-Drawable.csproj">
101+
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
102+
<Name>Vector-Drawable</Name>
103+
</ProjectReference>
104104
</ItemGroup>
105105
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
106106
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@
9595
<Folder Include="Resources\menu\" />
9696
<Folder Include="Resources\layout\" />
9797
</ItemGroup>
98-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
9998
<ItemGroup>
100-
<ProjectReference Include="..\..\source\V7-AppCompat.csproj">
101-
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
102-
<Name>V7-AppCompat</Name>
103-
</ProjectReference>
10499
<ProjectReference Include="..\..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj">
105100
<Project>{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}</Project>
106101
<Name>Animated-Vector-Drawable</Name>
@@ -125,10 +120,15 @@
125120
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
126121
<Name>Media-Compat</Name>
127122
</ProjectReference>
128-
<ProjectReference Include="..\..\..\vector-drawable\source\Vector-Drawable.csproj">
123+
<ProjectReference Include="..\..\source\V7-AppCompat.csproj">
124+
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
125+
<Name>V7-AppCompat</Name>
126+
</ProjectReference>
127+
<ProjectReference Include="..\..\..\support-vector-drawable\source\Vector-Drawable.csproj">
129128
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
130129
<Name>Vector-Drawable</Name>
131130
</ProjectReference>
132131
</ItemGroup>
132+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
133133
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
134134
</Project>

‎appcompat-v7/samples/AndroidSupportSample/App/ActionBarUsage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public override bool OnCreateOptionsMenu (Android.Views.IMenu menu)
4646
var searchView = MenuItemCompat.GetActionView (arg1);
4747
var searchView2 = searchView as Android.Support.V7.Widget.SearchView;
4848
searchView2.QueryTextChange += (sender, e) => {
49-
e.Handled = OnQueryTextChange (e.NewText);
49+
e.Handled = OnQueryTextChange (e.P0);
5050
};
5151

5252
searchView2.QueryTextSubmit += (sender, e) => {
53-
e.Handled = OnQueryTextSubmit (e.Query);
53+
e.Handled = OnQueryTextSubmit (e.P0);
5454
};
5555

5656
return true;

‎leanback-v17/samples/AndroidSupportSample.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample", "And
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample.UITests", "AndroidSupportSample.UITests\AndroidSupportSample.UITests.csproj", "{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\v7-recyclerview\source\V7-RecyclerView.csproj", "{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}"
9-
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Leanback", "..\source\V17-Leanback.csproj", "{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}"
119
EndProject
1210
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@@ -19,16 +17,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "..\..\support-f
1917
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
2119
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\recyclerview-v7\source\V7-RecyclerView.csproj", "{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}"
21+
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2424
Debug|Any CPU = Debug|Any CPU
2525
Release|Any CPU = Release|Any CPU
2626
EndGlobalSection
2727
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28-
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.Build.0 = Release|Any CPU
3228
{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3329
{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
3430
{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,5 +57,9 @@ Global
6157
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
6258
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
6359
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61+
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.Build.0 = Debug|Any CPU
62+
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.Build.0 = Release|Any CPU
6464
EndGlobalSection
6565
EndGlobal

‎leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1919
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
2020
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
21-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
21+
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
2222
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
2323
</PropertyGroup>
2424
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -82,14 +82,6 @@
8282
</ItemGroup>
8383
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
8484
<ItemGroup>
85-
<ProjectReference Include="..\..\source\V17-Leanback.csproj">
86-
<Project>{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}</Project>
87-
<Name>V17-Leanback</Name>
88-
</ProjectReference>
89-
<ProjectReference Include="..\..\..\v7-recyclerview\source\V7-RecyclerView.csproj">
90-
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
91-
<Name>V7-RecyclerView</Name>
92-
</ProjectReference>
9385
<ProjectReference Include="..\..\..\support-core-ui\source\Core-UI.csproj">
9486
<Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
9587
<Name>Core-UI</Name>
@@ -110,6 +102,14 @@
110102
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
111103
<Name>Media-Compat</Name>
112104
</ProjectReference>
105+
<ProjectReference Include="..\..\source\V17-Leanback.csproj">
106+
<Project>{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}</Project>
107+
<Name>V17-Leanback</Name>
108+
</ProjectReference>
109+
<ProjectReference Include="..\..\..\recyclerview-v7\source\V7-RecyclerView.csproj">
110+
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
111+
<Name>V7-RecyclerView</Name>
112+
</ProjectReference>
113113
</ItemGroup>
114114
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
115115
</Project>

‎mediarouter-v7/samples/AndroidSupportSample.sln‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample", "And
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample.UITests", "AndroidSupportSample.UITests\AndroidSupportSample.UITests.csproj", "{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\v7-appcompat\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
9-
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-MediaRouter", "..\source\V7-MediaRouter.csproj", "{9E11B536-73E2-4BC6-9921-92889CF089CB}"
119
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\vector-drawable\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
13-
EndProject
1410
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animated-Vector-Drawable", "..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj", "{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}"
1511
EndProject
1612
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@@ -23,7 +19,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "..\..\support-f
2319
EndProject
2420
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
2521
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-Palette", "..\..\v7-palette\source\V7-Palette.csproj", "{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}"
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\support-vector-drawable\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
23+
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-Palette", "..\..\palette-v7\source\V7-Palette.csproj", "{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}"
25+
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appcompat-v7\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
2727
EndProject
2828
Global
2929
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,18 +39,10 @@ Global
3939
{9E11B536-73E2-4BC6-9921-92889CF089CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4040
{9E11B536-73E2-4BC6-9921-92889CF089CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
4141
{9E11B536-73E2-4BC6-9921-92889CF089CB}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
4642
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4743
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
4844
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
4945
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Release|Any CPU.Build.0 = Release|Any CPU
50-
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51-
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
52-
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
53-
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.Build.0 = Release|Any CPU
5446
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5547
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
5648
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,9 +67,17 @@ Global
7567
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
7668
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
7769
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.Build.0 = Release|Any CPU
7874
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7975
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
8076
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
8177
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
8282
EndGlobalSection
8383
EndGlobal

0 commit comments

Comments
 (0)