Skip to content

Commit

Permalink
[release/6.0.1xx-rc1] Update dependencies from xamarin/xamarin-android (
Browse files Browse the repository at this point in the history 
#2369)

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-rc1-3793f6e34c40e3aa1a00d0dbe6dd0d706283e197-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.100-rc.1.12 -> To Version 31.0.100-rc.1.16

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting,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.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-rc.1.21426.8 -> To Version 6.0.0-rc.1.21451.13 (parent: Microsoft.Dotnet.Sdk.Internal

* Remove incorrect LangVersion 9.0 and use default

Razor Source Generator needs at least 10.0

* Explicitly set LangVersion=10.0

* Use $(LangVersion) preview, because dotnet/maui builds with VS

Context: dotnet/sdk@10efeed...454eae3

This was removed from the dotnet/sdk:

    <!-- Required to support incremental source generator -->
    <LangVersion Condition="'$(UseRazorSourceGenerator)' != '' ">preview</LangVersion>

So I think we need to opt into `preview` to build with the older
Roslyn in VS.

* Keep Controls.Core.UnitTests on C# 9

This apparently breaks NUnit `Assert.That()` calls.

I could build the project locally after this change.

* Try start vs4mac with local dotnet

* Revert "Try start vs4mac with local dotnet"

This reverts commit 85ce42d.

* Update LifecycleEventsTests.cs

I think we might also be hitting some method overloading issues in these test failures:

* `CanAddMultipleEventsViaMultipleConfigureLifecycleEvents`
* `CanAddMultipleEventsViaBuilder`
* `EventsFireExactlyOnce`

* Revert "Update LifecycleEventsTests.cs"

This reverts commit 90c233d.

* Keep Core.UnitTests on C# 9

This solves 3 test failures:

    > .\bin\dotnet\dotnet.exe test src\Core\tests\UnitTests\Core.UnitTests-net6.csproj -bl
    ...
    [xUnit.net 00:00:00.60]     CanAddMultipleEventsViaMultipleConfigureLifecycleEvents [FAIL]
    Failed CanAddMultipleEventsViaMultipleConfigureLifecycleEvents [10 ms]
    Error Message:
        Assert.Equal() Failure
        Expected: 1
        Actual:   0
    Stack Trace:
        at Microsoft.Maui.UnitTests.LifecycleEvents.LifecycleEventsTests.CanAddMultipleEventsViaMultipleConfigureLifecycleEvents() in C:\src\maui\src\Core\tests\UnitTests\LifecycleEvents\LifecycleEventsTests.cs:line 134
    [xUnit.net 00:00:00.62]     EventsFireExactlyOnce [FAIL]
    [xUnit.net 00:00:00.62]     CanAddMultipleEventsViaBuilder [FAIL]
    Failed EventsFireExactlyOnce [2 ms]
    Error Message:
        Assert.Equal() Failure
        Expected: 1
        Actual:   0
    Stack Trace:
        at Microsoft.Maui.UnitTests.LifecycleEvents.LifecycleEventsTests.EventsFireExactlyOnce() in C:\src\maui\src\Core\tests\UnitTests\LifecycleEvents\LifecycleEventsTests.cs:line 75
    Failed CanAddMultipleEventsViaBuilder [2 ms]
    Error Message:
        Assert.Equal() Failure
        Expected: 1
        Actual:   0
    Stack Trace:
        at Microsoft.Maui.UnitTests.LifecycleEvents.LifecycleEventsTests.CanAddMultipleEventsViaBuilder() in C:\src\maui\src\Core\tests\UnitTests\LifecycleEvents\LifecycleEventsTests.cs:line 156
    Failed!  - Failed:     3, Passed:   367, Skipped:     0, Total:   370, Duration: 192 ms - Microsoft.Maui.UnitTests.dll (net6.0)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
  • Loading branch information
@dotnet-maestro @Eilon
@jonathanpeppers @rmarinho
5 people committed Sep 3, 2021
1 parent d2ffa35 commit 294dff1
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 74 deletions.
2 changes: 1 addition & 1 deletion eng/Environment.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</PropertyGroup>

<PropertyGroup>
<LangVersion>latest</LangVersion>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<!-- This is used by the libraries -->
Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21426.23" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21452.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>91aa470f1e6c40e1de1050f5ea63480e14fdc592</Sha>
<Sha>3f29ca0c1497b2cc723671938299e99dff90069f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.100-rc.1.12">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.100-rc.1.16">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>eadb58fc2d6e32759c1e6a8e500b4cfec36a0a51</Sha>
<Sha>3793f6e34c40e3aa1a00d0dbe6dd0d706283e197</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-rc.1.1534">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -28,81 +28,81 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>25ff25166b865b5c0869f924706aed115edb11e4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21425.34" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21451.36" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6fe6de59abd1eedacd5fa50493b936e87e1f8132</Sha>
<Sha>516f7ba4cb94c600ddce4aa4bc7088f6366ef066</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-rc.1.21425.34" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-rc.1.21451.36" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6fe6de59abd1eedacd5fa50493b936e87e1f8132</Sha>
<Sha>516f7ba4cb94c600ddce4aa4bc7088f6366ef066</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-rc.1.21425.34" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-rc.1.21451.36" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6fe6de59abd1eedacd5fa50493b936e87e1f8132</Sha>
<Sha>516f7ba4cb94c600ddce4aa4bc7088f6366ef066</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-rc.1.21425.34" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-rc.1.21451.36" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6fe6de59abd1eedacd5fa50493b936e87e1f8132</Sha>
<Sha>516f7ba4cb94c600ddce4aa4bc7088f6366ef066</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-rc.1.21425.34" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-rc.1.21451.36" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>6fe6de59abd1eedacd5fa50493b936e87e1f8132</Sha>
<Sha>516f7ba4cb94c600ddce4aa4bc7088f6366ef066</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-rc.1.21426.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-rc.1.21451.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>e2050f7eb3a26db403e39fed0da33aa098cc554c</Sha>
<Sha>f7325d55937fbfcd28a1b61fcbea420f2fc79c72</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21426.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21451.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>476a03e554142c324f05045966d4b9fc28d70bd1</Sha>
<Sha>d7619cd4b165c13430484e381042f055d4c5a9c7</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
44 changes: 22 additions & 22 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21426.23</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21426.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.100-rc.1.12</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21452.4</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21451.13</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.100-rc.1.16</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-rc.1.1534</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.0.100-rc.1.1534</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.0.100-rc.1.1534</MicrosofttvOSSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.0.100-rc.1.1534</MicrosoftmacOSSdkPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-rc.1.21426.8</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-rc.1.21425.34</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-rc.1.21425.34</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-rc.1.21425.34</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftJSInteropPackageVersion>6.0.0-rc.1.21425.34</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-rc.1.21425.34</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-rc.1.21426.11</MicrosoftWindowsDesktopAppRuntimewinx64Version>
<SystemCodeDomPackageVersion>6.0.0-rc.1.21426.8</SystemCodeDomPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-rc.1.21451.36</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-rc.1.21451.36</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-rc.1.21451.36</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftJSInteropPackageVersion>6.0.0-rc.1.21451.36</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-rc.1.21451.36</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-rc.1.21451.3</MicrosoftWindowsDesktopAppRuntimewinx64Version>
<SystemCodeDomPackageVersion>6.0.0-rc.1.21451.13</SystemCodeDomPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->
Expand Down
1 change: 0 additions & 1 deletion src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net6.0;$(MauiPlatforms)</TargetFrameworks>
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>
<Description>Build .NET MAUI applications with Blazor web UI in the BlazorWebView control.</Description>
</PropertyGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>9.0</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
Expand Down
5 changes: 5 additions & 0 deletions src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests-net6.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<AssemblyName>Microsoft.Maui.Controls.Core.UnitTests</AssemblyName>
<IsPackable>false</IsPackable>
<NoWarn>0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014</NoWarn>
<!--
NOTE: Keep this project on C# 9 to avoid changes in overload resolution:
src/Controls/tests/Core.UnitTests/TemplatedItemsListTests.cs(543,11): error CS0121: The call is ambiguous between the following methods or properties: 'Assert.That(TestDelegate, IResolveConstraint)' and 'Assert.That<TActual>(TActual, IResolveConstraint)'
-->
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions src/Core/tests/UnitTests/Core.UnitTests-net6.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.Maui.UnitTests</AssemblyName>
<IsPackable>false</IsPackable>
<!-- Solves: LifecycleEventsTests.cs(26,77): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. -->
<LangVersion>preview</LangVersion>
<!--
NOTE: Keep this project on C# 9 to avoid changes in overload resolution, test failures:
CanAddMultipleEventsViaMultipleConfigureLifecycleEvents, CanAddMultipleEventsViaBuilder, EventsFireExactlyOnce
-->
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SingleProject/Resizetizer/src/Resizetizer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>Microsoft.Maui.Resizetizer</RootNamespace>
<AssemblyName>Microsoft.Maui.Resizetizer</AssemblyName>
<!--<Nullable>enable</Nullable>-->
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion>
<IsPackable>false</IsPackable>
<IsTrimmable>false</IsTrimmable>
</PropertyGroup>
Expand Down

0 comments on commit 294dff1

Please sign in to comment.