Merge branch 'net6.0'

dotnet · Jun 7, 2022 · 8e7c711 · 8e7c711
2 parents 14dda43 + e1ae9dd
commit 8e7c711
Show file tree

Hide file tree

Showing 77 changed files with 1,307 additions and 180 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,9 @@
  <Import Project="eng\Versions.props" />
 
  <PropertyGroup>
- <_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">6.0</_MauiDotNetVersion>
+ <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">6</_MauiDotNetVersionMajor>
+ <_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0</_MauiDotNetVersionMinor>
+ <_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
  <_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>
  <_MauiTargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</_MauiTargetPlatformIdentifier>
  <_MauiNoTargetPlatform Condition="'$(_MauiTargetPlatformIdentifier)' == ''">True</_MauiNoTargetPlatform>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -64,7 +64,7 @@
 
  <!-- Until we get a new enough dotnet -->
  <ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
- <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.22" TargetingPackVersion="10.0.18362.22" />
+ <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.24" TargetingPackVersion="10.0.18362.24" />
  </ItemGroup>
 
 </Project>
diff --git a/GitInfo.txt b/GitInfo.txt
@@ -1 +1 @@
-6.0.400-preview.1
+6.0.500-preview.1
diff --git a/NuGet.config b/NuGet.config
@@ -6,6 +6,7 @@
  <!-- Begin: Package sources from dotnet-aspnetcore -->
  <!-- End: Package sources from dotnet-aspnetcore -->
  <!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-pub-dotnet-runtime-15626cf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-15626cf7/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-runtime -->
  <!-- Begin: Package sources from dotnet-windowsdesktop -->
  <!-- End: Package sources from dotnet-windowsdesktop -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,32 +1,32 @@
 <Dependencies>
  <ProductDependencies>
- <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.301-rtm.22254.17" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+ <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-preview.22302.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
  <Uri>https://github.com/dotnet/installer</Uri>
- <Sha>3fed194c0b277b0ac0986f92401a50dd6c34f43d</Sha>
+ <Sha>23d623452dda371b6d364b29a200e0856b45ec20</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+ <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>a21b9a2dd4c31cf5bd37626562b7612faf21cee6</Sha>
+ <Sha>15626cf7e26af1c3800127242e47237698faed61</Sha>
  </Dependency>
- <Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.301">
+ <Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.415">
  <Uri>https://github.com/xamarin/xamarin-android</Uri>
- <Sha>4c460a89cb070ee8dfd731842f36bc3dc68dc75c</Sha>
+ <Sha>052bfb661739066b8598f5b0b066cee5a99a1e15</Sha>
  </Dependency>
- <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.303">
+ <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.408">
  <Uri>https://github.com/xamarin/xamarin-macios</Uri>
- <Sha>ce10c913a2921673b0caedcd268778b46d52c392</Sha>
+ <Sha>4c190f21e2577c7071d47ab5f183a4cb65148b6f</Sha>
  </Dependency>
- <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.303">
+ <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.408">
  <Uri>https://github.com/xamarin/xamarin-macios</Uri>
- <Sha>ce10c913a2921673b0caedcd268778b46d52c392</Sha>
+ <Sha>4c190f21e2577c7071d47ab5f183a4cb65148b6f</Sha>
  </Dependency>
- <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.303">
+ <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.408">
  <Uri>https://github.com/xamarin/xamarin-macios</Uri>
- <Sha>ce10c913a2921673b0caedcd268778b46d52c392</Sha>
+ <Sha>4c190f21e2577c7071d47ab5f183a4cb65148b6f</Sha>
  </Dependency>
- <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.303">
+ <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.408">
  <Uri>https://github.com/xamarin/xamarin-macios</Uri>
- <Sha>ce10c913a2921673b0caedcd268778b46d52c392</Sha>
+ <Sha>4c190f21e2577c7071d47ab5f183a4cb65148b6f</Sha>
  </Dependency>
  <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
  <Uri>https://github.com/dotnet/emsdk</Uri>
@@ -71,9 +71,9 @@
  <Uri>https://github.com/dotnet/templating</Uri>
  <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
  </Dependency>
