зеркало из https://github.com/DeGsoft/maui-linux.git
[main] Update dependencies from xamarin/xamarin-android (#4033)
Changes:9c82662...a533652
Updates: Microsoft.Android.Sdk.Windows: from 31.0.200-preview.13.8 to 31.0.200-preview.13.11 The Android workload now ships with "manifestmerger" 30.x:a533652fa6
This causes Essentials samples to fail to build with: android:exported needs to be explicitly specified for <activity>. Apps targeting Android 12 and higher are required to specify an explicit value for `android:exported` when the corresponding component has an intent filter defined. See https://developer.android.com/guide/topics/manifest/activity-element#exported for details. The fix here is various activities should define `Exported=true`. The Android workload does this by default for the main activity, but not every activity. This appears to solve the build error. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
This commit is contained in:
Родитель
a2b2867cba
Коммит
b97b0bd3af
|
@ -8,9 +8,9 @@
|
|||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>b96f5608dab85cdf87fb8c0b88c233808538d2d0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.200-preview.13.8">
|
||||
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.200-preview.13.11">
|
||||
<Uri>https://github.com/xamarin/xamarin-android</Uri>
|
||||
<Sha>9c8266294062cce80c2f2f05521d02862ecf0ad2</Sha>
|
||||
<Sha>a533652fa68754c79d80a1e6b62dd62add307c8d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.2.100-preview.13.8">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<!-- dotnet/runtime -->
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.2-mauipre.1.22054.8</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<!-- xamarin/xamarin-android -->
|
||||
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.13.8</MicrosoftAndroidSdkWindowsPackageVersion>
|
||||
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.13.11</MicrosoftAndroidSdkWindowsPackageVersion>
|
||||
<!-- xamarin/xamarin-macios -->
|
||||
<MicrosoftiOSSdkPackageVersion>15.2.100-preview.13.8</MicrosoftiOSSdkPackageVersion>
|
||||
<MicrosoftMacCatalystSdkPackageVersion>15.2.100-preview.13.8</MicrosoftMacCatalystSdkPackageVersion>
|
||||
|
|
|
@ -54,7 +54,7 @@ namespace Samples.Droid
|
|||
}
|
||||
}
|
||||
|
||||
[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop)]
|
||||
[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop, Exported = true)]
|
||||
[IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable }, DataScheme = "xamarinessentials")]
|
||||
public class WebAuthenticationCallbackActivity : Microsoft.Maui.Essentials.WebAuthenticatorCallbackActivity
|
||||
{
|
||||
|
|
|
@ -333,7 +333,7 @@ namespace Microsoft.Maui.Essentials
|
|||
Platform.OnActivityStateChanged(activity, ActivityState.Stopped);
|
||||
}
|
||||
|
||||
[Activity(ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
|
||||
[Activity(ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, Exported = true)]
|
||||
class IntermediateActivity : Activity
|
||||
{
|
||||
const string launchedExtra = "launched";
|
||||
|
|
|
@ -5,7 +5,7 @@ using Android.OS;
|
|||
|
||||
namespace Microsoft.Maui.Essentials
|
||||
{
|
||||
[Activity(ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
|
||||
[Activity(ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, Exported = true)]
|
||||
class WebAuthenticatorIntermediateActivity : Activity
|
||||
{
|
||||
const string launchedExtra = "launched";
|
||||
|
|
Загрузка…
Ссылка в новой задаче