[main] Update dependencies from dotnet/installer (#93066)

* Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231010.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23510.1 * Update dependencies from https://github.com/dotnet/installer build 20231011.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23511.2 * Update dependencies from https://github.com/dotnet/installer build 20231011.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23511.2 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * [wasm] WBT: Update blazor tests to track changed path for Pages .. from `Pages/` to `Components/Pages/`. * add comment --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Ankit Jain <radical@gmail.com>
dotnet · Oct 17, 2023 · 82c936b · 82c936b
1 parent c657cb0
commit 82c936b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -398,9 +398,9 @@
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
       <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
+      <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -251,7 +251,7 @@
     <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
     <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
     <!-- installer version, for testing workloads -->
-    <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
+    <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
     <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
   </PropertyGroup>
 </Project>
diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets
@@ -23,6 +23,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Required for running apps built with 9.0 sdk, but the sdk does
+         not yet support *running* with 9.0 sdk -->
+    <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />
+
     <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
     <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
     <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
@@ -78,6 +82,19 @@
     <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
           IgnoreStandardErrorWarningFormat="true"
           Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
+
+    <!-- Install additional shared frameworks -->
+    <PropertyGroup>
+      <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
+    </PropertyGroup>
+    <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
+    <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
+          IgnoreStandardErrorWarningFormat="true"
+          Command="$(_DotNetInstallCommand)" />
+
+    <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
+          IgnoreStandardErrorWarningFormat="true"
+          Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
   </Target>
 
   <Target Name="_GetDotNetVersion">

diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs
@@ -63,7 +63,7 @@ public static class MyDllImports
                 public static extern int cpp_add(int a, int b);
             }}";
 
-        File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
+        File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);
 
         AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
         BlazorAddRazorButton("cpp_add", """
@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
         Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
     }
 
-    private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
+    private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
     {
         string additionalCode = $$"""
             <p role="{{methodName}}">Output: @outputText</p>

diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs
@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
         if (invariant)
             AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");
 
-        string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
+        string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
         string allText = File.ReadAllText(counterPath);
         string ccText = "currentCount++;";
         if (allText.IndexOf(ccText) < 0)