- <Dependency Name="Microsoft.Maui.Graphics" Version="6.0.400-preview.1.1367">
+ <Dependency Name="Microsoft.Maui.Graphics" Version="6.0.403">
  <Uri>https://github.com/dotnet/Microsoft.Maui.Graphics</Uri>
- <Sha>e15f2d552d851c28771e7fe092895e908395f8a4</Sha>
+ <Sha>691c654ff69df33f16f43b390ad6ef9b4ec03e6e</Sha>
  </Dependency>
  <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22305.1">
  <Uri>https://github.com/dotnet/xharness</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,26 +1,27 @@
 <Project>
  <PropertyGroup>
  <!-- dotnet/installer -->
- <MicrosoftDotnetSdkInternalPackageVersion>6.0.301-rtm.22254.17</MicrosoftDotnetSdkInternalPackageVersion>
+ <MicrosoftDotnetSdkInternalPackageVersion>6.0.400-preview.22302.1</MicrosoftDotnetSdkInternalPackageVersion>
  <!-- dotnet/runtime -->
- <MicrosoftNETCoreAppRefPackageVersion>6.0.5</MicrosoftNETCoreAppRefPackageVersion>
+ <MicrosoftNETCoreAppRefPackageVersion>6.0.6</MicrosoftNETCoreAppRefPackageVersion>
  <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
  <MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
  <MicrosoftExtensionsServicingPackageVersion>6.0.1</MicrosoftExtensionsServicingPackageVersion>
  <SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
  <!-- xamarin/xamarin-android -->
- <MicrosoftAndroidSdkWindowsPackageVersion>32.0.301</MicrosoftAndroidSdkWindowsPackageVersion>
+ <MicrosoftAndroidSdkWindowsPackageVersion>32.0.415</MicrosoftAndroidSdkWindowsPackageVersion>
  <!-- xamarin/xamarin-macios -->
- <MicrosoftiOSSdkPackageVersion>15.4.303</MicrosoftiOSSdkPackageVersion>
- <MicrosoftMacCatalystSdkPackageVersion>15.4.303</MicrosoftMacCatalystSdkPackageVersion>
- <MicrosoftmacOSSdkPackageVersion>12.3.303</MicrosoftmacOSSdkPackageVersion>
- <MicrosofttvOSSdkPackageVersion>15.4.303</MicrosofttvOSSdkPackageVersion>
- <SamsungTizenSdkPackageVersion>7.0.303</SamsungTizenSdkPackageVersion>
+ <MicrosoftiOSSdkPackageVersion>15.4.408</MicrosoftiOSSdkPackageVersion>
+ <MicrosoftMacCatalystSdkPackageVersion>15.4.408</MicrosoftMacCatalystSdkPackageVersion>
+ <MicrosoftmacOSSdkPackageVersion>12.3.408</MicrosoftmacOSSdkPackageVersion>
+ <MicrosofttvOSSdkPackageVersion>15.4.408</MicrosofttvOSSdkPackageVersion>
+ <!-- Samsung/Tizen.NET -->
+ <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
  <!-- emsdk -->
  <MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
  <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
  <!-- wasdk -->
- <MicrosoftWindowsAppSDKPackageVersion>1.0.3</MicrosoftWindowsAppSDKPackageVersion>
+ <MicrosoftWindowsAppSDKPackageVersion>1.1.0</MicrosoftWindowsAppSDKPackageVersion>
  <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22000.194</MicrosoftWindowsSDKBuildToolsPackageVersion>
  <MicrosoftGraphicsWin2DPackageVersion>1.0.3.1</MicrosoftGraphicsWin2DPackageVersion>
  <!-- Everything else -->
@@ -36,7 +37,7 @@
  <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22302.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
  <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
  <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
- <MicrosoftMauiGraphicsVersion>6.0.400-preview.1.1367</MicrosoftMauiGraphicsVersion>
+ <MicrosoftMauiGraphicsVersion>6.0.403</MicrosoftMauiGraphicsVersion>
  <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
  <_MicrosoftWebWebView2Version>1.0.1210.39</_MicrosoftWebWebView2Version>
  <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
@@ -64,13 +65,12 @@
  <PropertyGroup>
  <!-- Match the first three version numbers and append 00 -->
  <!-- <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00</DotNetVersionBand> -->
