Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/6.0-preview7] Update dependencies from dotnet/arcade #56235

Closed
wants to merge 3 commits into from
Closed

[release/6.0-preview7] Update dependencies from dotnet/arcade #56235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09bae7d
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 23, 2021
1139509
Cherry-pick (#55283)
ViktorHofer Jul 22, 2021
b91652b
Merge branch 'release/6.0-preview7' into darc-release/6.0-preview7-90…
mmitche Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,73 +14,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21364.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21369.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e97027cf100d2b532adce387e5cb93a373de93c9</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -198,9 +198,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e5511489deb44b13418fe622775bd7035e21c5ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21364.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
28 changes: 14 additions & 14 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21362.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21364.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21364.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21364.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21364.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21364.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21364.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21369.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21369.3</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21364.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21364.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21364.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21372.16</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21372.16</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21372.16</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21372.16</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21372.16</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21372.16</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21372.16</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21372.16</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21372.16</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi
internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi
targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
Expand All @@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
$officialBuildArgs \
$internalRuntimeDownloadArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
Expand Down
1 change: 1 addition & 0 deletions eng/testing/linker/trimmingTests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<TestConsoleApps Include="@(TestConsoleAppSourceFiles->'%(ProjectFile)')" Condition="!$([System.String]::Copy('%(TestConsoleAppSourceFiles.SkipOnTestRuntimes)').Contains('$(PackageRID)'))">
<ProjectCompileItems>%(Identity)</ProjectCompileItems>
</TestConsoleApps>
<TestConsoleApps AdditionalProperties="MSBuildEnableWorkloadResolver=$(MSBuildEnableWorkloadResolver)" Condition="'$(MSBuildEnableWorkloadResolver)' != ''" />
</ItemGroup>
</Target>

Expand Down
12 changes: 6 additions & 6 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"sdk": {
"version": "6.0.100-preview.4.21255.9",
"version": "6.0.100-preview.6.21355.2",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100-preview.4.21255.9"
"dotnet": "6.0.100-preview.6.21355.2"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21364.3",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21364.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21364.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21364.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21372.16",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10"
Expand Down
1 change: 1 addition & 0 deletions src/installer/tests/Assets/TestProjects/LightupClient/LightupClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions src/installer/tests/HostActivation.Tests/PortableAppActivation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,15 @@ public void Muxer_Exec_activation_of_Build_Output_Portable_DLL_with_DepsJson_Rem
var fixture = sharedTestState.PortableAppFixture_Built
.Copy();

// Move the .deps.json to a subdirectory, note that in this case we have to move all of the app's dependencies
// along with it - in this case Newtonsoft.Json.dll
// For framework dependent apps (dotnet build produces those) the probing directories are:
// - The directory where the .deps.json is
// - Any framework directory
var depsJson = MoveDepsJsonToSubdirectory(fixture);
File.Move(
Path.Combine(Path.GetDirectoryName(fixture.TestProject.AppDll), "Newtonsoft.Json.dll"),
Path.Combine(Path.GetDirectoryName(depsJson), "Newtonsoft.Json.dll"));

var dotnet = fixture.BuiltDotnet;
var appDll = fixture.TestProject.AppDll;
Expand Down
2 changes: 1 addition & 1 deletion ...Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ static CoreFxFileStatusProvider()
try
{
s_fileSystem_fileStatusField = typeof(FileSystemInfo).GetField("_fileStatus", BindingFlags.NonPublic | BindingFlags.Instance);
s_fileStatus_fileStatusField = s_fileSystem_fileStatusField.FieldType.GetField("_fileStatus", BindingFlags.NonPublic | BindingFlags.Instance);
s_fileStatus_fileStatusField = s_fileSystem_fileStatusField.FieldType.GetField("_fileCache", BindingFlags.NonPublic | BindingFlags.Instance);
s_fileStatusModeField = s_fileStatus_fileStatusField.FieldType.GetField("Mode", BindingFlags.NonPublic | BindingFlags.Instance);
}
catch (Exception ex)
Expand Down
1 change: 1 addition & 0 deletions src/mono/wasm/build/WasmApp.LocalBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

<PropertyGroup>
<_NetCoreAppToolCurrent>net6.0</_NetCoreAppToolCurrent>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
</PropertyGroup>

<PropertyGroup Condition="'$(RuntimeSrcDir)' != '' and '$(WasmBuildSupportDir)' == ''">
Expand Down
3 changes: 3 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ public BuildEnvironment()
DefaultBuildArgs = $" /p:RuntimeSrcDir={solutionRoot.FullName} /p:RuntimeConfig={s_runtimeConfig} /p:EMSDK_PATH={emsdkPath} ";
}

// for EMSDK runs, we don't want to get the dependencies from workloads
DefaultBuildArgs += " /p:MSBuildEnableWorkloadResolver=false";

IsWorkload = false;
DotNet = "dotnet";
EnvVars = new Dictionary<string, string>()
Expand Down
3 changes: 3 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project>
<PropertyGroup>
<!-- disable workloads for this emsdk build -->
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>

<_WasmTargetsDir Condition="'$(RuntimeSrcDir)' != ''">$(RuntimeSrcDir)\src\mono\wasm\build\</_WasmTargetsDir>
<_WasmTargetsDir Condition="'$(WasmBuildSupportDir)' != ''">$(WasmBuildSupportDir)\wasm\</_WasmTargetsDir>
<EMSDK_PATH Condition="'$(WasmBuildSupportDir)' != ''">$(WasmBuildSupportDir)\emsdk\</EMSDK_PATH>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/CLRTest.Execute.Bash.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ else
__Command+=" dotnet"
fi

$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` || exit $?
$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` $(CLRTestMSBuildArgs) || exit $?

]]>
</BashCLRTestPreCommands>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,8 @@
as we do with many of the package versions above -->
<BaselineMicrosoftNetCoreAppPackageVersion>2.1.0-preview3-26416-01</BaselineMicrosoftNetCoreAppPackageVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
<CLRTestMSBuildArgs>/p:MSBuildEnableWorkloadResolver=false</CLRTestMSBuildArgs>
</PropertyGroup>
</Project>