Merge branch 'net6.0' into fix-4755

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
  ]
  },
  "microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.22358.1",
+ "version": "1.0.0-prerelease.22531.1",
  "commands": [
  "xharness"
  ]

.gitignore

@@ -372,3 +372,6 @@ FodyWeavers.xsd
 .gradle/
 .idea/
 local.properties
+
+# Directory Build overrides for local setups
+Directory.Build.Override.props

.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets

@@ -113,5 +113,4 @@
  <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
  <DefineConstants>WINDOWS_UWP;$(DefineConstants)</DefineConstants>
  </PropertyGroup>
-
 </Project>

.nuspec/Microsoft.Maui.Controls.SingleProject.targets

@@ -111,7 +111,7 @@
  BeforeTargets="_MauiInjectXamlCssAdditionalFiles;GenerateMSBuildEditorConfigFileShouldRun"
  Condition=" '$(EnableDefaultItems)' == 'true' and '$(SingleProject)' == 'true' ">
 
-  <!-- Removals -->
+ <!-- Removals -->
  <ItemGroup>
  <!-- Remove everything that isn't part of this platform -->
  <Compile

.nuspec/Microsoft.Maui.Resizetizer.targets

@@ -49,6 +49,10 @@
  AssemblyFile="$(_ResizetizerTaskAssemblyName)"
  TaskName="Microsoft.Maui.Resizetizer.GeneratePackageAppxManifest" />
 
+ <UsingTask
+ AssemblyFile="$(_ResizetizerTaskAssemblyName)"
+ TaskName="Microsoft.Maui.Resizetizer.GenerateTizenManifest" />
+
  <PropertyGroup>
  <CleanDependsOn>
  $(CleanDependsOn);
@@ -93,7 +97,7 @@
  <_ResizetizerIsiOSApp Condition="( '$(_ResizetizerPlatformIsiOS)' == 'True' OR '$(_ResizetizerPlatformIsMacCatalyst)' == 'True' ) And ('$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'True')">True</_ResizetizerIsiOSApp>
  <_ResizetizerIsWPFApp Condition="'$(IsApplication)' == 'True' And '$(NuGetRuntimeIdentifier)' == 'win' And '$(_ResizetizerPlatformIsWindows)' == 'True'">True</_ResizetizerIsWPFApp>
  <_ResizetizerIsWindowsAppSdk Condition="('$(ProjectReunionWinUI)'=='True' Or '$(WindowsAppSDKWinUI)'=='True') And '$(_ResizetizerPlatformIsWindows)' == 'True' And ('$(OutputType)' == 'WinExe' Or '$(OutputType)' == 'Exe')">True</_ResizetizerIsWindowsAppSdk>
- <_ResizetizerIsTizenApp Condition="'$(_ResizetizerPlatformIsTizen)' == 'True'">True</_ResizetizerIsTizenApp>
+ <_ResizetizerIsTizenApp Condition="'$(_ResizetizerPlatformIsTizen)' == 'True' And ( '$(OutputType)' == 'Exe' )">True</_ResizetizerIsTizenApp>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(_ResizetizerIsAndroidApp)' == 'True' Or '$(_ResizetizerIsiOSApp)' == 'True' Or '$(_ResizetizerIsWPFApp)' == 'True' Or '$(_ResizetizerIsWindowsAppSdk)' == 'True' Or '$(_ResizetizerIsTizenApp)' == 'True'">
@@ -393,9 +397,16 @@
  <FileWrites Include="@(_MauiSplashAssets)" />
  </ItemGroup>
 
- <!-- Tizen -->
+ <!-- Tizen -->
+ <TizenSplashUpdater
+ Condition="'$(_ResizetizerIsTizenApp)' == 'True'"
+ IntermediateOutputPath="$(_MauiIntermediateSplashScreen)"
+ MauiSplashScreen="@(MauiSplashScreen)" />
+
  <ItemGroup Condition="'$(_ResizetizerIsTizenApp)' == 'True'">
  <MauiImage Include="@(MauiSplashScreen)" />
