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.

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

Bumps for 7.0.0-rc2 #10290

Merged
merged 79 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
389f227
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 23, 2022
80f0f4e
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 23, 2022
0a57953
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 23, 2022
29b9fbd
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 23, 2022
eb7b35e
Merge branch 'darc-release/7.0.1xx-rc2-bd230eb9-e89b-4dfb-b629-e70cd8…
rmarinho Sep 23, 2022
5661c73
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 23, 2022
f17597f
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 23, 2022
993afa6
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 23, 2022
21b6df4
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 24, 2022
6694695
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 24, 2022
14a29fa
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 24, 2022
61940fe
Bump tizen
rmarinho Sep 24, 2022
ab74f64
Fixes for iOS API's
rmarinho Sep 25, 2022
5fb5733
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 26, 2022
4673c9d
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 26, 2022
e708fa7
Workaround CA1416 repo-wide
jonathanpeppers Sep 13, 2022
47d0d99
Fix for Resizetizer/Catalyst interaction
jonathanpeppers Sep 15, 2022
d30574f
Fix other nullable Uri
rmarinho Sep 26, 2022
82301b0
other fix for null Url
rmarinho Sep 26, 2022
d6bc269
Fix targets for iOS
rmarinho Sep 26, 2022
bc55968
Move targets to correct place
rmarinho Sep 26, 2022
f90f066
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 26, 2022
228008a
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 26, 2022
ba106c6
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 27, 2022
68fa573
Merge branch 'darc-release/7.0.1xx-rc2-bd230eb9-e89b-4dfb-b629-e70cd8…
rmarinho Sep 27, 2022
30b4653
Bump required XCODE
rmarinho Sep 27, 2022
ec1e2f7
Update Microsoft.Maui.Resizetizer.targets
mattleibow Sep 27, 2022
b13c794
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 27, 2022
56221e0
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 27, 2022
a87d468
Merge branch 'net7.0' into maestro-rc2
rmarinho Sep 27, 2022
48ad4ba
Disable the resizetizer for inner builds of universal iOS/Mac Catalys…
mattleibow Sep 27, 2022
ebaf2d2
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 27, 2022
a685b9e
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 27, 2022
c97e1b5
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 27, 2022
50e8c15
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 27, 2022
5c76c36
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 27, 2022
b86fc39
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 27, 2022
d24df25
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 27, 2022
4ac6674
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 28, 2022
b43cd5d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 28, 2022
c82457d
Merge branch 'release/7.0.1xx-rc2' into maestro-rc2
mattleibow Sep 28, 2022
98e98c0
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 28, 2022
2a0a42e
Not yet iOS 16, but will always use the new API
mattleibow Sep 28, 2022
edfbd33
Merge branch 'release/7.0.1xx-rc2' into maestro-rc2
mattleibow Sep 28, 2022
d8d8cfb
Merge branch 'darc-release/7.0.1xx-rc2-bd230eb9-e89b-4dfb-b629-e70cd8…
rmarinho Sep 28, 2022
43fa106
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 28, 2022
88f7373
Revert "Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb7…
rmarinho Sep 28, 2022
9c13e2e
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 28, 2022
dda2d85
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 28, 2022
b2990a6
Revert "Revert "Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-…
rmarinho Sep 28, 2022
aabf428
Add missing feeds for 6.0.10
rmarinho Sep 28, 2022
306ecab
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 28, 2022
01f9de1
Add DisableTransitiveFrameworkReferenceDownloads for wpf/winforms pac…
rmarinho Sep 28, 2022
28f6bb9
[Android] remove uses-sdk
rmarinho Sep 28, 2022
d08d029
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 28, 2022
957ca8c
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 28, 2022
58c2912
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 28, 2022
d5096e9
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 28, 2022
03190b6
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Sep 28, 2022
d860f27
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 29, 2022
6bf34cf
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Sep 29, 2022
616108f
Fix csproj
rmarinho Sep 29, 2022
6d24ca6
Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce…
rmarinho Sep 29, 2022
310f08d
Merge branch 'darc-release/7.0.1xx-rc2-bd230eb9-e89b-4dfb-b629-e70cd8…
rmarinho Sep 29, 2022
3d1cabc
Try again
rmarinho Sep 29, 2022
9d62830
Remove uses-sdk
rmarinho Sep 29, 2022
920eeaa
DisableTransitiveFrameworkReferenceDownloads
rmarinho Sep 29, 2022
e7e9ea5
Don't try to BuildInParallel the sample app
rmarinho Sep 29, 2022
0b2b7a2
Remove PublishTrimmed on Benchmark project
rmarinho Sep 29, 2022
ab0f9b6
Revert "Remove PublishTrimmed on Benchmark project"
jonathanpeppers Sep 29, 2022
7961b8f
Disable AOT for Benchmarks.Droid.csproj
jonathanpeppers Sep 29, 2022
e0ba479
Set sandbox sample to a single catalyst RID
jonathanpeppers Sep 29, 2022
b17eab1
Revert "Don't try to BuildInParallel the sample app"
jonathanpeppers Sep 29, 2022
765d0b4
Update MauiRazorClassLibrarySample.csproj
jonathanpeppers Sep 29, 2022
b4f2f71
Revert "Update MauiRazorClassLibrarySample.csproj"
jonathanpeppers Sep 29, 2022
3b4ecbb
Allow set MaxCpuCount
rmarinho Sep 29, 2022
be01743
Merge branch 'maestro-rc2' of https://github.com/dotnet/maui into mae…
rmarinho Sep 29, 2022
864423b
Revert "Set sandbox sample to a single catalyst RID"
jonathanpeppers Sep 30, 2022
bbf822c
Samples also need `-maxCpuCount: 1`
jonathanpeppers Sep 30, 2022
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
26 changes: 14 additions & 12 deletions .nuspec/Microsoft.Maui.Resizetizer.targets
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,24 @@
<PropertyGroup Condition="'$(_ResizetizerIsiOSApp)' == 'True'">
<ResizetizerPlatformType>ios</ResizetizerPlatformType>

