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

Jump to bottom

Bump Helix SDK with breaking change in XHarness SDK #38665

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Bump Helix SDK with breaking change in XHarness SDK #38665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Bump Helix SDK with breaking change in XHarness SDK
  • Loading branch information
@premun
premun committed Jul 1, 2020
commit 35b9057e6a4e23177fa77221f576dcf85c57b4c8
10 changes: 7 additions & 3 deletions eng/testing/WasmRunnerTemplate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ cd $EXECUTION_DIR

XHARNESS_OUT="$EXECUTION_DIR/xharness-output"

if [ ! -x "$(command -v xharness)" ]; then
HARNESS_RUNNER="dotnet"
if [ ! -z "$XHARNESS_CLI_PATH" ]; then
# When running in CI, we only have the .NET runtime available
# We need to call the XHarness CLI DLL directly via dotnet exec
HARNESS_RUNNER="dotnet exec $XHARNESS_CLI_PATH"
else
HARNESS_RUNNER="dotnet xharness"
fi

# RunCommands defined in tests.mobile.targets
[[RunCommands]]

_exitCode=$?

echo "Xharness artifacts: $XHARNESS_OUT"
echo "XHarness artifacts: $XHARNESS_OUT"

exit $_exitCode
2 changes: 1 addition & 1 deletion eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- We need to set this in order to get extensibility on xunit category traits and other arguments we pass down to xunit via MSBuild properties -->
<RunScriptCommand>$HARNESS_RUNNER xharness wasm test --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js -v --output-directory=$XHARNESS_OUT -- --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
<RunScriptCommand>$HARNESS_RUNNER wasm test --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js -v --output-directory=$XHARNESS_OUT -- --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
</PropertyGroup>

<!-- Generate a self-contained app bundle for Android with tests. -->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20316.1",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20316.1",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20316.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20316.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.7.20316.4",
"Microsoft.Build.NoTargets": "1.0.53",
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<TimeoutInSeconds Condition="'$(Scenario)' == '' and '$(TimeoutInSeconds)' == ''">900</TimeoutInSeconds>
<TimeoutInSeconds Condition="'$(Scenario)' != '' and '$(TimeoutInSeconds)' == ''">1800</TimeoutInSeconds>
<_timeoutSpan>$([System.TimeSpan]::FromSeconds($(TimeoutInSeconds)))</_timeoutSpan>

<!-- We need to enable xunit reporter so that it parses test results
Package testing doesn't run on xunit. -->
<EnableXunitReporter Condition="'$(BuildAllConfigurations)' != 'true'">true</EnableXunitReporter>

<!-- The Helix runtime payload and the tests to run -->
<!-- TestArchiveRuntimeFile will be passed as a property by the calling project -->
<HelixCorrelationPayload Condition="'$(HelixCorrelationPayload)' == ''">$(TestArchiveRuntimeFile)</HelixCorrelationPayload>
Expand Down Expand Up @@ -63,7 +63,6 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
<IncludeDotNetCli>true</IncludeDotNetCli>
<IncludeXHarnessCli>true</IncludeXHarnessCli>
</PropertyGroup>

Expand Down Expand Up @@ -118,7 +117,7 @@
<PropertyGroup>
<HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
</PropertyGroup>

<PropertyGroup Condition="'$(HelixCommand)' == ''">
<!--
For Windows we need to use "call", since the command is going to be called from a batch script created by Helix.
Expand Down