+ <_MauiSplashScreens Include="$(_MauiIntermediateSplashScreen)splash\*" />
+ <TizenTpkUserIncludeFiles Include="@(_MauiSplashScreens)" TizenTpkSubDir="shared\res\splash" />
  </ItemGroup>
 
  <!-- Stamp file for Outputs -->
@@ -524,13 +535,6 @@
  Images="@(MauiImage->Distinct())">
  </ResizetizeImages>
 
- <!-- Tizen - Move splash images to a specific location -->
- <TizenSplashUpdater
- Condition="'$(_ResizetizerIsTizenApp)' == 'True' And '@(MauiSplashScreen)' != ''"
- IntermediateOutputPath="$(_MauiIntermediateImages)"
- ManifestFile="$(TizenManifestFile)"
- MauiSplashScreen="@(MauiSplashScreen)" />
-
  <ItemGroup>
  <!-- Get Images that were generated -->
  <!-- Either from the task, or if the task was skipped (up to date), use the wildcard lookup -->
@@ -733,7 +737,36 @@
  <_Parameter2>@(_MauiAppxManifestVersion)</_Parameter2>
  </AssemblyAttribute>
  </ItemGroup>
+ </Target>
+
+ <Target Name="MauiGenerateTizenManifest"
+ Condition="'$(_ResizetizerIsTizenApp)' == 'True'"
+ BeforeTargets="$(ResizetizeBeforeTargets)"
+ AfterTargets="$(ResizetizeImages)"
+ Inputs="$(MSBuildThisFileFullPath);$(_ResizetizerTaskAssemblyName);$(_ResizetizerInputsFile);$(_MauiSplashInputsFile);$(TizenManifestFile)"
+ Outputs="$(_MauiManifestStampFile);$(_MauiIntermediateManifest)tizen-manifest.xml">
+
+ <GenerateTizenManifest
+ IntermediateOutputPath="$(_MauiIntermediateManifest)"
+ TizenManifestFile="$(TizenManifestFile)"
+ GeneratedFilename="tizen-manifest.xml"
+ ApplicationId="$(ApplicationId)"
+ ApplicationDisplayVersion="$(ApplicationDisplayVersion)"
+ ApplicationVersion="$(ApplicationVersion)"
+ ApplicationTitle="$(ApplicationTitle)"
+ AppIcon="@(MauiImage->WithMetadataValue('IsAppIcon', 'true'))"
+ SplashScreen="@(MauiSplashScreen)" />
+
+ <!-- replace user manifest -->
+ <PropertyGroup>
+ <TizenManifestFile>$(_MauiIntermediateManifest)tizen-manifest.xml</TizenManifestFile>
+ </PropertyGroup>
 
+ <!-- Stamp file for Outputs -->
+ <Touch Files="$(_MauiManifestStampFile)" AlwaysCreate="True" />
+ <ItemGroup>
+ <FileWrites Include="$(_MauiManifestStampFile)" />
+ </ItemGroup>
  </Target>
 
  <Target Name="_CleanResizetizer">

.nuspec/maui.aotprofile.txt

@@ -4125,7 +4125,7 @@ Methods:
  void Microsoft.Maui.Controls.CheckBox/<>c:.cctor ()
  void Microsoft.Maui.Controls.CheckBox/<>c:.ctor ()
  void Microsoft.Maui.Controls.CollectionView:.ctor ()
- void Microsoft.Maui.Controls.ColorElement:.cctor ()
+ void Microsoft.Maui.Graphics.ColorElement:.cctor ()
  void Microsoft.Maui.Controls.ColumnDefinitionCollection:.ctor ()
  void Microsoft.Maui.Controls.Compatibility.Layout:.cctor ()
  void Microsoft.Maui.Controls.Compatibility.Layout:.ctor ()

Directory.Build.Override.props.in