<ResizetizeCollectItemsBeforeTargets>
$(ResizetizeCollectItemsBeforeTargets);
_CollectBundleResources;
_BeforeCoreCompileImageAssets;
</ResizetizeCollectItemsBeforeTargets>
<!-- We don't want to resizetize anything for an inner build when building a universal app, it's enough to only do it in the outer build -->
<DisableResizetizer Condition="'$(_IsMultiRidBuild)' == 'true'">true</DisableResizetizer>

<CollectBundleResourcesDependsOn>
$(CollectBundleResourcesDependsOn);
ResizetizeCollectItems;
</CollectBundleResourcesDependsOn>

<CompileImageAssetsDependsOn>
$(CompileImageAssetsDependsOn);
ResizetizeCollectItems;
</CompileImageAssetsDependsOn>

<ResizetizeAfterTargets>
$(ResizetizeAfterTargets);
ResizetizeCollectItems;
</ResizetizeAfterTargets>

<ProcessMauiFontsBeforeTargets>
$(ProcessMauiFontsBeforeTargets);
_BeforeCoreCompileImageAssets;
</ProcessMauiFontsBeforeTargets>

<CollectAppManifestsDependsOn>
ProcessMauiFonts;
ProcessMauiSplashScreens;
Expand Down Expand Up @@ -239,7 +241,7 @@

<!-- Collect images from referenced projects -->
<Target Name="ResizetizeCollectItems"
Condition="'$(_ResizetizerIsCompatibleApp)' == 'True'"
Condition="'$(_ResizetizerIsCompatibleApp)' == 'True' And '$(DisableResizetizer)' != 'true'"
BeforeTargets="$(ResizetizeCollectItemsBeforeTargets)"
AfterTargets="$(ResizetizeCollectItemsAfterTargets)">

Expand Down Expand Up @@ -408,7 +410,7 @@
<_MauiSplashScreens Include="$(_MauiIntermediateSplashScreen)splash\*" />
<TizenTpkUserIncludeFiles Include="@(_MauiSplashScreens)" TizenTpkSubDir="shared\res\splash" />
</ItemGroup>

