Skip to content

Use arcade target instead of local #6140

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

Merged
merged 13 commits into from
Jul 28, 2025
Merged

Use arcade target instead of local #6140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ab1bcc0
Use arcade target instead of local
Evangelink Jul 23, 2025
d4e46f0
Merge branch 'main' into dev/amauryleve/arcade
Youssef1313 Jul 24, 2025
88f9586
TEMPORARY: REVERT ME LATER
Youssef1313 Jul 24, 2025
3608901
Cleanup
Youssef1313 Jul 24, 2025
0f8d219
Merge branch 'main' into dev/amauryleve/arcade
Youssef1313 Jul 24, 2025
fca615f
Update azure-pipelines.yml
Youssef1313 Jul 24, 2025
557e620
Update Directory.Build.targets
Youssef1313 Jul 25, 2025
e4365e7
20m timeout
Youssef1313 Jul 25, 2025
2d2faa1
Revert temporary changes
Youssef1313 Jul 28, 2025
e7b332f
Does that work?
Youssef1313 Jul 28, 2025
d02f739
Progress
Youssef1313 Jul 28, 2025
aaca930
Fix
Youssef1313 Jul 28, 2025
2f20611
Fix trx
Youssef1313 Jul 28, 2025
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<!-- Test config -->
<PropertyGroup>
<!-- Needs to be setup globally so that arcade doesn't bring xUnit to playground and other test projects -->
<TestRunnerName>TestingPlatformRunner</TestRunnerName>
<TestRunnerName>Microsoft.Testing.Platform</TestRunnerName>
</PropertyGroup>

<!-- Polyfill config -->
Expand Down
4 changes: 4 additions & 0 deletions azure-pipelines-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ extends:
/bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
name: Test
displayName: Test
env:
TESTINGPLATFORM_DEFAULT_HANG_TIMEOUT: 5m

- task: CopyFiles@2
displayName: 'Copy binlogs'
Expand Down Expand Up @@ -217,6 +219,8 @@ extends:
./test.sh --configuration $(_BuildConfig) --ci --test --integrationTest --nobl /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog
name: Test
displayName: Tests
env:
TESTINGPLATFORM_DEFAULT_HANG_TIMEOUT: 5m

- task: 1ES.PublishBuildArtifacts@1
displayName: 'Publish Test Results folders'
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ stages:
# Because the build step is using -ci flag, restore is done in a local .packages directory.
# We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
# Otherwise, props/targets are not imported. It's important that they are imported so that IsTestingPlatformApplication ends up being set.
- script: dotnet test -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
- script: dotnet test -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress -p:UsingDotNetTest=true
name: Test
displayName: Test
env:
Expand Down Expand Up @@ -193,7 +193,7 @@ stages:
# Because the build step is using -ci flag, restore is done in a local .packages directory.
# We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
# Otherwise, props/targets are not imported. It's important that they are imported so that IsTestingPlatformApplication ends up being set.
- script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
- script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)/artifacts/TestResults/$(_BuildConfig)/TestStep.binlog --no-progress -p:UsingDotNetTest=true
name: Test
displayName: Test
env:
Expand Down Expand Up @@ -257,7 +257,7 @@ stages:
# Because the build step is using -ci flag, restore is done in a local .packages directory.
# We need to pass NUGET_PACKAGES so that when dotnet test is doing evaluation phase on the projects, it can resolve .props/.targets from packages and import them.
# Otherwise, props/targets are not imported. It's important that they are imported so that IsTestingPlatformApplication ends up being set.
- script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)\artifacts\TestResults\$(_BuildConfig)\TestStep.binlog --no-progress
- script: dotnet test --solution NonWindowsTests.slnf -c $(_BuildConfig) --no-build -bl:$(BUILD.SOURCESDIRECTORY)/artifacts/TestResults/$(_BuildConfig)/TestStep.binlog --no-progress -p:UsingDotNetTest=true
name: Test
displayName: Test
env:
Expand Down
91 changes: 0 additions & 91 deletions eng/TestingPlatformRunner/TestingPlatform.Runner.targets
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions eng/TestingPlatformRunner/TestingPlatformRunner.targets
View file
Open in desktop

