diff --git a/eng/Versions.props b/eng/Versions.props index da50f10c2bb..bda056fda26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 10.0.0-rc.1.25555.107 10.0.0-rc.1.25555.107 10.0.0-rc.1.25555.107 - 0.16.0-custom.20260127.101 + 0.16.0-custom.20260217.100 10.0.0-rc.1.25555.107 11.0.0-prerelease.26064.3 diff --git a/eng/pipelines/runtime-perf-jobs.yml b/eng/pipelines/runtime-perf-jobs.yml index 8aaa511998c..eb3927e4602 100644 --- a/eng/pipelines/runtime-perf-jobs.yml +++ b/eng/pipelines/runtime-perf-jobs.yml @@ -57,229 +57,229 @@ jobs: - template: /eng/pipelines/performance/templates/perf-build-jobs.yml@${{ parameters.runtimeRepoAlias }} parameters: perfBranch: ${{ parameters.perfBranch }} - - - ${{ if not(startswith(variables['Build.SourceBranch'], 'refs/heads/release')) }}: - # Build and run iOS Mono and NativeAOT scenarios - - template: /eng/pipelines/runtime-ios-scenarios-perf-jobs.yml - parameters: - runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} - performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - jobParameters: ${{ parameters.jobParameters }} - - # run android scenarios - Mono JIT - - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} - parameters: - jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} - buildConfig: release - runtimeFlavor: mono - platforms: - - windows_x64 - jobParameters: - runtimeType: AndroidMono - codeGenType: JIT - projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj - runKind: android_scenarios - isScenario: true - logicalMachine: 'perfpixel4a' + - ${{ if false }}: + - ${{ if not(startswith(variables['Build.SourceBranch'], 'refs/heads/release')) }}: + # Build and run iOS Mono and NativeAOT scenarios + - template: /eng/pipelines/runtime-ios-scenarios-perf-jobs.yml + parameters: runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - ${{ each parameter in parameters.jobParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} + jobParameters: ${{ parameters.jobParameters }} - # run android scenarios - Mono AOT + # run android scenarios - Mono JIT + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: mono + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidMono + codeGenType: JIT + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel4a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # run android scenarios - Mono AOT + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: mono + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidMono + codeGenType: AOT + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel4a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # run android scenarios - CoreCLR JIT + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidCoreCLR + codeGenType: JIT + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel4a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # run android scenarios - CoreCLR JIT Static Linking + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidCoreCLR + codeGenType: JIT + linkingType: static + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel4a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # run android scenarios - CoreCLR R2R + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidCoreCLR + codeGenType: R2R + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel4a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # run mono microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} parameters: jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} buildConfig: release runtimeFlavor: mono platforms: - - windows_x64 + - linux_x64 jobParameters: - runtimeType: AndroidMono - codeGenType: AOT - projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj - runKind: android_scenarios - isScenario: true - logicalMachine: 'perfpixel4a' + liveLibrariesBuildConfig: Release + runtimeType: mono + runKind: micro_mono + logicalMachine: 'perfviper' runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} - # run android scenarios - CoreCLR JIT + + # run mono interpreter perf job - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} parameters: jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} buildConfig: release - runtimeFlavor: coreclr + runtimeFlavor: mono platforms: - - windows_x64 + - linux_x64 jobParameters: - runtimeType: AndroidCoreCLR - codeGenType: JIT - projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj - runKind: android_scenarios - isScenario: true - logicalMachine: 'perfpixel4a' + liveLibrariesBuildConfig: Release + runtimeType: mono + codeGenType: 'Interpreter' + runKind: micro_mono + logicalMachine: 'perfviper' runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} - # run android scenarios - CoreCLR JIT Static Linking + # run mono aot microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} parameters: jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} buildConfig: release - runtimeFlavor: coreclr + runtimeFlavor: aot platforms: - - windows_x64 + - linux_x64 jobParameters: - runtimeType: AndroidCoreCLR - codeGenType: JIT - linkingType: static - projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj - runKind: android_scenarios - isScenario: true - logicalMachine: 'perfpixel4a' + liveLibrariesBuildConfig: Release + runtimeType: mono + codeGenType: 'AOT' + runKind: micro_mono + logicalMachine: 'perfviper' runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} - # run android scenarios - CoreCLR R2R + # run coreclr perfviper microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} parameters: jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} buildConfig: release runtimeFlavor: coreclr platforms: - - windows_x64 + - linux_x64 + - windows_x64 + - windows_x86 jobParameters: - runtimeType: AndroidCoreCLR - codeGenType: R2R - projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj - runKind: android_scenarios - isScenario: true - logicalMachine: 'perfpixel4a' + liveLibrariesBuildConfig: Release + runKind: micro + logicalMachine: 'perfviper' runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} - # run mono microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} - parameters: - jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} - buildConfig: release - runtimeFlavor: mono - platforms: - - linux_x64 - jobParameters: - liveLibrariesBuildConfig: Release - runtimeType: mono - runKind: micro_mono - logicalMachine: 'perfviper' - runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} - performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - ${{ each parameter in parameters.jobParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - - - # run mono interpreter perf job - - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} - parameters: - jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} - buildConfig: release - runtimeFlavor: mono - platforms: - - linux_x64 - jobParameters: - liveLibrariesBuildConfig: Release - runtimeType: mono - codeGenType: 'Interpreter' - runKind: micro_mono - logicalMachine: 'perfviper' - runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} - performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - ${{ each parameter in parameters.jobParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # run mono aot microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} - parameters: - jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} - buildConfig: release - runtimeFlavor: aot - platforms: - - linux_x64 - jobParameters: - liveLibrariesBuildConfig: Release - runtimeType: mono - codeGenType: 'AOT' - runKind: micro_mono - logicalMachine: 'perfviper' - runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} - performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - ${{ each parameter in parameters.jobParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # run coreclr perfviper microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} - parameters: - jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} - buildConfig: release - runtimeFlavor: coreclr - platforms: - - linux_x64 - - windows_x64 - - windows_x86 - jobParameters: - liveLibrariesBuildConfig: Release - runKind: micro - logicalMachine: 'perfviper' - runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} - performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - ${{ each parameter in parameters.jobParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # run coreclr perfviper microbenchmarks perf job with NoR2R - - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} - parameters: - jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} - buildConfig: release - runtimeFlavor: coreclr - platforms: - - linux_x64 - - windows_x64 - jobParameters: - liveLibrariesBuildConfig: Release - runKind: micro - logicalMachine: 'perfviper' - runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} - performanceRepoAlias: ${{ parameters.performanceRepoAlias }} - r2rRunType: nor2r - additionalJobIdentifier: 'NoR2R' - ${{ each parameter in parameters.jobParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # run coreclr crossgen perf job - - ${{ if false }}: # Disabling as all crossgen jobs are failing at the moment - https://github.com/dotnet/performance/issues/4819 + # run coreclr perfviper microbenchmarks perf job with NoR2R - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} parameters: jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} buildConfig: release runtimeFlavor: coreclr platforms: + - linux_x64 - windows_x64 - - windows_x86 jobParameters: liveLibrariesBuildConfig: Release - projectFile: $(Build.SourcesDirectory)/eng/testing/performance/crossgen_perf.proj - runKind: crossgen_scenarios - isScenario: true - logicalMachine: 'perftiger_crossgen' # Update when re-enabling as PerfTiger is now fewer machines (or completely decommissioned) + runKind: micro + logicalMachine: 'perfviper' runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + r2rRunType: nor2r + additionalJobIdentifier: 'NoR2R' ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} + + # run coreclr crossgen perf job + - ${{ if false }}: # Disabling as all crossgen jobs are failing at the moment - https://github.com/dotnet/performance/issues/4819 + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + - windows_x86 + jobParameters: + liveLibrariesBuildConfig: Release + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/crossgen_perf.proj + runKind: crossgen_scenarios + isScenario: true + logicalMachine: 'perftiger_crossgen' # Update when re-enabling as PerfTiger is now fewer machines (or completely decommissioned) + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/scripts/build_runtime_payload.py b/scripts/build_runtime_payload.py index 1217d6deb57..81b3708045c 100644 --- a/scripts/build_runtime_payload.py +++ b/scripts/build_runtime_payload.py @@ -299,27 +299,19 @@ def build_monoaot_payload( def build_wasm_payload( browser_wasm_archive_or_dir: str, - payload_parent_dir: str, # wasm creates three payload directories - test_main_js_path: Optional[str] = None, - runtime_repo_dir: Optional[str] = None, + payload_parent_dir: str, ) -> None: - """Create the WASM payload directories (dotnet, built-nugets, wasm-data). + """Create the WASM payload directories (dotnet, built-nugets). The archive/directory layout is expected to contain a `staging/` folder with - `dotnet-latest` and `built-nugets` subfolders. We also copy the harness - `test-main.js` into `wasm-data/`. - """ - if test_main_js_path is None: - if runtime_repo_dir is None: - raise Exception("Please provide a path to the test-main.js or runtime repository") - test_main_js_path = os.path.join(runtime_repo_dir, "src", "mono", "browser", "test-main.js") - - if not os.path.exists(test_main_js_path): - raise Exception(f"test-main.js not found in expected location: {test_main_js_path}") + `dotnet-latest` and `built-nugets` subfolders, plus the CoreCLR runtime pack + at `microsoft.netcore.app.runtime.browser-wasm/Release/`. + After extracting, the CoreCLR runtime pack is installed into the dotnet packs + directory alongside the Mono pack so the SDK can resolve either variant. + """ wasm_dotnet_dir = os.path.join(payload_parent_dir, "dotnet") wasm_built_nugets_dir = os.path.join(payload_parent_dir, "built-nugets") - wasm_data_dir = os.path.join(payload_parent_dir, "wasm-data") extract_archive_or_copy( browser_wasm_archive_or_dir, wasm_dotnet_dir, prefix="staging/dotnet-latest/" @@ -329,7 +321,19 @@ def build_wasm_payload( browser_wasm_archive_or_dir, wasm_built_nugets_dir, prefix="staging/built-nugets/" ) - os.makedirs(wasm_data_dir, exist_ok=True) - shutil.copy(test_main_js_path, os.path.join(wasm_data_dir, "test-main.js")) - - _set_permissions_recursive([wasm_dotnet_dir, wasm_built_nugets_dir, wasm_data_dir], mode=0o664) # rw-rw-r-- \ No newline at end of file + # Install the CoreCLR runtime pack into the dotnet packs directory. + # The Mono pack is already at packs/Microsoft.NETCore.App.Runtime.Mono.browser-wasm//; + # we mirror that layout for the CoreCLR variant so the SDK can find it. + mono_pack_parent = os.path.join(wasm_dotnet_dir, "packs", "Microsoft.NETCore.App.Runtime.Mono.browser-wasm") + if os.path.isdir(mono_pack_parent): + # Discover the version from the Mono pack directory (e.g. "11.0.0-ci") + versions = os.listdir(mono_pack_parent) + if versions: + pack_version = versions[0] + coreclr_pack_dest = os.path.join(wasm_dotnet_dir, "packs", "Microsoft.NETCore.App.Runtime.browser-wasm", pack_version) + extract_archive_or_copy( + browser_wasm_archive_or_dir, coreclr_pack_dest, prefix="staging/microsoft.netcore.app.runtime.browser-wasm/Release/" + ) + getLogger().info("Installed CoreCLR browser-wasm runtime pack version %s", pack_version) + + _set_permissions_recursive([wasm_dotnet_dir, wasm_built_nugets_dir], mode=0o664) # rw-rw-r-- \ No newline at end of file diff --git a/scripts/run_performance_job.py b/scripts/run_performance_job.py index 3fad795a973..1a4fa5d4a91 100644 --- a/scripts/run_performance_job.py +++ b/scripts/run_performance_job.py @@ -442,7 +442,6 @@ def get_bdn_arguments( "--wasmEngine", javascript_engine_path, f"\\\"--wasmArgs={' '.join(wasm_args)}\\\"", "--cli", "$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet", - "--wasmDataDir", "$HELIX_CORRELATION_PAYLOAD/wasm-data" ] if is_aot: @@ -560,7 +559,7 @@ def get_run_configurations( return configurations -def get_work_item_command(os_group: str, target_csproj: str, architecture: str, perf_lab_framework: str, internal: bool, wasm: bool, bdn_artifacts_dir: str): +def get_work_item_command(os_group: str, target_csproj: str, architecture: str, perf_lab_framework: str, internal: bool, wasm: bool, bdn_artifacts_dir: str, wasm_coreclr: bool = False): if os_group == "windows": work_item_command = [ "python", @@ -588,6 +587,8 @@ def get_work_item_command(os_group: str, target_csproj: str, architecture: str, if wasm: work_item_command += ["--run-isolated", "--wasm", "--dotnet-path", "$HELIX_CORRELATION_PAYLOAD/dotnet/"] + if wasm_coreclr: + work_item_command += ["--wasm-coreclr"] work_item_command += ["--bdn-artifacts", bdn_artifacts_dir] @@ -648,6 +649,7 @@ def run_performance_job(args: RunPerformanceJobArgs): mono_dotnet = is_mono and not is_aot wasm = args.runtime_type == "wasm" wasm_aot = wasm and is_aot + wasm_coreclr = wasm and args.codegen_type.lower() == "wasm" working_dir = os.path.join(args.performance_repo_dir, "CorrelationStaging") # folder in which the payload and workitem directories will be made work_item_dir = os.path.join(working_dir, "workitem", "") # Folder in which the work item commands will be run in @@ -785,7 +787,7 @@ def run_performance_job(args: RunPerformanceJobArgs): getLogger().info("Copying wasm bundle directory to payload directory") browser_wasm_dir = os.path.join(args.libraries_download_dir, "BrowserWasm") - build_wasm_payload(browser_wasm_dir, payload_dir, runtime_repo_dir=args.runtime_repo_dir) + build_wasm_payload(browser_wasm_dir, payload_dir) if args.javascript_engine == "v8": if args.browser_versions_props_path is None: @@ -1157,7 +1159,7 @@ def get_bdn_args_for_coreroot_dir(coreroot_dir: Optional[str]): def get_work_item_command_for_artifact_dir(artifact_dir: str): assert args.target_csproj is not None - return get_work_item_command(args.os_group, args.target_csproj, args.architecture, perf_lab_framework, args.internal, wasm, artifact_dir) + return get_work_item_command(args.os_group, args.target_csproj, args.architecture, perf_lab_framework, args.internal, wasm, artifact_dir, wasm_coreclr) work_item_command = get_work_item_command_for_artifact_dir(bdn_artifacts_directory) baseline_work_item_command = get_work_item_command_for_artifact_dir(bdn_baseline_artifacts_dir) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c40511c9dca..96647e856eb 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -15,6 +15,7 @@ $(NoWarn);NU1507 $(NoWarn);NETSDK1138 + $(NoWarn);CS9057 True 4 diff --git a/src/scenarios/build-common/WasmOverridePacks.targets b/src/scenarios/build-common/WasmOverridePacks.targets index a5bfb06a337..a3d359241d8 100644 --- a/src/scenarios/build-common/WasmOverridePacks.targets +++ b/src/scenarios/build-common/WasmOverridePacks.targets @@ -1,4 +1,11 @@ + + + <_WasmRuntimePackPrefix Condition="'$(UseMonoRuntime)' == 'true'">Mono. + <_WasmRuntimePackName>Microsoft.NETCore.App.Runtime.$(_WasmRuntimePackPrefix)$(RuntimeIdentifier) + + @@ -16,16 +23,16 @@