@@ -0,0 +1,25 @@
+<Project>
+
+ <PropertyGroup>
+ <!-- Setting any of these to true will cause all the other platforms to get excluded.
+ Cake writes out to these properties when you've used a specific target switch
+ -->
+ <_IncludeWindows></_IncludeWindows>
+ <_IncludeTizen></_IncludeTizen>
+ <_IncludeAndroid></_IncludeAndroid>
+ <_IncludeIos></_IncludeIos>
+ <_IncludeMacCatalyst></_IncludeMacCatalyst>
+ <_IncludeMacOS></_IncludeMacOS>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <_SpecificPlatformRequested Condition="'$(_IncludeAndroid)' == 'true' OR '$(_IncludeWindows)' == 'true' OR '$(_IncludeTizen)' == 'true' OR '$(_IncludeIos)' == 'true' OR '$(_IncludeMacCatalyst)' == 'true' OR '$(_IncludeMacOS)' == 'true'">true</_SpecificPlatformRequested>
+ <IncludeAndroidTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeAndroid)' != 'true'">false</IncludeAndroidTargetFrameworks>
+ <IncludeWindowsTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeWindows)' != 'true'">false</IncludeWindowsTargetFrameworks>
+ <IncludeTizenTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeTizen)' != 'true'">false</IncludeTizenTargetFrameworks>
+ <IncludeIosTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeIos)' != 'true'">false</IncludeIosTargetFrameworks>
+ <IncludeMacCatalystTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeMacCatalyst)' != 'true'">false</IncludeMacCatalystTargetFrameworks>
+ <IncludeMacOSTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeMacOS)' != 'true'">false</IncludeMacOSTargetFrameworks>
+ </PropertyGroup>
+
+</Project>

Directory.Build.props

@@ -15,11 +15,41 @@
  <_MauiTargetPlatformIstvOS Condition="'$(_MauiTargetPlatformIdentifier)' == 'tvos'">True</_MauiTargetPlatformIstvOS>
  <_MauiTargetPlatformIsWindows Condition="$(_MauiTargetPlatformIdentifier.Contains('windows')) == 'True'">True</_MauiTargetPlatformIsWindows>
  <_MauiTargetPlatformIsTizen Condition="'$(_MauiTargetPlatformIdentifier)' == 'tizen'">True</_MauiTargetPlatformIsTizen>
+ </PropertyGroup>
+
+ <!-- Try determine which .NET workloads are installed -->
+ <PropertyGroup Condition="'$(CI)' != 'true' and '$(TF_BUILD)' != 'true'">
+ <DotNetWorkloadVersionRegex>\d+\.\d+\.\d+(-[a-z]+[\.\d+]+)?</DotNetWorkloadVersionRegex>
+ <DotNetSdkVersionRegex>\d+\.\d+\.\d+(-[a-z]+\.\d+)?</DotNetSdkVersionRegex>
+
+ <DotNetSdkManifestVersion>$([System.Text.RegularExpressions.Regex]::Match('$(MSBuildExtensionsPath)', '$(DotNetSdkVersionRegex)'))</DotNetSdkManifestVersion>
+
+ <DotNetWorkloadInstallLocation Condition="'$(DotNetWorkloadInstallLocation)' == '' and Exists('$(DOTNET_ROOT)\sdk-manifests\$(DotNetSdkManifestVersion)\microsoft.net.sdk.macos\WorkloadManifest.json')">$(DOTNET_ROOT)\sdk-manifests\$(DotNetSdkManifestVersion)\</DotNetWorkloadInstallLocation>
+ <DotNetWorkloadInstallLocation Condition="'$(DotNetWorkloadInstallLocation)' == '' and Exists('$(ProgramFiles)\dotnet\sdk-manifests\$(DotNetSdkManifestVersion)\microsoft.net.sdk.macos\WorkloadManifest.json')">$(ProgramFiles)\dotnet\sdk-manifests\$(DotNetSdkManifestVersion)\</DotNetWorkloadInstallLocation>
+ <DotNetWorkloadPacksInstallLocation Condition="'$(DotNetWorkloadInstallLocation)' != ''">$(DotNetWorkloadInstallLocation)..\..\packs\</DotNetWorkloadPacksInstallLocation>
+
+ <DotNetMacOSWorkloadInstalledVersion Condition="Exists('$(DotNetWorkloadInstallLocation)microsoft.net.sdk.macos\WorkloadManifest.json')">$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(DotNetWorkloadInstallLocation)\microsoft.net.sdk.macos\WorkloadManifest.json')), '$(DotNetWorkloadVersionRegex)'))</DotNetMacOSWorkloadInstalledVersion>
+ <DotNetTizenWorkloadInstalledVersion Condition="Exists('$(DotNetWorkloadInstallLocation)samsung.net.sdk.tizen\WorkloadManifest.json')">$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(DotNetWorkloadInstallLocation)\samsung.net.sdk.tizen\WorkloadManifest.json')), $(DotNetWorkloadVersionRegex)))</DotNetTizenWorkloadInstalledVersion>
+
+ <DotNetMacOSWorkloadIsInstalled Condition="Exists('$(DotNetWorkloadPacksInstallLocation)Microsoft.macOS.Sdk\$(DotNetMacOSWorkloadInstalledVersion)\Sdk\AutoImport.props')">true</DotNetMacOSWorkloadIsInstalled>
+ <DotNetTizenWorkloadIsInstalled Condition="Exists('$(DotNetWorkloadPacksInstallLocation)Samsung.Tizen.Sdk\$(DotNetTizenWorkloadInstalledVersion)\Sdk\AutoImport.props')">true</DotNetTizenWorkloadIsInstalled>
 
  <IncludeWindowsTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(Packing)' == 'true'">true</IncludeWindowsTargetFrameworks>