<MakeDir Directories="$(IntermediateOutputPath)"/>
<!-- Stamp file for Outputs -->
<Touch Files="$(_MauiSplashStampFile)" AlwaysCreate="True" />
<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,10 @@
<ItemGroup Condition="'$(MSBuildVersion)' != '' AND '$(MSBuildVersion)' &lt; '16.7.0' ">
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.3.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<!-- We don't need to be warned that we are using a preview .NET -->
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
</PropertyGroup>
</Project>
6 changes: 6 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,20 @@
<PropertyGroup Condition="'$(_MauiTargetPlatformIsiOS)' == 'True'">
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIstvOS)' == 'True'">
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIsMacCatalyst)' == 'True'">
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>13.1</TargetPlatformMinVersion>
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIsmacOS)' == 'True'">
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
Expand Down
5 changes: 4 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-3f6c45a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-cdf48ab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cdf48abd/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- <add key="local" value="artifacts" /> -->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
Expand Down
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22425.9" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22477.20" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>cd7df40ff129744cc664ea5c83c113ccf2763829</Sha>
<Sha>915e3f711083de58b3142d6be77d48cc64da6c38</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22426.10" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.2.22472.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>06aceb7015f3bd2ff019ef5920d2354eb2ea2c92</Sha>
<Sha>550605cc93d9b903c4fbaf8f1f83e387d2f79dbe</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.1.151">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.2.202">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>b9389dc0168e184758c226962a0b270d300c17eb</Sha>
<Sha>bf10ce5525d97f2303993d631003df54f2837617</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1029-rc.1">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1180-rc.2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>e7aa824644021c2ff80d5948f089f399bf7568aa</Sha>
<Sha>90f75bc307e5cba22bf1472f51cf6f4bdb624a1b</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="15.4.1029-rc.1">
<Dependency Name="Microsoft.iOS.Sdk" Version="15.4.1180-rc.2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>e7aa824644021c2ff80d5948f089f399bf7568aa</Sha>
<Sha>90f75bc307e5cba22bf1472f51cf6f4bdb624a1b</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.1029-rc.1">
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.1180-rc.2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>e7aa824644021c2ff80d5948f089f399bf7568aa</Sha>
<Sha>90f75bc307e5cba22bf1472f51cf6f4bdb624a1b</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1029-rc.1">
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1180-rc.2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>e7aa824644021c2ff80d5948f089f399bf7568aa</Sha>
<Sha>90f75bc307e5cba22bf1472f51cf6f4bdb624a1b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22424.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.2.22465.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5ef661392ae7b1595b683df83d63e3a0365fc126</Sha>
<Sha>6625add9a3eadc2954af0311be35290cfefcddb0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22424.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.2.22465.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5ef661392ae7b1595b683df83d63e3a0365fc126</Sha>
<Sha>6625add9a3eadc2954af0311be35290cfefcddb0</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.533</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22425.9</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22477.20</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22426.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.2.22472.3</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>7.0.0-rc.2.22430.11</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>7.0.0-rc.2.22430.11</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.1.151</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.2.202</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.4.1029-rc.1</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.1029-rc.1</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.1029-rc.1</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.4.1029-rc.1</MicrosofttvOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.4.1180-rc.2</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.1180-rc.2</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.1180-rc.2</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.4.1180-rc.2</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100-rc.1.22</SamsungTizenSdkPackageVersion>
<SamsungTizenSdkPackageVersion>7.0.100-rc.2.24</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.1.22424.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.2.22465.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.1.4</MicrosoftWindowsAppSDKPackageVersion>
Expand Down
13 changes: 8 additions & 5 deletions eng/cake/dotnet.cake
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ Task("dotnet-build")
{
RunMSBuildWithDotNet("./Microsoft.Maui.BuildTasks.slnf");
if (IsRunningOnWindows())
RunMSBuildWithDotNet("./Microsoft.Maui.sln");
RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount: 1);
else
RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf");
RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount: 1);
});

Task("dotnet-samples")
Expand All @@ -101,7 +101,7 @@ Task("dotnet-samples")
["UseWorkload"] = "true",
// ["GenerateAppxPackageOnBuild"] = "true",
["RestoreConfigFile"] = tempDir.CombineWithFilePath("NuGet.config").FullPath,
});
}, maxCpuCount: 1);
});

Task("dotnet-templates")
Expand Down Expand Up @@ -133,6 +133,8 @@ Task("dotnet-templates")

// Avoid iOS build warning as error on Windows: There is no available connection to the Mac. Task 'VerifyXcodeVersion' will not be executed
{ "CustomBeforeMicrosoftCSharpTargets", MakeAbsolute(File("./src/Templates/TemplateTestExtraTargets.targets")).FullPath },
//Try not restore dependecies of 6.0.10
{ "DisableTransitiveFrameworkReferenceDownloads", "true" },
};