This file was deleted.

29 changes: 15 additions & 14 deletions test/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,24 @@

<MSTestAnalysisMode>Recommended</MSTestAnalysisMode>

<!-- Arcade runner settings -->
<TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --diagnostic --diagnostic-output-directory $(RepoRoot)artifacts/log/$(Configuration) --diagnostic-output-fileprefix $(ModuleName) --diagnostic-verbosity trace</TestRunnerAdditionalArguments>
<TestRunnerAdditionalArguments Condition=" $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' ">$(TestRunnerAdditionalArguments) --crashdump</TestRunnerAdditionalArguments>
<TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --hangdump --hangdump-timeout 15m</TestRunnerAdditionalArguments>
<TestRunnerAdditionalArguments Condition=" '$(EnableCodeCoverage)' == 'True' ">$(TestRunnerAdditionalArguments) --coverage --coverage-settings $(RepoRoot)test/coverage.config --coverage-output $(ModuleName).coverage</TestRunnerAdditionalArguments>
<!-- /Arcade runner settings -->
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --diagnostic --diagnostic-output-directory $(RepoRoot)artifacts/log/$(Configuration) --diagnostic-output-fileprefix $(ModuleName) --diagnostic-verbosity trace</TestingPlatformCommandLineArguments>
<TestingPlatformCommandLineArguments Condition=" $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp' ">$(TestingPlatformCommandLineArguments) --crashdump</TestingPlatformCommandLineArguments>
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --hangdump --hangdump-timeout 15m</TestingPlatformCommandLineArguments>
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-azdo</TestingPlatformCommandLineArguments>
<TestingPlatformCommandLineArguments Condition=" '$(EnableCodeCoverage)' == 'True' ">$(TestingPlatformCommandLineArguments) --coverage --coverage-settings $(RepoRoot)test/coverage.config --coverage-output $(ModuleName).coverage</TestingPlatformCommandLineArguments>

<!-- dotnet test runner settings - most duplicate from Arcade to have parity -->
</PropertyGroup>

<PropertyGroup Condition="'$(UsingDotNetTest)'=='true'">
<!-- By default, Arcade already adds report-trx, report-trx-filename, and results-directory -->
<!-- However, when we run with dotnet test, we need to add these options, but still don't duplicate them on Arcade -->
<!-- So we detect when running with dotnet test and only add them there. That's unfortunate because any invocation of dotnet test will need to be done with -p:UsingDotNetTest=true -->
<!-- An alternative is that we always add those options here, and introduce a property in Arcade so that Arcade doesn't add the options again -->

<!-- This usage is bad. See https://github.com/dotnet/arcade/issues/16003 -->
<_TestArchitecture>$(PlatformTarget)</_TestArchitecture>
<_TestArchitecture Condition="'$(PlatformTarget)' == '' or '$(PlatformTarget)' == 'AnyCpu'">x64</_TestArchitecture>

<_ResultFileNameNoExt>$(MSBuildProjectName)_$(TargetFramework)_$(_TestArchitecture)</_ResultFileNameNoExt>
<ResultsTrxPath>$(ArtifactsTestResultsDir)$(_ResultFileNameNoExt).trx</ResultsTrxPath>
<_TestResultTrxFileName>$([System.IO.Path]::GetFileName('$(ResultsTrxPath)'))</_TestResultTrxFileName>
<_TestResultDirectory>$([System.IO.Path]::GetDirectoryName('$(ResultsTrxPath)'))</_TestResultDirectory>
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-trx --report-trx-filename "$(_TestResultTrxFileName)" --results-directory "$(_TestResultDirectory)" --report-azdo $(TestRunnerAdditionalArguments)</TestingPlatformCommandLineArguments>
<!-- /dotnet test runner settings -->
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-trx --report-trx-filename $(MSBuildProjectName)_$(TargetFramework)_$(_TestArchitecture).trx --results-directory $(ArtifactsTestResultsDir)</TestingPlatformCommandLineArguments>
</PropertyGroup>

<ItemGroup Condition=" '$(EnableMSTestRunner)' == 'true' OR '$(UseInternalTestFramework)' == 'true' ">
Expand Down