- <IncludeTizenTargetFrameworks Condition="'$(CI)' == 'true' or '$(TF_BUILD)' == 'true' or
- Exists('$(DOTNET_ROOT)\sdk-manifests\$(DotNetVersionBand)\samsung.net.sdk.tizen\WorkloadManifest.json') or
- Exists('$(ProgramFiles)\dotnet\sdk-manifests\$(DotNetVersionBand)\samsung.net.sdk.tizen\WorkloadManifest.json')">true</IncludeTizenTargetFrameworks>
+ <IncludeMacOSTargetFrameworks Condition="'$(DotNetMacOSWorkloadIsInstalled)' == 'true'">true</IncludeMacOSTargetFrameworks>
+ <IncludeTizenTargetFrameworks Condition="'$(DotNetTizenWorkloadIsInstalled)' == 'true'">true</IncludeTizenTargetFrameworks>
+ <IncludeAndroidTargetFrameworks>true</IncludeAndroidTargetFrameworks>
+ <IncludeMacCatalystTargetFrameworks>true</IncludeMacCatalystTargetFrameworks>
+ <IncludeIosTargetFrameworks>true</IncludeIosTargetFrameworks>
+ </PropertyGroup>
+
+ <!-- this is CI, so everything should be there -->
+ <PropertyGroup Condition="'$(CI)' == 'true' or '$(TF_BUILD)' == 'true'">
+ <IncludeWindowsTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">true</IncludeWindowsTargetFrameworks>
+ <IncludeTizenTargetFrameworks>true</IncludeTizenTargetFrameworks>
+ <IncludeMacOSTargetFrameworks>true</IncludeMacOSTargetFrameworks>
+ <IncludeAndroidTargetFrameworks>true</IncludeAndroidTargetFrameworks>
+ <IncludeMacCatalystTargetFrameworks>true</IncludeMacCatalystTargetFrameworks>
+ <IncludeIosTargetFrameworks>true</IncludeIosTargetFrameworks>
  </PropertyGroup>
 
  <PropertyGroup>
@@ -44,16 +74,22 @@
  <TizenTargetFrameworkVersion>6.5</TizenTargetFrameworkVersion>
  </PropertyGroup>
 
+ <Import Condition="Exists('Directory.Build.Override.props')" Project="Directory.Build.Override.props" />
+
  <PropertyGroup>
  <!-- the real TFMs -->
- <MauiPlatforms>net$(_MauiDotNetVersion)-ios;net$(_MauiDotNetVersion)-maccatalyst;net$(_MauiDotNetVersion)-android</MauiPlatforms>
  <WindowsMauiPlatforms Condition="'$(WindowsMauiPlatforms)' == ''">net$(_MauiDotNetVersion)-windows$(WindowsTargetFrameworkVersion);net$(_MauiDotNetVersion)-windows$(Windows2TargetFrameworkVersion)</WindowsMauiPlatforms>
