Skip to content

Merge net7.0 into main #11290

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

Merged
mattleibow merged 4 commits into from
Nov 14, 2022
Merged

Merge net7.0 into main #11290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b4e0be
Update Entry.cs (#11250)
github-actions[bot] Nov 10, 2022
a4d78ae
Revert "[android] bring back `$(AndroidLinkResources)` by default" (#…
jonathanpeppers Nov 10, 2022
c64e102
Remove dead XML Doc link (#11233)
github-actions[bot] Nov 11, 2022
5302c47
[net7.0] Update dependencies from xamarin/xamarin-macios (#11220)
dotnet-maestro[bot] Nov 11, 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
1 change: 0 additions & 1 deletion .nuspec/Microsoft.Maui.Controls.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<SkipMicrosoftUIXamlCheckTargetPlatformVersion Condition="'$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'==''">true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion Condition="'$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'=='false'"></SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<AndroidUseDefaultAotProfile Condition="'$(AndroidEnableProfiledAot)' == 'true' and '$(AndroidUseDefaultAotProfile)' == ''">false</AndroidUseDefaultAotProfile>
<AndroidLinkResources Condition=" '$(AndroidLinkResources)' == '' And '$(Configuration)' == 'Release' ">True</AndroidLinkResources>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-pub-dotnet-aspnetcore-d50065c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d50065c4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-aspnetcore-d50065c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d50065c4-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-cd2d837" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cd2d8379/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2372">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.1.1467">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
<Sha>a082743ee1f4bc55743e8d31b593c7410d20a9ef</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2372">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.0.2022">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
<Sha>a082743ee1f4bc55743e8d31b593c7410d20a9ef</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1478">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.1.1467">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
<Sha>a082743ee1f4bc55743e8d31b593c7410d20a9ef</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1478">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.1467">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
<Sha>a082743ee1f4bc55743e8d31b593c7410d20a9ef</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>15.4.2372</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.2372</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.0.1478</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.0.1478</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.1.1467</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.0.2022</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.1.1467</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.1.1467</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ variables:
- name: DOTNET_VERSION
value: 5.0.201
- name: REQUIRED_XCODE
value: 14.0.0
value: 14.1.0
- name: DEVICETESTS_REQUIRED_XCODE
value: 14.0.0
value: 14.1.0
- name: LocBranchPrefix
value: 'loc-hb'
- name: isMainBranch
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/src/Core/Entry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ public partial class Entry : InputView, IFontElement, ITextAlignmentElement, IEn
public static readonly BindableProperty SelectionLengthProperty = BindableProperty.Create(nameof(SelectionLength), typeof(int), typeof(Entry), 0, validateValue: (b, v) => (int)v >= 0);

/// <summary>
/// Backing store for the <see cref="SelectionLength"/> property.
/// Backing store for the <see cref="ClearButtonVisibility"/> property.
/// </summary>
public static readonly BindableProperty ClearButtonVisibilityProperty = BindableProperty.Create(nameof(SelectionLength), typeof(ClearButtonVisibility), typeof(Entry), ClearButtonVisibility.Never);
public static readonly BindableProperty ClearButtonVisibilityProperty = BindableProperty.Create(nameof(ClearButtonVisibility), typeof(ClearButtonVisibility), typeof(Entry), ClearButtonVisibility.Never);

readonly Lazy<PlatformConfigurationRegistry<Entry>> _platformConfigurationRegistry;

Expand Down
1 change: 0 additions & 1 deletion src/Essentials/src/Screenshot/Screenshot.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public interface IScreenshotResult
Task<Stream> OpenReadAsync(ScreenshotFormat format = ScreenshotFormat.Png, int quality = 100);
#pragma warning restore CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)

/// <include file="../../docs/Microsoft.Maui.Essentials/IScreenshotResult.xml" path="//Member[@MemberName='CopyToAsync']/Docs/*" />
Task CopyToAsync(Stream destination, ScreenshotFormat format = ScreenshotFormat.Png, int quality = 100);
}

Expand Down