Merge ae08721 into d543b4d

jamesmontemagno · Jul 23, 2020 · 4d69824 · 4d69824
2 parents d543b4d + ae08721
commit 4d69824
Show file tree

Hide file tree

Showing 22 changed files with 9,100 additions and 6,227 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,13 +4,17 @@ root = true
 
 # Don't use tabs for indentation.
 [*]
-indent_style = tab
+indent_style = space
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
 
+# Code files
+[*.sln]
+indent_size = 4
+
 # Xml project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
 indent_size = 2
@@ -23,10 +27,14 @@ indent_size = 2
 [*.json]
 indent_size = 2
 
+# XML files
+[*.xml]
+indent_size = 2
+
 # Dotnet code style settings:
 [*.{cs,vb}]
 # Sort using and Import directives with System.* appearing first
-dotnet_sort_system_directives_first = false
+dotnet_sort_system_directives_first = true
 # Avoid "this." and "Me." if not necessary
 dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_property = false:suggestion
@@ -36,6 +44,7 @@ dotnet_style_qualification_for_event = false:suggestion
 # Use language keywords instead of framework type names for type references
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_require_accessibility_modifiers = omit_if_default:warning
 
 # Suggest more modern language features when available
 dotnet_style_object_initializer = true:suggestion
@@ -55,7 +64,7 @@ dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols = method_a
 dotnet_naming_rule.methods_and_properties_must_be_pascal_case.style = pascal_case_style
 
 # Non-public members must be lower-case
-dotnet_naming_symbols.non_public_symbols.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_symbols.non_public_symbols.applicable_kinds = field
 dotnet_naming_symbols.non_public_symbols.applicable_accessibilities = private
 dotnet_naming_style.all_lower_case_style.capitalization = camel_case
 
@@ -66,19 +75,19 @@ dotnet_naming_rule.non_public_members_must_be_lower_case.style = all_lower_case_
 # CSharp code style settings:
 [*.cs]
 # Do not prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:error
+csharp_style_var_when_type_is_apparent = true:error
+csharp_style_var_elsewhere = true:error
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = true:suggestion
-csharp_style_expression_bodied_constructors = true:none
-csharp_style_expression_bodied_operators = true:none
+csharp_style_expression_bodied_constructors = true:suggestion
+csharp_style_expression_bodied_operators = true:suggestion
 
 # Prefer property-like constructs to have an expression-body
 csharp_style_expression_bodied_properties = true:suggestion
-csharp_style_expression_bodied_indexers = true:none
-csharp_style_expression_bodied_accessors = true:none
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
 
 # Suggest more modern language features when available
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
@@ -94,4 +103,3 @@ csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
-
diff --git a/src/InAppBilling.sln b/src/InAppBilling.sln
@@ -6,11 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3236B15E-C644-4FAA-8568-55E39CCE6D2F}"
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
-		..\appveyor.yml = ..\appveyor.yml
-		..\bootstrapper.ps1 = ..\bootstrapper.ps1
-		..\build.cake = ..\build.cake
 		..\CHANGELOG.md = ..\CHANGELOG.md
-		..\nuget\Plugin.nuspec = ..\nuget\Plugin.nuspec
 		..\README.md = ..\README.md
 		..\nuget\readme.txt = ..\nuget\readme.txt
 	EndProjectSection

diff --git a/src/InAppBillingTests/InAppBillingTests.Android/InAppBillingTests.Android.csproj b/src/InAppBillingTests/InAppBillingTests.Android/InAppBillingTests.Android.csproj
@@ -15,8 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -49,13 +48,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Android.Google.BillingClient">
-      <Version>2.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.2.0.848062" />
+    <PackageReference Include="Xamarin.Forms" Version="4.7.0.1179" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -94,7 +87,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\InAppBillingTests\InAppBillingTests.csproj">
-      <Project>{4B28D0B8-D15A-43AD-B7A6-9C2338D39F86}</Project>
+      <Project>{6D4D9135-F225-4626-A9CE-32BDF97AEA89}</Project>
       <Name>InAppBillingTests</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/src/InAppBillingTests/InAppBillingTests.Android/MainActivity.cs b/src/InAppBillingTests/InAppBillingTests.Android/MainActivity.cs
@@ -18,6 +18,7 @@ protected override void OnCreate(Bundle savedInstanceState)
             ToolbarResource = Resource.Layout.Toolbar;
 
             base.OnCreate(savedInstanceState);
+            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
             LoadApplication(new App());
         }

diff --git a/src/InAppBillingTests/InAppBillingTests.Android/Properties/AndroidManifest.xml b/src/InAppBillingTests/InAppBillingTests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.InAppBillingTests">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:label="InAppBillingTests.Android"></application>
 </manifest>