- <MauiPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatforms);$(WindowsMauiPlatforms)</MauiPlatforms>
- <MauiPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(MauiPlatforms);net$(_MauiDotNetVersion)-tizen</MauiPlatforms>
+
+ <MauiPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-tizen;$(MauiPlatforms)</MauiPlatforms>
+ <MauiPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPlatforms);$(MauiPlatforms)</MauiPlatforms>
+ <MauiPlatforms Condition="'$(IncludeAndroidTargetFrameworks)' != 'false'">net$(_MauiDotNetVersion)-android;$(MauiPlatforms)</MauiPlatforms>
+ <MauiPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' != 'false'">net$(_MauiDotNetVersion)-maccatalyst;$(MauiPlatforms)</MauiPlatforms>
+ <MauiPlatforms Condition="'$(IncludeIosTargetFrameworks)' != 'false'">net$(_MauiDotNetVersion)-ios;$(MauiPlatforms)</MauiPlatforms>
 
  <!-- Work around the IDE not properly handling the NU1703 warning -->
- <MauiPlatformsNoMacCat>net$(_MauiDotNetVersion)-ios;net$(_MauiDotNetVersion)-android</MauiPlatformsNoMacCat>
  <MauiPlatformsNoMacCat Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatformsNoMacCat);$(WindowsMauiPlatforms)</MauiPlatformsNoMacCat>
+ <MauiPlatformsNoMacCat Condition="'$(IncludeIosTargetFrameworks)' != 'false'">net$(_MauiDotNetVersion)-ios;$(MauiPlatformsNoMacCat)</MauiPlatformsNoMacCat>
+ <MauiPlatformsNoMacCat Condition="'$(IncludeAndroidTargetFrameworks)' != 'false'">net$(_MauiDotNetVersion)-android;$(MauiPlatformsNoMacCat)</MauiPlatformsNoMacCat>
  </PropertyGroup>
 
  <PropertyGroup>

GitInfo.txt

@@ -1 +1 @@
-6.0.409
+6.0.542-ci.net6.0

Microsoft.Maui.sln

@@ -198,6 +198,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiBlazorWebView.DeviceTes
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedSource", "SharedSource", "{4F2926C8-43AB-4328-A735-D9EAD699F81D}"
  ProjectSection(SolutionItems) = preProject
+ src\BlazorWebView\src\SharedSource\AutoCloseOnReadCompleteStream.cs = src\BlazorWebView\src\SharedSource\AutoCloseOnReadCompleteStream.cs
  src\BlazorWebView\src\SharedSource\QueryStringHelper.cs = src\BlazorWebView\src\SharedSource\QueryStringHelper.cs
  src\BlazorWebView\src\SharedSource\UrlLoadingEventArgs.cs = src\BlazorWebView\src\SharedSource\UrlLoadingEventArgs.cs
  src\BlazorWebView\src\SharedSource\UrlLoadingStrategy.cs = src\BlazorWebView\src\SharedSource\UrlLoadingStrategy.cs

NuGet.config

@@ -6,14 +6,16 @@
  <!-- Begin: Package sources from dotnet-aspnetcore -->
  <!-- End: Package sources from dotnet-aspnetcore -->
  <!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-pub-dotnet-runtime-d5edd29-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d5edd29b-1/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-runtime -->
  <!-- Begin: Package sources from dotnet-windowsdesktop -->
  <!-- End: Package sources from dotnet-windowsdesktop -->
  <!-- Begin: Package sources from dotnet-emsdk -->
+ <add key="darc-pub-dotnet-emsdk-14d64a8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14d64a81/nuget/v3/index.json" />
+ <add key="darc-pub-dotnet-emsdk-14d64a8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14d64a81-1/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-emsdk -->
  <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  <!-- <add key="local" value="artifacts" /> -->
- <add key="skiasharp-stable-2e127353-signed" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/skiasharp-stable-2e127353-signed/nuget/v3/index.json" />
  <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
  <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
  <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />

eng/Microsoft.Extensions.targets

@@ -110,7 +110,7 @@
  Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)"
  />
  <PackageReference
- Update="Tizen.UIExtensions.ElmSharp"
+ Update="Tizen.UIExtensions.NUI"
  Version="$(TizenUIExtensionsVersion)"
  />
  <PackageReference

eng/PublicAPI.empty.txt

@@ -0,0 +1 @@
+#nullable enable