From 48fbf9a28e290b53ea524f0bf3773ce445936d58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 12:47:18 +0000 Subject: [PATCH 01/20] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index feb9e1d1ff7a9..76ee7f3dc8283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,9 +402,9 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/installer - b1a461bdca599a57ee454502015263c9896c8970 + a382864dae552097c5a3245bcbf92d226f3d1fe9 diff --git a/eng/Versions.props b/eng/Versions.props index 39b4d475f5928..724b18b4d103d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -253,7 +253,7 @@ 3.1.7 1.0.406601 - 9.0.100-alpha.1.23503.1 + 9.0.100-alpha.1.23504.14 $(MicrosoftDotnetSdkInternalVersion) From 8cfb56fe48a9fa9b35930824b3ed2dc8491b6143 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 12:47:23 +0000 Subject: [PATCH 02/20] 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 From d0141eb390be97502a64087e1d5c39409698f3e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Oct 2023 12:45:26 +0000 Subject: [PATCH 03/20] 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 From 9337be072cf6b5565de5dee096e7517d55cff072 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Oct 2023 12:39:32 +0000 Subject: [PATCH 04/20] 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 From 593f5e539708625cd91fb819234a79ff66d08ad7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 12:43:58 +0000 Subject: [PATCH 05/20] 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 From 84390ea024cfef1cbbec63703bf016095b55ec4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 12:52:07 +0000 Subject: [PATCH 06/20] 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 From 29367819e24c9bc4b8941bf4fe14482d906ab849 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Oct 2023 12:49:54 +0000 Subject: [PATCH 07/20] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76ee7f3dc8283..012b64e5ee712 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,9 +402,9 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/installer - a382864dae552097c5a3245bcbf92d226f3d1fe9 + 330d6ba6903f4d337cd23a0d18afbc9d70b33faf diff --git a/eng/Versions.props b/eng/Versions.props index 724b18b4d103d..3b2ff67a2908b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -253,7 +253,7 @@ 3.1.7 1.0.406601 - 9.0.100-alpha.1.23504.14 + 9.0.100-alpha.1.23510.1 $(MicrosoftDotnetSdkInternalVersion) From 25961d1156b3ed8cf684aaa9c56d78a8b2cecdfe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:53:37 +0000 Subject: [PATCH 08/20] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 012b64e5ee712..00265b8abb07f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,9 +402,9 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/installer - 330d6ba6903f4d337cd23a0d18afbc9d70b33faf + c189dd57c41de7212040ba10575a1673960da6fd diff --git a/eng/Versions.props b/eng/Versions.props index 3b2ff67a2908b..9b31e3bffa99f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -253,7 +253,7 @@ 3.1.7 1.0.406601 - 9.0.100-alpha.1.23510.1 + 9.0.100-alpha.1.23511.2 $(MicrosoftDotnetSdkInternalVersion) From c04ad7906acce7a1b661beb2faf000d2e82f09f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 19:51:57 +0000 Subject: [PATCH 09/20] 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 From 795671e13505b6e2dc73f6ec59ecd589aeaae720 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:46:56 +0000 Subject: [PATCH 10/20] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00265b8abb07f..8a68478386136 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,9 +402,9 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/installer - c189dd57c41de7212040ba10575a1673960da6fd + 24f9beb4d84f0b4aa03d380c76b181a79e14f6ec diff --git a/eng/Versions.props b/eng/Versions.props index 9b31e3bffa99f..8eddd7b8a2fef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -253,7 +253,7 @@ 3.1.7 1.0.406601 - 9.0.100-alpha.1.23511.2 + 9.0.100-alpha.1.23512.15 $(MicrosoftDotnetSdkInternalVersion) From c32c9aff19c826d84b818a0014b66ab327ce7de6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:49:05 +0000 Subject: [PATCH 11/20] 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 From 0849b81d000cf3f05005e1f5b036bd4f200bc322 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Oct 2023 12:43:36 +0000 Subject: [PATCH 12/20] 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 From 841c31b22252bc373ae1f9da4cfd08a150e40d63 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 16 Oct 2023 22:30:07 +0000 Subject: [PATCH 13/20] wip --- .../WorkloadManifest.targets.in | 2 +- src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 6 +++--- .../Wasm.Build.Tests/Common/BuildEnvironment.cs | 2 +- .../Wasm.Build.Tests/NonWasmTemplateBuildTests.cs | 4 ++-- .../Templates/WasmTemplateTests.cs | 14 ++++++++++---- .../wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 2 ++ .../wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in index 061fea9acaa14..7a8f71ee1cca3 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in @@ -8,7 +8,7 @@ true - true + false true diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index 82bb029fdac7e..68a30b8ce941e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -25,7 +25,7 @@ namespace Wasm.Build.Tests { public abstract class BuildTestBase : IClassFixture, IDisposable { - public const string DefaultTargetFramework = "net8.0"; + public const string DefaultTargetFramework = "net9.0"; public const string DefaultTargetFrameworkForBlazor = "net8.0"; private const string DefaultEnvironmentLocale = "en-US"; protected static readonly char s_unicodeChar = '\u7149'; @@ -54,8 +54,8 @@ public abstract class BuildTestBase : IClassFixture s_buildEnv.IsWorkloadWithMultiThreadingForDefaultFramework; public static bool UseWebcil => s_buildEnv.UseWebcil; public static string GetNuGetConfigPathFor(string targetFramework) => - Path.Combine(BuildEnvironment.TestDataPath, "nuget8.config"); // for now - we are still using net7, but with - // targetFramework == "net7.0" ? "nuget7.config" : "nuget8.config"); + Path.Combine(BuildEnvironment.TestDataPath, "nuget9.config"); + //Path.Combine(BuildEnvironment.TestDataPath, targetFramework == "net8.0" ? "nuget8.config" : "nuget9.config"); public TProvider GetProvider() where TProvider : ProjectProviderBase => (TProvider)_providerOfBaseType; diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs index 37a7668b5d099..eea13ab7058eb 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs @@ -82,7 +82,7 @@ public BuildEnvironment() sdkForWorkloadPath = Path.GetFullPath(sdkForWorkloadPath); // FIXME: - foreach (string verStr in new[] { "8", "7", "6" }) + foreach (string verStr in new[] { "9", "8", "7", "6" }) { string versionValue = Environment.GetEnvironmentVariable($"RUNTIME_PACK_VER{verStr}") ?? string.Empty; s_runtimePackVersions[$"net{verStr}.0"] = versionValue; diff --git a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs index 579debf24502d..4f86c39c3addf 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs @@ -25,8 +25,8 @@ public NonWasmTemplateBuildTests(ITestOutputHelper output, SharedBuildPerTestCla // // This is useful for the case when we are on tfm=net7.0, but sdk, and packages // are really 8.0 . - private const string s_latestTargetFramework = "net8.0"; - private const string s_previousTargetFramework = "net7.0"; + private const string s_latestTargetFramework = "net9.0"; + private const string s_previousTargetFramework = "net8.0"; private static string s_directoryBuildTargetsForPreviousTFM = $$""" diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs index 4462452486768..bf1cce8727a18 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs @@ -44,7 +44,7 @@ private void UpdateBrowserMainJs(string targetFramework, string runtimeAssetsRel // .withExitOnUnhandledError() is available only only >net7.0 mainJsContent = mainJsContent.Replace(".create()", - targetFramework == "net8.0" + (targetFramework == "net8.0" || targetFramework == "net9.0") ? ".withConsoleForwarding().withElementOnExit().withExitCodeLogging().withExitOnUnhandledError().create()" : ".withConsoleForwarding().withElementOnExit().withExitCodeLogging().create()"); @@ -190,7 +190,8 @@ public void ConsoleBuildAndRunDefault(string config, bool relinking) [Theory] // [ActiveIssue("https://github.com/dotnet/runtime/issues/79313")] // [InlineData("Debug", "-f net7.0", "net7.0")] - [InlineData("Debug", "-f net8.0", "net8.0")] + //[InlineData("Debug", "-f net8.0", "net8.0")] + [InlineData("Debug", "-f net9.0", "net9.0")] public void ConsoleBuildAndRunForSpecificTFM(string config, string extraNewArgs, string expectedTFM) => ConsoleBuildAndRun(config, false, extraNewArgs, expectedTFM, addFrameworkArg: extraNewArgs?.Length == 0); @@ -392,7 +393,12 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) UseCache: false, IsBrowserProject: false)); - string runArgs = $"run --no-silent --no-build -c {config}"; + new RunCommand(s_buildEnv, _testOutput, label: id) + .WithWorkingDirectory(_projectDir!) + .ExecuteWithCapturedOutput("--info") + .EnsureExitCode(0); + + string runArgs = $"run --no-silent --no-build -c {config} -v diag"; runArgs += " x y z"; var res = new RunCommand(s_buildEnv, _testOutput, label: id) .WithWorkingDirectory(_projectDir!) @@ -413,7 +419,7 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) // [InlineData("-f net8.0", "net8.0", "./")] // [ActiveIssue("https://github.com/dotnet/runtime/issues/79313")] // [InlineData("-f net7.0", "net7.0")] - [InlineData("-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath)] + [InlineData("-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath)] public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework, string runtimeAssetsRelativePath) { string config = "Debug"; 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 fb3359df0b929..40c6f7d42f4df 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -104,6 +104,8 @@ + <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER9" /> + <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER8" /> <_RuntimePackVersions Include="$(PackageVersionNet7)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' != ''" /> <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' == ''" /> diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs index e58e7002a368b..1e914da550fe3 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs @@ -40,8 +40,8 @@ public string CreateWasmTemplateProject(string id, string template = "wasmbrowse if (BuildEnvironment.UseWBTOverridePackTargets) File.Copy(BuildEnvironment.WasmOverridePacksTargetsPath, Path.Combine(_projectDir, Path.GetFileName(BuildEnvironment.WasmOverridePacksTargetsPath)), overwrite: true); - if (addFrameworkArg) - extraArgs += $" -f {DefaultTargetFramework}"; + //if (addFrameworkArg) + //extraArgs += $" -f {DefaultTargetFramework}"; new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) .WithWorkingDirectory(_projectDir!) .ExecuteWithCapturedOutput($"new {template} {extraArgs}") From 535d740ef28fd7ecf5b0a121b058a355b7980fe7 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 17 Oct 2023 00:58:38 +0000 Subject: [PATCH 14/20] wip --- .../wasm/Wasm.Build.Tests/data/nuget9.config | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/mono/wasm/Wasm.Build.Tests/data/nuget9.config diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget9.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget9.config new file mode 100644 index 0000000000000..dd241acafb305 --- /dev/null +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget9.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + From d93afc55d72a6b9aae5a4529a6f85fb4a96651fe Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 17 Oct 2023 03:14:52 +0000 Subject: [PATCH 15/20] wip --- src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs index 316aa2f019d1a..787b59af41c90 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs @@ -116,7 +116,7 @@ public void AssertBundle(string buildOutput, BlazorBuildOptions blazorBuildOptio if (IsUsingWorkloads) { // In no-workload case, the path would be from a restored nuget - ProjectProviderBase.AssertRuntimePackPath(buildOutput, blazorBuildOptions.TargetFramework ?? DefaultTargetFramework, blazorBuildOptions.RuntimeType); + //ProjectProviderBase.AssertRuntimePackPath(buildOutput, blazorBuildOptions.TargetFramework ?? DefaultTargetFramework, blazorBuildOptions.RuntimeType); } _provider.AssertBundle(blazorBuildOptions); From d76a4b0b762fbffceee39c6a6364ed52f9fae4ef Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 17 Oct 2023 06:01:44 +0000 Subject: [PATCH 16/20] wip --- eng/testing/workloads-testing.targets | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 5b8e0abce741e..0d2bb25e6b264 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -23,6 +23,8 @@ + + <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" /> <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" /> <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" /> @@ -78,6 +80,19 @@ + + + + <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles + + + + + From 89a3883fca355f246e244729057399d40f74643c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 12:58:51 +0000 Subject: [PATCH 17/20] 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 From 689bedebaa0b59b4e95f96a1504c48a182de0b3a Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 17 Oct 2023 15:38:29 +0000 Subject: [PATCH 18/20] revert tfm=net9.0 changes --- .../WorkloadManifest.targets.in | 2 +- .../Blazor/BlazorWasmTestBase.cs | 2 +- .../wasm/Wasm.Build.Tests/BuildTestBase.cs | 6 +++--- .../Common/BuildEnvironment.cs | 2 +- .../NonWasmTemplateBuildTests.cs | 4 ++-- .../Templates/WasmTemplateTests.cs | 14 ++++---------- .../Wasm.Build.Tests/Wasm.Build.Tests.csproj | 2 -- .../Wasm.Build.Tests/WasmTemplateTestBase.cs | 4 ++-- .../wasm/Wasm.Build.Tests/data/nuget9.config | 18 ------------------ 9 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 src/mono/wasm/Wasm.Build.Tests/data/nuget9.config diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in index 7a8f71ee1cca3..061fea9acaa14 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in @@ -8,7 +8,7 @@ true - false + true true diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs index 787b59af41c90..316aa2f019d1a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs @@ -116,7 +116,7 @@ public void AssertBundle(string buildOutput, BlazorBuildOptions blazorBuildOptio if (IsUsingWorkloads) { // In no-workload case, the path would be from a restored nuget - //ProjectProviderBase.AssertRuntimePackPath(buildOutput, blazorBuildOptions.TargetFramework ?? DefaultTargetFramework, blazorBuildOptions.RuntimeType); + ProjectProviderBase.AssertRuntimePackPath(buildOutput, blazorBuildOptions.TargetFramework ?? DefaultTargetFramework, blazorBuildOptions.RuntimeType); } _provider.AssertBundle(blazorBuildOptions); diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index 68a30b8ce941e..82bb029fdac7e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -25,7 +25,7 @@ namespace Wasm.Build.Tests { public abstract class BuildTestBase : IClassFixture, IDisposable { - public const string DefaultTargetFramework = "net9.0"; + public const string DefaultTargetFramework = "net8.0"; public const string DefaultTargetFrameworkForBlazor = "net8.0"; private const string DefaultEnvironmentLocale = "en-US"; protected static readonly char s_unicodeChar = '\u7149'; @@ -54,8 +54,8 @@ public abstract class BuildTestBase : IClassFixture s_buildEnv.IsWorkloadWithMultiThreadingForDefaultFramework; public static bool UseWebcil => s_buildEnv.UseWebcil; public static string GetNuGetConfigPathFor(string targetFramework) => - Path.Combine(BuildEnvironment.TestDataPath, "nuget9.config"); - //Path.Combine(BuildEnvironment.TestDataPath, targetFramework == "net8.0" ? "nuget8.config" : "nuget9.config"); + Path.Combine(BuildEnvironment.TestDataPath, "nuget8.config"); // for now - we are still using net7, but with + // targetFramework == "net7.0" ? "nuget7.config" : "nuget8.config"); public TProvider GetProvider() where TProvider : ProjectProviderBase => (TProvider)_providerOfBaseType; diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs index eea13ab7058eb..37a7668b5d099 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs @@ -82,7 +82,7 @@ public BuildEnvironment() sdkForWorkloadPath = Path.GetFullPath(sdkForWorkloadPath); // FIXME: - foreach (string verStr in new[] { "9", "8", "7", "6" }) + foreach (string verStr in new[] { "8", "7", "6" }) { string versionValue = Environment.GetEnvironmentVariable($"RUNTIME_PACK_VER{verStr}") ?? string.Empty; s_runtimePackVersions[$"net{verStr}.0"] = versionValue; diff --git a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs index 4f86c39c3addf..579debf24502d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs @@ -25,8 +25,8 @@ public NonWasmTemplateBuildTests(ITestOutputHelper output, SharedBuildPerTestCla // // This is useful for the case when we are on tfm=net7.0, but sdk, and packages // are really 8.0 . - private const string s_latestTargetFramework = "net9.0"; - private const string s_previousTargetFramework = "net8.0"; + private const string s_latestTargetFramework = "net8.0"; + private const string s_previousTargetFramework = "net7.0"; private static string s_directoryBuildTargetsForPreviousTFM = $$""" diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs index bf1cce8727a18..4462452486768 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs @@ -44,7 +44,7 @@ private void UpdateBrowserMainJs(string targetFramework, string runtimeAssetsRel // .withExitOnUnhandledError() is available only only >net7.0 mainJsContent = mainJsContent.Replace(".create()", - (targetFramework == "net8.0" || targetFramework == "net9.0") + targetFramework == "net8.0" ? ".withConsoleForwarding().withElementOnExit().withExitCodeLogging().withExitOnUnhandledError().create()" : ".withConsoleForwarding().withElementOnExit().withExitCodeLogging().create()"); @@ -190,8 +190,7 @@ public void ConsoleBuildAndRunDefault(string config, bool relinking) [Theory] // [ActiveIssue("https://github.com/dotnet/runtime/issues/79313")] // [InlineData("Debug", "-f net7.0", "net7.0")] - //[InlineData("Debug", "-f net8.0", "net8.0")] - [InlineData("Debug", "-f net9.0", "net9.0")] + [InlineData("Debug", "-f net8.0", "net8.0")] public void ConsoleBuildAndRunForSpecificTFM(string config, string extraNewArgs, string expectedTFM) => ConsoleBuildAndRun(config, false, extraNewArgs, expectedTFM, addFrameworkArg: extraNewArgs?.Length == 0); @@ -393,12 +392,7 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) UseCache: false, IsBrowserProject: false)); - new RunCommand(s_buildEnv, _testOutput, label: id) - .WithWorkingDirectory(_projectDir!) - .ExecuteWithCapturedOutput("--info") - .EnsureExitCode(0); - - string runArgs = $"run --no-silent --no-build -c {config} -v diag"; + string runArgs = $"run --no-silent --no-build -c {config}"; runArgs += " x y z"; var res = new RunCommand(s_buildEnv, _testOutput, label: id) .WithWorkingDirectory(_projectDir!) @@ -419,7 +413,7 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) // [InlineData("-f net8.0", "net8.0", "./")] // [ActiveIssue("https://github.com/dotnet/runtime/issues/79313")] // [InlineData("-f net7.0", "net7.0")] - [InlineData("-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath)] + [InlineData("-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath)] public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework, string runtimeAssetsRelativePath) { string config = "Debug"; 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 40c6f7d42f4df..fb3359df0b929 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -104,8 +104,6 @@ - <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER9" /> - <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER8" /> <_RuntimePackVersions Include="$(PackageVersionNet7)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' != ''" /> <_RuntimePackVersions Include="$(PackageVersion)" EnvVarName="RUNTIME_PACK_VER7" Condition="'$(PackageVersionNet7)' == ''" /> diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs index 1e914da550fe3..e58e7002a368b 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTestBase.cs @@ -40,8 +40,8 @@ public string CreateWasmTemplateProject(string id, string template = "wasmbrowse if (BuildEnvironment.UseWBTOverridePackTargets) File.Copy(BuildEnvironment.WasmOverridePacksTargetsPath, Path.Combine(_projectDir, Path.GetFileName(BuildEnvironment.WasmOverridePacksTargetsPath)), overwrite: true); - //if (addFrameworkArg) - //extraArgs += $" -f {DefaultTargetFramework}"; + if (addFrameworkArg) + extraArgs += $" -f {DefaultTargetFramework}"; new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) .WithWorkingDirectory(_projectDir!) .ExecuteWithCapturedOutput($"new {template} {extraArgs}") diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget9.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget9.config deleted file mode 100644 index dd241acafb305..0000000000000 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget9.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - From 28cf02d129f795958b8e687aa9982398a2e09a42 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 17 Oct 2023 17:44:04 +0000 Subject: [PATCH 19/20] [wasm] WBT: Update blazor tests to track changed path for Pages .. from `Pages/` to `Components/Pages/`. --- src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs | 4 ++-- .../wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs index 10717b334174b..b006bf7a93e5c 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!, "Pages", "MyDllImport.cs"), myDllImportCs); + File.WriteAllText(Path.Combine(_projectDir!, "Components", "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 = "Pages/Counter.razor") + private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/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 cbe3e461ec9cd..7ca663dce5372 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)!, "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) From f408dccbd193e80d4b33dee4c5736cbe80de3f93 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 17 Oct 2023 17:50:28 +0000 Subject: [PATCH 20/20] add comment --- eng/testing/workloads-testing.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 0d2bb25e6b264..adfd0597d940f 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -23,6 +23,8 @@ + <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />