Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[net8.0] Update dependencies from xamarin/xamarin-android #12893

Merged
merged 4 commits into from
Jan 26, 2023
Merged

[net8.0] Update dependencies from xamarin/xamarin-android #12893

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4be7d24
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jan 24, 2023
f949657
[android] set `$(AndroidGenerateResourceDesigner)`
jonathanpeppers Jan 24, 2023
069759f
Use $(MauiGenerateResourceDesigner) name instead
jonathanpeppers Jan 24, 2023
36170d6
Missed a project
jonathanpeppers Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
</PropertyGroup>

<!--
Disable generation of obj/Debug/net8.0-android/__Microsoft.Android.Resource.Designer.cs
Enable this individually in projects that declare/use AndroidResource IDs.
-->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True' AND '$(AndroidApplication)' != 'true' AND '$(MauiGenerateResourceDesigner)' != 'true'">
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
</PropertyGroup>

<!-- semi HACK: by default, WinUI includes all @(None) with .bmp/.png as @(Content) and adds that to the .pri -->
<ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.1.127">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.1.129">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>c1efcb5678c8d93c4d5bdd0452a79a8ffab2f6b7</Sha>
<Sha>953cd1939d309e0affe610728a79ede865a3bb75</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.2.126-net8-p1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.1.127</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.1.129</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>16.2.126-net8-p1</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.1.126-net8-p1</MicrosoftmacOSSdkPackageVersion>
Expand Down
2 changes: 0 additions & 2 deletions src/BlazorWebView/src/Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.StartPath.get -> stri
Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.StartPath.set -> void
Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView.StartPath.get -> string!
Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView.StartPath.set -> void
Microsoft.AspNetCore.Components.WebView.Maui.Resource
Microsoft.AspNetCore.Components.WebView.Maui.Resource.Resource() -> void
static readonly Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.StartPathProperty -> Microsoft.Maui.Controls.BindableProperty!
1 change: 1 addition & 0 deletions src/Compatibility/Core/src/Compatibility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<TizenRoot>Tizen\</TizenRoot>
<IsPackable>false</IsPackable>
<IsTrimmable Condition=" !$(TargetFramework.StartsWith('netstandard')) ">true</IsTrimmable>
<MauiGenerateResourceDesigner>true</MauiGenerateResourceDesigner>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Controls/Maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
#nullable enable
Microsoft.Maui.Controls.Maps.Resource
Microsoft.Maui.Controls.Maps.Resource.Resource() -> void
2 changes: 0 additions & 2 deletions src/Controls/src/Xaml/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
#nullable enable
Microsoft.Maui.Controls.Xaml.Resource
Microsoft.Maui.Controls.Xaml.Resource.Resource() -> void
2 changes: 0 additions & 2 deletions src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
#nullable enable
Microsoft.Maui.Maps.Resource
Microsoft.Maui.Maps.Resource.Resource() -> void
1 change: 1 addition & 0 deletions src/Core/src/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTrimmable>false</IsTrimmable>
<MauiGenerateResourceDesigner>true</MauiGenerateResourceDesigner>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591;RS0041;RS0026;RS0027</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<SingleProject>true</SingleProject>
<RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.DeviceTests.Shared</AssemblyName>
<!-- Avoids conflict in Controls.DeviceTests.csproj -->
<AndroidResgenNamespace>Microsoft.Maui.DeviceTests.Shared</AndroidResgenNamespace>
<!--<Nullable>enable</Nullable>-->
<NoWarn>$(NoWarn),CA1416</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#nullable enable
*REMOVED*Microsoft.Maui.Storage.ISecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string!>!
*REMOVED*static Microsoft.Maui.Storage.SecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string!>!
Microsoft.Maui.Essentials.Resource
Microsoft.Maui.Essentials.Resource.Resource() -> void
Microsoft.Maui.Storage.ISecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string?>!
static Microsoft.Maui.Storage.SecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string?>!
2 changes: 0 additions & 2 deletions src/Graphics/src/Graphics.Skia/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
Microsoft.Maui.Graphics.Skia.FontExtensions
Microsoft.Maui.Graphics.Skia.PlatformBitmapExportService
Microsoft.Maui.Graphics.Skia.PlatformBitmapExportService.PlatformBitmapExportService() -> void
Microsoft.Maui.Graphics.Skia.Resource
Microsoft.Maui.Graphics.Skia.Resource.Resource() -> void
Microsoft.Maui.Graphics.Skia.SKColorExtensions
Microsoft.Maui.Graphics.Skia.SKGraphicsExtensions
Microsoft.Maui.Graphics.Skia.SkiaBitmapExportContext
Expand Down
2 changes: 0 additions & 2 deletions src/Graphics/src/Graphics/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,6 @@ Microsoft.Maui.Graphics.ResizeMode
Microsoft.Maui.Graphics.ResizeMode.Bleed = 1 -> Microsoft.Maui.Graphics.ResizeMode
Microsoft.Maui.Graphics.ResizeMode.Fit = 0 -> Microsoft.Maui.Graphics.ResizeMode
Microsoft.Maui.Graphics.ResizeMode.Stretch = 2 -> Microsoft.Maui.Graphics.ResizeMode
Microsoft.Maui.Graphics.Resource
Microsoft.Maui.Graphics.Resource.Resource() -> void
Microsoft.Maui.Graphics.ScalingCanvas
Microsoft.Maui.Graphics.ScalingCanvas.Alpha.set -> void
Microsoft.Maui.Graphics.ScalingCanvas.Antialias.set -> void
Expand Down