From aea45f7aaa8f73cb2a585d8b14ce66634d58cb68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 19:12:55 -0400 Subject: [PATCH] [main] Update dependencies from dotnet/installer (#94294) * Update dependencies from https://github.com/dotnet/installer build 20231102.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23531.20 -> To Version 9.0.100-alpha.1.23552.2 * [wasm] WBT: Update to track blazor moving to net9.0 * [wasm] WBT: Update blazor based test projects to net9.0 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Ankit Jain --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs | 4 ++-- .../wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs | 2 +- src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 2 +- src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 8 ++------ .../testassets/WasmBasicTestApp/WasmBasicTestApp.csproj | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bd97a1c84b44..439d3f47d57a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -397,9 +397,9 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/installer - 1cd40851378c6e4d82bcc911411d8b1fc9824365 + f461e05831c15ba5f844a35b9507271bd68c6716 diff --git a/eng/Versions.props b/eng/Versions.props index 724367c611ef7..5baf0422e021a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,7 +248,7 @@ 3.1.7 1.0.406601 - 9.0.100-alpha.1.23531.20 + 9.0.100-alpha.1.23552.2 $(MicrosoftDotnetSdkInternalVersion) diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs index b006bf7a93e5c..10717b334174b 100644 --- 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!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs); + File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs); AddItemsPropertiesToProject(projectFile, extraItems: @""); 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 = "Components/Pages/Counter.razor") + private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor") { string additionalCode = $$"""

Output: @outputText

diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs index 7ca663dce5372..cbe3e461ec9cd 100644 --- 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: "true"); - string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor"); + string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor"); string allText = File.ReadAllText(counterPath); string ccText = "currentCount++;"; if (allText.IndexOf(ccText) < 0) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index 3f878fb23b6c4..52438daac5ddf 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -26,7 +26,7 @@ namespace Wasm.Build.Tests public abstract class BuildTestBase : IClassFixture, IDisposable { public const string DefaultTargetFramework = "net9.0"; - public const string DefaultTargetFrameworkForBlazor = "net8.0"; + public const string DefaultTargetFrameworkForBlazor = "net9.0"; public const string TargetFrameworkForTasks = "net8.0"; private const string DefaultEnvironmentLocale = "en-US"; protected static readonly char s_unicodeChar = '\u7149'; diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj index a4ac1a26d960c..ac0c4fb1de2af 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -106,12 +106,8 @@ <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER9" /> - - <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER8" /> - - - + <_RuntimePackVersions Include="$(PackageVersionNet8)" EnvVarName="RUNTIME_PACK_VER8" Condition="'$(PackageVersionNet8)' != ''" /> + <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER8" Condition="'$(PackageVersionNet8)' == ''" /> <_RuntimePackVersions Include="$(PackageVersionNet7)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' != ''" /> <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' == ''" /> <_RuntimePackVersions Include="$(PackageVersionNet6)" EnvVarName="RUNTIME_PACK_VER6" /> diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj index 33858b9a6a755..b2cd49a550939 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 browser-wasm Exe true