var templates = new Dictionary<string, Action<DirectoryPath>> {
Expand Down Expand Up @@ -596,7 +598,8 @@ void RunMSBuildWithDotNet(
bool warningsAsError = false,
bool restore = true,
string targetFramework = null,
bool forceDotNetBuild = false)
bool forceDotNetBuild = false,
int maxCpuCount = 0)
{
var useDotNetBuild = forceDotNetBuild || !IsRunningOnWindows() || target == "Run";

Expand All @@ -611,7 +614,7 @@ void RunMSBuildWithDotNet(

var msbuildSettings = new DotNetCoreMSBuildSettings()
.SetConfiguration(configuration)
.SetMaxCpuCount(0)
.SetMaxCpuCount(maxCpuCount)
.WithTarget(target)
.EnableBinaryLogger(binlog);

Expand Down
10 changes: 7 additions & 3 deletions src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public SchemeHandler(BlazorWebViewHandler webViewHandler)
[SupportedOSPlatform("ios11.0")]
public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask)
{
var responseBytes = GetResponseBytes(urlSchemeTask.Request.Url.AbsoluteString, out var contentType, statusCode: out var statusCode);
var responseBytes = GetResponseBytes(urlSchemeTask.Request.Url?.AbsoluteString ?? "", out var contentType, statusCode: out var statusCode);
if (statusCode == 200)
{
using (var dic = new NSMutableDictionary<NSString, NSString>())
Expand All @@ -199,8 +199,12 @@ public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask
dic.Add((NSString)"Content-Type", (NSString)contentType);
// Disable local caching. This will prevent user scripts from executing correctly.
dic.Add((NSString)"Cache-Control", (NSString)"no-cache, max-age=0, must-revalidate, no-store");
using var response = new NSHttpUrlResponse(urlSchemeTask.Request.Url, statusCode, "HTTP/1.1", dic);
urlSchemeTask.DidReceiveResponse(response);
if(urlSchemeTask.Request.Url != null)
{
using var response = new NSHttpUrlResponse(urlSchemeTask.Request.Url, statusCode, "HTTP/1.1", dic);
urlSchemeTask.DidReceiveResponse(response);
}

}
urlSchemeTask.DidReceiveData(NSData.FromArray(responseBytes));
urlSchemeTask.DidFinish();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +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.microsoft.mauicompatibilitygallery" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
6 changes: 5 additions & 1 deletion src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
<MauiIcon Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" Color="#512BD4" />
<MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" BaseSize="128,128" />
</ItemGroup>


<PropertyGroup>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests\TestUtils.DeviceTests.csproj" />
<ProjectReference Include="..\..\..\TestUtils\src\DeviceTests.Runners\TestUtils.DeviceTests.Runners.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
7 changes: 1 addition & 6 deletions src/Core/src/Platform/iOS/MauiPageControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ public class MauiPageControl : UIPageControl
public MauiPageControl()
{
ValueChanged += MauiPageControlValueChanged;

if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14)
#if TVOS
|| OperatingSystem.IsTvOSVersionAtLeast(14)
#endif
)
if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14))
{
AllowsContinuousInteraction = false;
BackgroundStyle = UIPageControlBackgroundStyle.Minimal;
Expand Down
1 change: 1 addition & 0 deletions src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<PublishTrimmed>false</PublishTrimmed>
<RunAOTCompilation>false</RunAOTCompilation>
<!-- Physical device is recommended -->
<RuntimeIdentifier>android-arm64</RuntimeIdentifier>
<!-- HACK: to workaround System.IO.FileNotFoundException: /System.Private.CoreLib.dll -->
Expand Down
13 changes: 3 additions & 10 deletions src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,9 @@ protected override DisplayInfo GetMainDisplayInfo()
var bounds = UIScreen.MainScreen.Bounds;
var scale = UIScreen.MainScreen.Scale;

nint rate = 0;

if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3)
#if TVOS
|| OperatingSystem.IsTvOSVersionAtLeast(11)
#endif
)
{
rate = UIScreen.MainScreen.MaximumFramesPerSecond;
}
var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3))
? UIScreen.MainScreen.MaximumFramesPerSecond
: 0;

return new DisplayInfo(
width: bounds.Width * scale,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ public static Task<WebAuthenticatorResult> AuthenticateAsync(this IWebAuthentica
public static bool OpenUrl(this IWebAuthenticator webAuthenticator, Uri uri) =>
webAuthenticator.AsPlatformCallback().OpenUrlCallback(uri);

public static bool OpenUrl(this IWebAuthenticator webAuthenticator, UIKit.UIApplication app, Foundation.NSUrl url, Foundation.NSDictionary options)
public static bool OpenUrl(this IWebAuthenticator webAuthenticator, UIKit.UIApplication app, Foundation.NSUrl url, Foundation.NSDictionary options)
{
var absUri = url?.AbsoluteString;
if (!string.IsNullOrEmpty(absUri))
return webAuthenticator.OpenUrl(new Uri(absUri));
if(url?.AbsoluteString != null)
{
return webAuthenticator.OpenUrl(new Uri(url.AbsoluteString));
}
return false;
}

Expand Down