Skip to content

Commit

Permalink
[net8.0] Update dependencies from xamarin/xamarin-android (#15504)
Browse files Browse the repository at this point in the history 
* Update dependencies from https://github.com/xamarin/xamarin-android build main-093eaac8cf651d63144a0cd55077dffe78113162-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.331

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23305.2 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-1cfee369fa2f1545fd20fe949a434386c2a04d1c-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.332

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23305.2 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-e97ad2f94479b8f28aae6ee7c6dbd3c5df6928ec-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.333

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23305.2 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-34818813eb4b934c7bdf27b7026fad82ce7d0508-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.334

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23305.2 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-0698891fd72559912feccd3032987665caa7a5fe-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.335

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23305.2 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-622abe1f028e1beb56713d84c28aaff3640e734d-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.342

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23310.1 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-fd19c4602b78c7030d3bb0af4cc7e4258563edaf-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.343

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23310.1 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-3ab842f7fdc4c77b35a55cb2d7d4b085c38e713c-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.345

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23310.1 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-df64039db55d751c1c945490f0b83886c53a5c29-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.346

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23310.1 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-0e72f32e2f766ff47f23cac6721b6bb0274a8ffc-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.349

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23318.1 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-66a0389e925b1394dbc9449401ecd1100cb6e13c-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.351

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23318.1 (parent: Microsoft.Android.Sdk.Windows

* Try bump skiasharp version

* Update HarfBuzz

* Update dependencies from https://github.com/xamarin/xamarin-android build main-e08a44dd291f0c9daac12f29d6a4c8ecdeaa04bb-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.6.323 -> To Version 34.0.0-preview.6.353

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.100-preview.6.23276.3 -> To Version 8.0.100-preview.6.23318.1 (parent: Microsoft.Android.Sdk.Windows

* update skia and harfbuzz

* oooh scary compiler!

* scary

* clean up!

* more cleaning

* Wrong one

* [macios] Bump to the version we intend to ship to try to unblock PR

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Alex Soto <alex@soto.dev>
Co-authored-by: Alex Soto <alex@alexsoto.me>
  • Loading branch information
@dotnet-maestro @rmarinho
@mattleibow @dalexsoto
6 people authored Jun 28, 2023
1 parent b20c23c commit eaf8059
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 27 deletions.
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
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
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
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

0 comments on commit eaf8059

Please sign in to comment.