Skip to content

Commit 870d784

Browse files
dotnet-maestro[bot]jonathanpeppersRedthEilon
authored
[main] Update dependencies from xamarin/xamarin-android (#1767)
* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-preview7-8ca289588b6969a2cc878afa0813afec8cd63dd3-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.7.91 -> To Version 30.0.100-preview.7.93 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.7.21326.8 -> To Version 6.0.0-preview.7.21368.2 (parent: Microsoft.Dotnet.Sdk.Internal * [build] remove workaround for iOS AOT packages on Windows * Ignore NU1703 in DeviceTests NU1703 warns about using nuget packages which have xamarin.ios tfm references from a newer net6.0-maccatalyst project. * Workaround error for implicit imports Context: dotnet/sdk#19050 and dotnet/java-interop@4fb7c14 * Ignore NU1703 for Mac Catalyst projects * Revert "Ignore NU1703 in DeviceTests" This reverts commit 8fdf5e1. * Revert "Revert "Ignore NU1703 in DeviceTests"" This reverts commit 4d0456d. * Fix other C# 10-related errors * Use `LangVersion=latest` by default * Fixed new NRT-related errors that appeared from C# 10.0 * Disable StaticWebAssets in MauiRazorClassLibrarySample Workaround to get the build to work. Will revert later to investigate. Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Jonathan Dick <jondick@gmail.com> Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
1 parent 9d48585 commit 870d784

File tree

10 files changed

+84
-92
lines changed

10 files changed

+84
-92
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<Project>
22
<Import Project="eng\Versions.props" />
33

4+
<PropertyGroup>
5+
<!-- Workaround: https://github.com/dotnet/sdk/issues/19050 -->
6+
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
7+
</PropertyGroup>
8+
49
<PropertyGroup>
510
<BuildForWinUI Condition=" ('$(SolutionFileName)' == 'Microsoft.Maui.WinUI.sln' OR '$(SolutionFileName)' == 'BlazorWindows-net6.sln') AND '$(Packing)' == ''">true</BuildForWinUI>
611
<BuildForAndroid Condition="'$(SolutionFileName)' == 'Microsoft.Maui.Droid.sln' AND '$(Packing)' == ''">true</BuildForAndroid>

‎Directory.Build.targets‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<Import Project="eng\AndroidX.targets" />
66
<Import Project="eng\Microsoft.Extensions.targets" />
77

8+
<PropertyGroup>
9+
<!--
10+
NOTE: Ignore warnings for using Xamarin.iOS in Catalyst
11+
error NU1703: 'xunit.core 2.4.1' was resolved as a dependency of 'Microsoft.Maui.TestUtils.DeviceTests', but the dependency is using 'Xamarin.iOS' while 'Microsoft.Maui.TestUtils.DeviceTests' is using 'net6.0-maccatalyst13.5' as its TargetFramework. There might be compatibility issues when MacCatalyst projects depend on Xamarin.iOS projects.
12+
-->
13+
<NoWarn Condition=" $(TargetFramework.Contains('maccatalyst')) ">$(NoWarn);NU1703</NoWarn>
14+
</PropertyGroup>
15+
816
<!-- Temporarily disable the linker for net6.0-ios and net6.0-maccatalyst until we get machine pools with Big Sur and Xcode 12.5 is stable -->
917
<PropertyGroup Condition=" '$(CI)' == 'true' ">
1018
<PublishTrimmed Condition=" '$(TargetFramework)' == 'net6.0-ios' or '$(TargetFramework)' == 'net6.0-maccatalyst' ">false</PublishTrimmed>

‎eng/Environment.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<PropertyGroup>
31-
<LangVersion>9.0</LangVersion>
31+
<LangVersion>latest</LangVersion>
3232
</PropertyGroup>
3333

3434
<!-- This is used by the libraries -->

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21327.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21369.5" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>e8b3b6bea1e37086869ba9aeafe65caa298537e7</Sha>
5+
<Sha>808795cca8cfaa143ef556cac0dc40d15d2dc186</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21368.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
9+
<Sha>8d3afa3a4a42021be024ffa4a1dee77e35d33911</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.7.91">
11+
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.7.93">
1212
<Uri>https://github.com/xamarin/xamarin-android</Uri>
13-
<Sha>4e6bf46eaecfab67e7344234bb0baf5157d480b1</Sha>
13+
<Sha>8ca289588b6969a2cc878afa0813afec8cd63dd3</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-preview.7182">
1616
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
@@ -28,81 +28,81 @@
2828
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
2929
<Sha>ff24f9104cac801db8f11825ecb9537b2c5799e6</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
31+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21365.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3232
<Uri>https://github.com/dotnet/aspnetcore</Uri>
33-
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
33+
<Sha>d4b2f7b482432dabbc900a5eb1fbe8fc304d1f61</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
35+
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-preview.7.21368.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
3636
<Uri>https://github.com/dotnet/runtime</Uri>
37-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
37+
<Sha>8d3afa3a4a42021be024ffa4a1dee77e35d33911</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
39+
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
4040
<Uri>https://github.com/dotnet/runtime</Uri>
41-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
41+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
43+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
4444
<Uri>https://github.com/dotnet/runtime</Uri>
45-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
45+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
4646
</Dependency>
47-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
47+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
4848
<Uri>https://github.com/dotnet/runtime</Uri>
49-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
49+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
51+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
5252
<Uri>https://github.com/dotnet/runtime</Uri>
53-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
53+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
55+
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
5656
<Uri>https://github.com/dotnet/runtime</Uri>
57-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
57+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
59+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
6060
<Uri>https://github.com/dotnet/runtime</Uri>
61-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
61+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
63+
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
6464
<Uri>https://github.com/dotnet/runtime</Uri>
65-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
65+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
67+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
6868
<Uri>https://github.com/dotnet/runtime</Uri>
69-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
69+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
71+
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
7272
<Uri>https://github.com/dotnet/runtime</Uri>
73-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
73+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
75+
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
7676
<Uri>https://github.com/dotnet/runtime</Uri>
77-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
77+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
7878
</Dependency>
79-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
79+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.1.21365.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8080
<Uri>https://github.com/dotnet/aspnetcore</Uri>
81-
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
81+
<Sha>d4b2f7b482432dabbc900a5eb1fbe8fc304d1f61</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
83+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-rc.1.21365.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8484
<Uri>https://github.com/dotnet/aspnetcore</Uri>
85-
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
85+
<Sha>d4b2f7b482432dabbc900a5eb1fbe8fc304d1f61</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
87+
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-rc.1.21365.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8888
<Uri>https://github.com/dotnet/aspnetcore</Uri>
89-
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
89+
<Sha>d4b2f7b482432dabbc900a5eb1fbe8fc304d1f61</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
91+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-rc.1.21365.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9292
<Uri>https://github.com/dotnet/aspnetcore</Uri>
93-
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
93+
<Sha>d4b2f7b482432dabbc900a5eb1fbe8fc304d1f61</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
95+
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-rc.1.21365.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9696
<Uri>https://github.com/dotnet/aspnetcore</Uri>
97-
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
97+
<Sha>d4b2f7b482432dabbc900a5eb1fbe8fc304d1f61</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21323.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21368.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
101-
<Sha>30d2e1ff863eaaf8fdadfc31aebfe653196a93b4</Sha>
101+
<Sha>ae83f4b81acb1d597842bfdb2e7c15960a572cfa</Sha>
102102
</Dependency>
103-
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
103+
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21365.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
104104
<Uri>https://github.com/dotnet/runtime</Uri>
105-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
105+
<Sha>90b8ddd7a6b28e57aebed7d478547ce07b9b60a6</Sha>
106106
</Dependency>
107107
</ProductDependencies>
108108
</Dependencies>

‎eng/Versions.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21326.8</MicrosoftNETCoreAppRefPackageVersion>
6-
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.7.91</MicrosoftAndroidSdkWindowsPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21369.5</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21368.2</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.7.93</MicrosoftAndroidSdkWindowsPackageVersion>
77
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-preview.7182</MicrosoftMacCatalystSdkPackageVersion>
88
<MicrosoftiOSSdkPackageVersion>15.0.100-preview.7182</MicrosoftiOSSdkPackageVersion>
99
<MicrosofttvOSSdkPackageVersion>15.0.100-preview.7182</MicrosofttvOSSdkPackageVersion>
1010
<MicrosoftmacOSSdkPackageVersion>12.0.100-preview.7182</MicrosoftmacOSSdkPackageVersion>
11-
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsPrimitivesPackageVersion>
12-
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsHostingAbstractionsPackageVersion>
13-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
14-
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsDependencyInjectionPackageVersion>
15-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
16-
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsConfigurationPackageVersion>
17-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
18-
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsLoggingPackageVersion>
19-
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsLoggingConsolePackageVersion>
20-
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsLoggingDebugPackageVersion>
21-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
22-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-preview.7.21325.3</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
23-
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreAuthorizationPackageVersion>
24-
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
25-
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreComponentsWebPackageVersion>
26-
<MicrosoftJSInteropPackageVersion>6.0.0-preview.7.21325.3</MicrosoftJSInteropPackageVersion>
27-
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
28-
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-preview.7.21323.1</MicrosoftWindowsDesktopAppRuntimewinx64Version>
29-
<SystemCodeDomPackageVersion>6.0.0-preview.7.21326.8</SystemCodeDomPackageVersion>
11+
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-preview.7.21368.2</MicrosoftExtensionsPrimitivesPackageVersion>
12+
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsHostingAbstractionsPackageVersion>
13+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
14+
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
15+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
16+
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsConfigurationPackageVersion>
17+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
18+
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsLoggingPackageVersion>
19+
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsLoggingConsolePackageVersion>
20+
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsLoggingDebugPackageVersion>
21+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-preview.7.21365.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
22+
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-rc.1.21365.18</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
23+
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-rc.1.21365.18</MicrosoftAspNetCoreAuthorizationPackageVersion>
24+
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-rc.1.21365.18</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
25+
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-rc.1.21365.18</MicrosoftAspNetCoreComponentsWebPackageVersion>
26+
<MicrosoftJSInteropPackageVersion>6.0.0-rc.1.21365.18</MicrosoftJSInteropPackageVersion>
27+
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-rc.1.21365.18</MicrosoftAspNetCoreAppRuntimewinx64Version>
28+
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-preview.7.21368.3</MicrosoftWindowsDesktopAppRuntimewinx64Version>
29+
<SystemCodeDomPackageVersion>6.0.0-preview.7.21365.2</SystemCodeDomPackageVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<!-- Trim all characters after first `-` or `+` is encountered. -->

‎src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6+
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
67
</PropertyGroup>
78

89
<ItemGroup>

‎src/Core/src/Animations/Ticker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public virtual void Stop()
4242
_timer = null;
4343
}
4444

45-
void OnTimerElapsed(object sender, ElapsedEventArgs e) =>
45+
void OnTimerElapsed(object? sender, ElapsedEventArgs e) =>
4646
Fire?.Invoke();
4747
}
4848
}

‎src/Core/src/Handlers/View/ViewHandler.Android.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public partial class ViewHandler
1111
{
1212
MauiAccessibilityDelegate? AccessibilityDelegate { get; set; }
1313

14-
partial void DisconnectingHandler(NativeView? nativeView)
14+
partial void DisconnectingHandler(NativeView nativeView)
1515
{
1616
if (nativeView.IsAlive() && AccessibilityDelegate != null)
1717
{

0 commit comments

Comments
 (0)