diff --git a/eng/Versions.props b/eng/Versions.props index bf5ca9e368df6f..810a54d1aadfea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,6 +173,7 @@ 2.14.3 + 7.0.1xx 1.1.2-beta1.22403.2 7.0.0-preview-20221010.1 diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 7ecff6b59fbad2..dd2e34364522b9 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -29,6 +29,7 @@ <_UseWasmSymbolicator Condition="'$(TestTrimming)' != 'true'">true true false + _GetWorkloadsToInstall;$(InstallWorkloadUsingArtifactsDependsOn) @@ -146,28 +147,6 @@ - - - - - - - - - @@ -336,4 +315,30 @@ + + + + + + + + + + + + + diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 280d9160b9c9e5..3e04032c750708 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -9,6 +9,15 @@ <_SdkForWorkloadTestingBasePath>$(ArtifactsBinDir) <_SdkWithNoWorkloadPath>$([MSBuild]::NormalizeDirectory($(_SdkForWorkloadTestingBasePath), 'dotnet-none')) <_SdkWithNoWorkloadStampPath>$([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp')) + + $(InstallWorkloadUsingArtifactsDependsOn); + _SetPackageVersionForWorkloadsTesting; + _GetNuGetsToBuild; + _PreparePackagesForWorkloadInstall; + GetWorkloadInputs; + _ProvisionDotNetForWorkloadTesting; + _InstallWorkloads + @@ -50,9 +59,9 @@ <_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))" - >$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 7.0 + >$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel $(DotNetChannelToUseForWorkloadTesting) <_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))" - >$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 7.0 + >$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel $(DotNetChannelToUseForWorkloadTesting) + + + + $(PackageVersion) + $(ProductVersion) + + + + + @@ -92,19 +112,17 @@ - <_PackageVersion>$(PackageVersion) - <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion) - <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg + <_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(PackageVersionForWorkloadManifests).nupkg - <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(_PackageVersion).nupkg" + <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Ref.$(PackageVersionForWorkloadManifests).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj" Properties="@(_DefaultPropsForNuGetBuild, ';')" Descriptor="Ref pack"/> @@ -141,18 +159,16 @@ --> - <_PackageVersion>$(PackageVersion) - <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion) - <_DefaultBuildVariant Condition="'$(WasmEnableThreads)' == 'true' or '$(MonoWasmBuildVariant)' == 'multithread'">.multithread. <_DefaultBuildVariant Condition="'$(WasmEnablePerfTracing)' == 'true' or '$(MonoWasmBuildVariant)' == 'perftrace'">.perftrace. <_DefaultBuildVariant Condition="'$(_DefaultBuildVariant)' == ''">. - <_DefaultRuntimePackNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono$(_DefaultBuildVariant)browser-wasm.$(_PackageVersion).nupkg + <_DefaultRuntimePackNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono$(_DefaultBuildVariant)browser-wasm.$(PackageVersionForWorkloadManifests).nupkg - <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(_PackageVersion).nupkg" /> + <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono*$(PackageVersionForWorkloadManifests).nupkg" /> + <_RuntimePackNugetAvailable Remove="@(_RuntimePackNugetAvailable)" Condition="$([System.String]::new('%(_RuntimePackNugetAvailable.FileName)').EndsWith('.symbols'))" /> <_BuildVariants Include="perftrace" Condition="'$(_DefaultBuildVariant)' != '.perftrace.'" /> - <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.%(_BuildVariants.Identity).browser-wasm.$(_PackageVersion).nupkg" + <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.%(_BuildVariants.Identity).browser-wasm.$(PackageVersionForWorkloadManifests).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" Dependencies="$(_DefaultRuntimePackNuGetPath)" Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=%(_BuildVariants.Identity)" Descriptor="runtime pack for %(_BuildVariants.Identity)" /> - <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(_PackageVersion).nupkg" + <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(PackageVersionForWorkloadManifests).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=" Dependencies="$(_DefaultRuntimePackNuGetPath)" diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 26c043c7df1ba6..3f51b0a8403994 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -153,6 +153,12 @@ private bool InstallAllManifests() continue; } + if (string.IsNullOrEmpty(req.Version)) + { + Log.LogError($"No Version set for workload manifest {req.ManifestName} in workload install requests."); + return false; + } + Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Installing manifests for workload {req.WorkloadId} **"); if (!InstallWorkloadManifest(workload, req.ManifestName, diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index 8123c9cfc1c9ed..a40ef1fdd69977 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -41,6 +41,7 @@ public void DefaultTemplate_WithoutWorkload(string config) [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void DefaultTemplate_NoAOT_WithWorkload(string config) { string id = $"blz_no_aot_{config}"; @@ -83,6 +84,7 @@ public void DefaultTemplate_AOT_InProjectFile(string config) [InlineData("Release", true)] [InlineData("Release", false)] [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink) { string id = $"blz_deploy_on_build_{config}_{nativeRelink}"; @@ -163,6 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config) [InlineData("Debug")] [InlineData("Release")] [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void WithNativeReference_AOTOnCommandLine(string config) { string id = $"blz_nativeref_aot_{config}"; @@ -179,6 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config) [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void WithDllImportInMainAssembly(string config) { // Based on https://github.com/dotnet/runtime/issues/59255 @@ -231,6 +235,7 @@ void CheckNativeFileLinked(bool forPublish) } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void BugRegression_60479_WithRazorClassLib() { string id = "blz_razor_lib_top"; diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs index 1641c7860d5b67..1cba4abf637876 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs @@ -19,6 +19,7 @@ public BlazorWasmTests(ITestOutputHelper output, SharedBuildPerTestClassFixture [Theory, TestCategory("no-workload")] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void NativeRef_EmitsWarningBecauseItRequiresWorkload(string config) { CommandResult res = PublishForRequiresWorkloadTest(config, extraItems: ""); diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs index bbd0f0106e89bd..51ca3316872410 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs @@ -23,6 +23,7 @@ public CleanTests(ITestOutputHelper output, SharedBuildPerTestClassFixture build [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void Blazor_BuildThenClean_NativeRelinking(string config) { string id = Path.GetRandomFileName(); @@ -51,12 +52,14 @@ public void Blazor_BuildThenClean_NativeRelinking(string config) [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void Blazor_BuildNoNative_ThenBuildNative_ThenClean(string config) => Blazor_BuildNativeNonNative_ThenCleanTest(config, firstBuildNative: false); [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void Blazor_BuildNative_ThenBuildNonNative_ThenClean(string config) => Blazor_BuildNativeNonNative_ThenCleanTest(config, firstBuildNative: true); diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs index 1cc525391ad77b..5da728a17c1613 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs @@ -38,6 +38,7 @@ public void NoOpRebuildForNativeBuilds(BuildArgs buildArgs, bool nativeRelink, b [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void BlazorNoopRebuild(string config) { string id = $"blz_rebuild_{config}"; @@ -65,6 +66,7 @@ public void BlazorNoopRebuild(string config) [Theory] [InlineData("Debug")] [InlineData("Release")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/77740")] public void BlazorOnlyLinkRebuild(string config) { string id = $"blz_relink_{config}"; diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj index 8c7ad904c26ebd..7d87809ec741db 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -38,10 +38,13 @@ - + + + - - + +