Merged PR 49622: [internal/release/9.0] Merge from public

Merge from public release/9.0 to internal/release/9.0 and resolve conflicts if necessary

Author: vseanreesermsft

eng/Version.Details.xml

@@ -414,13 +414,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.5.0-preview.1.25204.8">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.5.0-preview.1.25211.2">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>2fbf99834c90a20b950b44b3dcdd2b264b422a59</Sha>
+      <Sha>f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.5.0-preview.1.25204.8">
+    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.5.0-preview.1.25211.2">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>2fbf99834c90a20b950b44b3dcdd2b264b422a59</Sha>
+      <Sha>f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13</Sha>
     </Dependency>
     <Dependency Name="NuGet.Frameworks" Version="6.2.4">
       <Uri>https://github.com/nuget/nuget.client</Uri>

eng/Versions.props

@@ -143,8 +143,8 @@
     <SystemIOHashingVersion>9.0.5</SystemIOHashingVersion>
     <SystemRuntimeCachingVersion>9.0.5</SystemRuntimeCachingVersion>
     <!-- Packages from dotnet/extensions -->
-    <MicrosoftExtensionsDiagnosticsTestingVersion>9.5.0-preview.1.25204.8</MicrosoftExtensionsDiagnosticsTestingVersion>
-    <MicrosoftExtensionsTimeProviderTestingVersion>9.5.0-preview.1.25204.8</MicrosoftExtensionsTimeProviderTestingVersion>
+    <MicrosoftExtensionsDiagnosticsTestingVersion>9.5.0-preview.1.25211.2</MicrosoftExtensionsDiagnosticsTestingVersion>
+    <MicrosoftExtensionsTimeProviderTestingVersion>9.5.0-preview.1.25211.2</MicrosoftExtensionsTimeProviderTestingVersion>
     <!-- Packages from dotnet/efcore -->
     <dotnetefVersion>9.0.5</dotnetefVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.5</MicrosoftEntityFrameworkCoreInMemoryVersion>

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

@@ -90,11 +90,27 @@
         <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
       </V5AssetsCandidates>
     </ItemGroup>
-    
-    <DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">
+
+    <DefineStaticWebAssets
+      Condition="'@(V4AssetsCandidates->Count())' != '0'"
+      CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)"
+      SourceType="Package"
+      AssetKind="All"
+      ContentRoot="assets/V4"
+      BasePath="$(StaticWebAssetBasePath)"
+    >
       <Output TaskParameter="Assets" ItemName="V4Assets" />
     </DefineStaticWebAssets>
-    <DefineStaticWebAssets Condition="'@(V5AssetsCandidates->Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
+
+    <DefineStaticWebAssets
+      Condition="'@(V5AssetsCandidates->Count())' != '0'"
+      CandidateAssets="@(V5AssetsCandidates)"
+      SourceId="$(PackageId)"
+      SourceType="Package"
+      AssetKind="All"
+      ContentRoot="assets/V5"
+      BasePath="$(StaticWebAssetBasePath)"
+    >
       <Output TaskParameter="Assets" ItemName="V5Assets" />
     </DefineStaticWebAssets>
 
@@ -106,7 +122,7 @@
     >
       <Output TaskParameter="Endpoints" ItemName="V4AssetEndpoints" />
     </DefineStaticWebAssetEndpoints>
-    
+
     <DefineStaticWebAssetEndpoints
       Condition="'@(V5Assets)' != ''"
       CandidateAssets="@(V5Assets)"
@@ -116,23 +132,34 @@
       <Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />
     </DefineStaticWebAssetEndpoints>
 
-    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
-    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
+    <ItemGroup>
+      <FinalV4Assets Include="@(V4Assets)">
+        <SourceType>Discovered</SourceType>
+      </FinalV4Assets>
+      <FinalV5Assets Include="@(V5Assets)">
+        <SourceType>Discovered</SourceType>
+      </FinalV5Assets>
+    </ItemGroup>
+
+    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
+    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
 
     <GenerateStaticWebAssetEndpointsPropsFile
       StaticWebAssets="@(V4Assets)"
+      PackagePathPrefix="staticwebassets/V4"
       StaticWebAssetEndpoints="@(V4AssetEndpoints)"
       TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets" />
 
     <GenerateStaticWebAssetEndpointsPropsFile
       StaticWebAssets="@(V5Assets)"
+      PackagePathPrefix="staticwebassets/V5"
       StaticWebAssetEndpoints="@(V5AssetEndpoints)"
       TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets" />
 
-    <ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
+    <ComputeStaticWebAssetsTargetPaths Assets="@(FinalV4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
       <Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
     </ComputeStaticWebAssetsTargetPaths>
-    <ComputeStaticWebAssetsTargetPaths Assets="@(V5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">
+    <ComputeStaticWebAssetsTargetPaths Assets="@(FinalV5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">
       <Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
     </ComputeStaticWebAssetsTargetPaths>