Merge things from release/9.0.1xx-preview7 into net9.0 (#24070)

### Description of Change Merge latest changes on the release branch back into the dev branch.
dotnet · Aug 8, 2024 · 5ef168d · 5ef168d
2 parents 50e9fe0 + 603c831
commit 5ef168d
Show file tree

Hide file tree

Showing 69 changed files with 1,542 additions and 908 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -65,7 +65,7 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
-<!--
+  <!--
     Disable generation of obj/Debug/net8.0-android/__Microsoft.Android.Resource.Designer.cs
     Enable this individually in projects that declare/use AndroidResource IDs.
   -->

diff --git a/eng/NuGetVersions.targets b/eng/NuGetVersions.targets
@@ -189,6 +189,51 @@
         Update="Microsoft.JSInterop"
         Version="$(MicrosoftJSInteropPackageVersion)"
     />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Authorization"
+        Version="$(MicrosoftAspNetCoreAuthorizationPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Authentication.Google"
+        Version="$(MicrosoftAspNetCoreAuthenticationGooglePreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Authentication.Facebook"
+        Version="$(MicrosoftAspNetCoreAuthenticationFacebookPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Authentication.MicrosoftAccount"
+        Version="$(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Components.WebView"
+        Version="$(MicrosoftAspNetCoreComponentsWebViewPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Components.Web"
+        Version="$(MicrosoftAspNetCoreComponentsWebPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Components.WebAssembly"
+        Version="$(MicrosoftAspNetCoreComponentsWebAssemblyPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Components.WebAssembly.Server"
+        Version="$(MicrosoftAspNetCoreComponentsWebAssemblyServerPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
+    <PackageReference
+        Update="Microsoft.JSInterop"
+        Version="$(MicrosoftJSInteropPreviousPackageVersion)"
+        Condition="$(TargetFramework.StartsWith('$(_MauiPreviousDotNetTfm)'))"
+    />
     <PackageReference
         Update="System.Text.Json"
         Version="$(SystemTextJsonPackageVersion)"

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,32 +1,32 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.7.24379.15">
+    <Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.7.24406.8">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>812e813ae9785966b854002d35507c123c858ced</Sha>
+      <Sha>749beb4e6b574d6fc4aae23529a9d1774fbb6e8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.0-preview.7.34">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.0-preview.7.41">
       <Uri>https://github.com/dotnet/android</Uri>
-      <Sha>0f68e068519bcc9509be88037501f77593222e73</Sha>
+      <Sha>a9d10b46ae97533f81586279684a9632aeb680cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_17.5" Version="17.5.9220-net9-p7">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_17.5" Version="17.5.9231-net9-p7">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>f6a32320a02128b551f1e417b46c28a2722a6479</Sha>
+      <Sha>0e30307e6ba562d79918101752e1a633028222a2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk.net9.0_14.5" Version="14.5.9220-net9-p7">
+    <Dependency Name="Microsoft.macOS.Sdk.net9.0_14.5" Version="14.5.9231-net9-p7">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>f6a32320a02128b551f1e417b46c28a2722a6479</Sha>
+      <Sha>0e30307e6ba562d79918101752e1a633028222a2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk.net9.0_17.5" Version="17.5.9220-net9-p7">
+    <Dependency Name="Microsoft.iOS.Sdk.net9.0_17.5" Version="17.5.9231-net9-p7">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>f6a32320a02128b551f1e417b46c28a2722a6479</Sha>
+      <Sha>0e30307e6ba562d79918101752e1a633028222a2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk.net9.0_17.5" Version="17.5.9220-net9-p7">
+    <Dependency Name="Microsoft.tvOS.Sdk.net9.0_17.5" Version="17.5.9231-net9-p7">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>f6a32320a02128b551f1e417b46c28a2722a6479</Sha>
+      <Sha>0e30307e6ba562d79918101752e1a633028222a2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
@@ -35,105 +35,105 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>75567e63c265cb0a69bb11f8024349eda83f0878</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.7.24379.2">
+    <Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.7.24406.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>41a338d8befba633f5349a0344842ae1a9211817</Sha>
+      <Sha>abc2c7226ff616316cd1e05d76e6c36b49ce06a1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-preview.2.22102.8">
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.0-preview.7.24405.7" CoherentParentDependency="Microsoft.AspNetCore.Authorization">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+      <Sha>0d79e6de8dbc26a44dde336a9a680940e92e9904</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24379.2">
       <Uri>https://github.com/dotnet/xharness</Uri>