[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx'

eng/Versions.props

@@ -39,22 +39,6 @@
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
   </PropertyGroup>
-  <PropertyGroup Label="AspNetCore template versioning">
-    <!-- Automated versions for asp.net templates -->
-    <MicrosoftNETSdkPatchVersion>$(VersionFeature)</MicrosoftNETSdkPatchVersion>
-    <!--
-      Between branding and shipping, the templates should stay at last month's version.
-      If the incoming SDK version is 2 versions behind us, we know we just branded but haven't done the internal -> public merge yet.
-      Therefore we stay at last month's version.
-      We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
-      Instead the indicator is that the incoming SDK version is not RTM or greater yet.
-      Preview releases already use -1 versionining so don't subtract one for that version.
-      In public builds, we always use the 2 month old version.
-    -->
-    <SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
-    <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
-    <SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(PreReleaseVersionLabel.Contains('rtm')) AND ! $(PreReleaseVersionLabel.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
-  </PropertyGroup>
   <PropertyGroup Label="Restore feeds">
     <!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
     <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.blob.core.windows.net/public/</DotNetAssetRootUrl>

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

@@ -36,10 +36,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ResolveCoreStaticWebAssetsDependsOn>
       $(ResolveCoreStaticWebAssetsDependsOn);
-      ResolveJSModuleStaticWebAssets;
       ResolveJsInitializerModuleStaticWebAssets;
     </ResolveCoreStaticWebAssetsDependsOn>
 
+    <ResolveCoreStaticWebAssetsDependsOn Condition="'$(UsingMicrosoftNETSdkRazor)' == 'true'">
+      $(ResolveCoreStaticWebAssetsDependsOn);
+      ResolveJSModuleStaticWebAssets;
+    </ResolveCoreStaticWebAssetsDependsOn>
+
   </PropertyGroup>
 
   <PropertyGroup>
@@ -229,7 +233,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   >
     <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSBuildModuleEndpoints" />
   </ResolveStaticWebAssetEndpointRoutes>
-  
+
     <GenerateJsModuleManifest
       Condition="'@(_ExistingBuildJSModules)' != ''"
       OutputFile="@(_JsModuleBuildManifestCandidate)"
@@ -341,7 +345,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     >
       <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSPublishModuleEndpoints" />
     </ResolveStaticWebAssetEndpointRoutes>
-  
+
     <GenerateJsModuleManifest
       Condition="'@(_ExistingPublishJSModules)' != ''"
       OutputFile="@(_JsModulePublishManifestCandidate)"
@@ -389,7 +393,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!-- JS file modules -->
-  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets">
+  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets;ResolveRazorComponentInputs;ResolveRazorGenerateInputs">
 
     <ItemGroup>
       <!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as

test/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs

@@ -410,15 +410,32 @@ public void RegeneratingScopedCss_ForProject()
 
             // Make an edit
             var scopedCssFile = Path.Combine(ProjectDirectory.TestRoot, "Components", "Pages", "Index.razor.css");
-            File.WriteAllLines(scopedCssFile, File.ReadAllLines(scopedCssFile).Concat(new[] { "body { background-color: orangered; }" }));
+            File.WriteAllLines(scopedCssFile, File.ReadAllLines(scopedCssFile).Concat(["body { background-color: orangered; }"]));
+
+            build = CreateBuildCommand(ProjectDirectory);
+            ExecuteCommand(build, "/t:UpdateStaticWebAssetsDesignTime").Should().Pass();
+
+            // Verify the generated file contains newly added css
+            AssertFileContains(bundlePath, "background-color: orangered");
+
+            // Verify that CSS edits continue to apply after new JS modules are added to the project
+            // https://github.com/dotnet/aspnetcore/issues/57599
+            var collocatedJsFile = Path.Combine(ProjectDirectory.TestRoot, "Components", "Pages", "Index.razor.js");
+            File.WriteAllLines(collocatedJsFile, ["console.log('Hello, world!');"]);
+            File.WriteAllLines(scopedCssFile, File.ReadAllLines(scopedCssFile).Concat(["h1 { color: purple; }"]));
 
             build = CreateBuildCommand(ProjectDirectory);
             ExecuteCommand(build, "/t:UpdateStaticWebAssetsDesignTime").Should().Pass();
 
-            var fileInfo = new FileInfo(bundlePath);
-            fileInfo.Should().Exist();
             // Verify the generated file contains newly added css
-            fileInfo.ReadAllText().Should().Contain("background-color: orangered");
+            AssertFileContains(bundlePath, "color: purple");
+
+            static void AssertFileContains(string fileName, string content)
+            {
+                var fileInfo = new FileInfo(fileName);
+                fileInfo.Should().Exist();
+                fileInfo.ReadAllText().Should().Contain(content);
+            }
         }
     }