Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-4d052d6b-8c82-467a-8ff8-d92a7fd0f08e

Author: v-wuzhai

NuGet.config

@@ -28,7 +28,7 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-fc19b05" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fc19b051/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-18a02f8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-18a02f8a/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

@@ -69,18 +69,18 @@
       <Sha>78be8cdf4f0bfd93018fd7a87f8282a41d041298</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.14.4">
+    <Dependency Name="Microsoft.Build" Version="17.14.7">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
+      <Sha>18a02f8a6ac183748b41466337dd15a0124b16d4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.14.4-preview-25207-08">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.14.7-preview-25230-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
+      <Sha>18a02f8a6ac183748b41466337dd15a0124b16d4</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.4-preview-25207-08">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.7-preview-25230-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
+      <Sha>18a02f8a6ac183748b41466337dd15a0124b16d4</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25181.1">

eng/Versions.props

@@ -6,7 +6,7 @@
     <VersionMajor>9</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>3</VersionSDKMinor>
-    <VersionFeature>00</VersionFeature>
+    <VersionFeature>01</VersionFeature>
     <!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
          It should always be the hundreds-value of the current SDK version, never any
          preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -182,8 +182,8 @@
          At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
 
          Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
-    <MicrosoftBuildVersion>17.14.4</MicrosoftBuildVersion>
-    <MicrosoftBuildLocalizationVersion>17.14.4-preview-25207-08</MicrosoftBuildLocalizationVersion>
+    <MicrosoftBuildVersion>17.14.7</MicrosoftBuildVersion>
+    <MicrosoftBuildLocalizationVersion>17.14.7-preview-25230-05</MicrosoftBuildLocalizationVersion>
     <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
     <MinimumVSVersion>17.12</MinimumVSVersion>
   </PropertyGroup>

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets

@@ -405,8 +405,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       <!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as
            a content item, we'll prefer that over the potential item in the None item group
       -->
-      <_JSFileModuleCandidates Include="@(Content)" />
-      <_JSFileModuleNoneCandidates Include="@(None)" Exclude="@(Content)" />
+      <_JSFileModuleCandidates Include="@(Content->Distinct())" />
+      <_JSFileModuleNoneCandidates Include="@(None->Distinct())" Exclude="@(Content)" />
       <_JSFileModuleCandidates Include="@(_JSFileModuleNoneCandidates)" />
     </ItemGroup>
 

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets

@@ -676,7 +676,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
 
     <DefineStaticWebAssets
-      CandidateAssets="@(Content)"
+      CandidateAssets="@(Content->Distinct())"
       FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
       FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
       RelativePathPattern="wwwroot/**"
@@ -717,10 +717,23 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="OriginalAssets" ItemName="_OriginalPackageAssets" />
     </UpdatePackageStaticWebAssets>
 
+    <ItemGroup>
+      <_AssetsWithoutEndpoints Include="@(_UpdatedPackageAssets)" Exclude="@(StaticWebAssetEndpoint->'%(AssetFile)')" />
+    </ItemGroup>
+
+    <DefineStaticWebAssetEndpoints
+      CandidateAssets="@(_AssetsWithoutEndpoints)"
+      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
+    >
+      <Output TaskParameter="Endpoints" ItemName="_UpdatedPackageAssetsEndpoint" />
+    </DefineStaticWebAssetEndpoints>
+
     <ItemGroup>
       <StaticWebAsset Remove="@(_OriginalPackageAssets)"/>
       <StaticWebAsset Include="@(_UpdatedPackageAssets)" />
+      <StaticWebAssetEndpoint Include="@(_UpdatedPackageAssetsEndpoint)" />
     </ItemGroup>
+
   </Target>
 
   <Import Project="Microsoft.NET.Sdk.StaticWebAssets.Publish.targets" />

src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props

@@ -26,7 +26,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the
          up-to-date check is unimpacted by the changes to the tooling artifacts -->
     <None Remove="@(_WebToolingArtifacts)" />
-    <None Include="@(_WebToolingArtifacts)"
+    <None Include="@(_WebToolingArtifacts->Distinct())"
           CopyToOutputDirectory="Never"
           CopyToPublishDirectory="Never"
           ExcludeFromSingleFile="true" />