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 #15504

Merged
merged 23 commits into from
Jun 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d6e938d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 7, 2023
aa0113e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 8, 2023
4ae9f87
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 9, 2023
a70c2a7
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 10, 2023
ab09417
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 11, 2023
92c1035
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 13, 2023
70d0c40
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 14, 2023
172c0bd
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 15, 2023
b6a7009
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 16, 2023
47729a9
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 20, 2023
08350f1
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 21, 2023
e471765
Try bump skiasharp version
rmarinho Jun 21, 2023
455d23d
Update HarfBuzz
rmarinho Jun 22, 2023
6626800
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 22, 2023
368bcbb
Merge branch 'net8.0' into darc-net8.0-5f871d29-752b-4fba-a40a-71c974…
mattleibow Jun 26, 2023
60bc3f9
update skia and harfbuzz
mattleibow Jun 26, 2023
841bfa6
oooh scary compiler!
mattleibow Jun 26, 2023
ca24894
scary
mattleibow Jun 26, 2023
7084f65
clean up!
mattleibow Jun 26, 2023
a48df6f
more cleaning
mattleibow Jun 26, 2023
ad0800b
Wrong one
mattleibow Jun 26, 2023
3567926
[macios] Bump to the version we intend to ship to try to unblock PR
dalexsoto Jun 28, 2023
035d337
Merge branch 'net8.0' into darc-net8.0-5f871d29-752b-4fba-a40a-71c974…
dalexsoto Jun 28, 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
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.6.23276.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.6.23318.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>6150605bd0a63b57ef3d8a8cc7355131ceeceb5a</Sha>
<Sha>8d98e5a6ba7f7fbc157ebea6317d8e7418472920</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23279.6" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23316.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha></Sha>
<Sha>76da696f3ffdd81506b09dfc440ee6f4e1001868</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.0-preview.6.23279.6" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -20,29 +20,29 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha></Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.6.323">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.6.353">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>cefa30b74ab1bf71aabd56cfbe50f36810010ce6</Sha>
<Sha>e08a44dd291f0c9daac12f29d6a4c8ecdeaa04bb</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.8642-net8-p6">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.8646-net8-p6">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9b72a75613a3af231ba8eb58b1e4b78e75276544</Sha>
<Sha>a18037e1779c3591e0818d36a2dca226e4a38283</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.8642-net8-p6">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.8646-net8-p6">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9b72a75613a3af231ba8eb58b1e4b78e75276544</Sha>
<Sha>a18037e1779c3591e0818d36a2dca226e4a38283</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.8642-net8-p6">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.8646-net8-p6">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9b72a75613a3af231ba8eb58b1e4b78e75276544</Sha>
<Sha>a18037e1779c3591e0818d36a2dca226e4a38283</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.8642-net8-p6">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.8646-net8-p6">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>9b72a75613a3af231ba8eb58b1e4b78e75276544</Sha>
<Sha>a18037e1779c3591e0818d36a2dca226e4a38283</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.5.23265.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.6.23312.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>7a90ec9edc7bad6f54ee57a4ab10787c1b989a54</Sha>
<Sha>1640faa87e2e7656bf20dfe38eb8ea3cc3b9e806</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>7.0.81</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.6.23276.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.6.23318.1</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23279.6</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23316.3</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>8.0.0-preview.6.23279.6</SystemTextJsonPackageVersion>
<SystemTextEncodingsWebPackageVersion>8.0.0-preview.6.23279.6</SystemTextEncodingsWebPackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>8.0.0-preview.6.23279.6</MicrosoftBclAsyncInterfacesPackageVersion>
Expand All @@ -14,16 +14,16 @@
<MicrosoftExtensionsServicingPackageVersion>8.0.0-preview.6.23317.4</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-preview.6.23317.4</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.6.323</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.6.353</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>16.4.8642-net8-p6</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.8642-net8-p6</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.8642-net8-p6</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.8642-net8-p6</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.4.8646-net8-p6</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.8646-net8-p6</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.8646-net8-p6</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.8646-net8-p6</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.112</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.6.23277.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.6.23312.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.3.230602002</MicrosoftWindowsAppSDKPackageVersion>
Expand Down Expand Up @@ -65,9 +65,9 @@
- Feed URI in the nuget.config
- Native assets build and sha
-->
<_SkiaSharpVersion>2.88.2</_SkiaSharpVersion>
<_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
<_SkiaSharpVersion>2.88.4-preview.82</_SkiaSharpVersion>
<_HarfBuzzSharpVersion>2.8.2.4-preview.82</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.936270ba9372ac6c94505de44884ef4ba5d96aa2.588</_SkiaSharpNativeAssetsVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
Expand Down
10 changes: 10 additions & 0 deletions src/SingleProject/Resizetizer/src/SkiaSharpTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ namespace Microsoft.Maui.Resizetizer
{
internal abstract class SkiaSharpTools
{
static SkiaSharpTools()
{
// DO NOT DELETE!
// Because we are doing dangerous things - like using a net462 assembly in a netstandard2.0 assembly
// we need to make sure the correct dependencies are loaded. We use net462 because this has special
// native library loading logic for the .NET Framework (Visual Studio).
var span = (Span<SKPoint>)new SKPoint[1];
span[0] = new SKPoint();
}

public static SkiaSharpTools Create(bool isVector, string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, ILogger logger)
=> isVector
? new SkiaSharpSvgTools(filename, baseSize, backgroundColor, tintColor, logger) as SkiaSharpTools
Expand Down