- <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.300</DotNetVersionBand>
- <!-- NOTE: temporarily hardcode these to 6.0.200 -->
- <DotNetMauiManifestVersionBand>$(DotNetVersionBand)</DotNetMauiManifestVersionBand>
- <DotNetMonoManifestVersionBand>$(DotNetVersionBand)</DotNetMonoManifestVersionBand>
- <DotNetEmscriptenManifestVersionBand>$(DotNetVersionBand)</DotNetEmscriptenManifestVersionBand>
- <DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
- <DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
- <DotNetTizenManifestVersionBand>$(DotNetVersionBand)</DotNetTizenManifestVersionBand>
+ <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.400</DotNetVersionBand>
+ <DotNetMauiManifestVersionBand>6.0.300</DotNetMauiManifestVersionBand>
+ <DotNetMonoManifestVersionBand>6.0.300</DotNetMonoManifestVersionBand>
+ <DotNetEmscriptenManifestVersionBand>6.0.300</DotNetEmscriptenManifestVersionBand>
+ <DotNetAndroidManifestVersionBand>6.0.300</DotNetAndroidManifestVersionBand>
+ <DotNetMaciOSManifestVersionBand>6.0.400</DotNetMaciOSManifestVersionBand>
+ <DotNetTizenManifestVersionBand>6.0.400</DotNetTizenManifestVersionBand>
  </PropertyGroup>
 </Project>
diff --git a/eng/pipelines/common/insertion.yml b/eng/pipelines/common/insertion.yml
@@ -21,7 +21,7 @@ stages:
  - stage: sdk_insertion
  displayName: 'SDK Insertion'
  dependsOn: nuget_signing
- condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))
+ condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/net6.0'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') )))))
  jobs:
  - template: sdk-insertion.yml
  parameters:
@@ -31,12 +31,12 @@ stages:
  - stage: sbom
  displayName: 'Software Bill of Materials'
  dependsOn: nuget_signing
- condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))
+ condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/net6.0'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') )))))
  jobs:
  - template: compliance/sbom/job.v1.yml@xamarin-templates
  parameters:
  artifactNames: [ nuget, vs-msi-nugets, vsdrop-signed ]
  artifactMap: [ nuget/signed ] # Use artifacts that match the filter from the signed directory and not the top-level directory for the nuget artifact
  packageName: 'Microsoft Maui'
  packageFilter: '*.msi;*.nupkg'
- condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))
+ condition: and(succeeded(), or(eq(variables['Sign'], 'true'),  or(eq(variables['Build.SourceBranch'], 'refs/heads/net6.0'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') )))))
diff --git a/eng/pipelines/common/sign.yml b/eng/pipelines/common/sign.yml
@@ -12,7 +12,7 @@ stages:
  signedArtifactName: nuget
  signedArtifactPath: signed
  displayName: Sign Phase
- condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))
+ condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/net6.0'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'), startsWith(variables['Build.SourceBranch'],'refs/heads/release/') )))))
 
  - template: nuget-msi-convert/job/v2.yml@xamarin-templates
  parameters:

diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.Tizen.cs b/src/Compatibility/Core/src/RendererToHandlerShim.Tizen.cs
@@ -1,5 +1,6 @@
 #pragma warning disable CS0612 // Type or member is obsolete
 using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+using static Microsoft.Maui.Controls.Compatibility.Platform.Tizen.Platform;
 #pragma warning disable CS0612 // Type or member is obsolete
 using Microsoft.Maui.Graphics;
 using Rect = Microsoft.Maui.Graphics.Rect;
@@ -25,8 +26,9 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
  if (VisualElementRenderer == null)
  return Size.Zero;
 
- // TODO. It is workaroud code, Controls.VisualElement.MeasureOverride implementation is wrong. it does not apply Height/WidthRequest
- return VisualElementRenderer.Element.Measure(widthConstraint, heightConstraint).Request;
+ widthConstraint = widthConstraint < 0 ? double.PositiveInfinity : widthConstraint;
+ heightConstraint = heightConstraint < 0 ? double.PositiveInfinity : heightConstraint;
+ return VisualElementRenderer.GetDesiredSize(widthConstraint, heightConstraint);
  }
 
  public override void UpdateValue(string property)