Skip to content

Commit 1076d97

Browse files
committed
Revert "Only read configuration when it's stable in targets"
This reverts commit abf4f63.
1 parent abf4f63 commit 1076d97

2 files changed

Lines changed: 8 additions & 16 deletions

File tree

Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,23 @@
1515
<ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>
1616
<ArtifactsObjDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'obj'))</ArtifactsObjDir>
1717
<ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
18+
<ArtifactsTestResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'TestResults', '$(Configuration)'))</ArtifactsTestResultsDir>
19+
<ArtifactsPackagesDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'packages', '$(Configuration)'))</ArtifactsPackagesDir>
1820
<OutDirName>$(MSBuildProjectName)</OutDirName>
1921

2022
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\'))</BaseIntermediateOutputPath>
23+
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
2124

2225
<BaseOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\'))</BaseOutputPath>
26+
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
27+
28+
<PackageOutputPath>$(ArtifactsPackagesDir)</PackageOutputPath>
2329
</PropertyGroup>
2430

2531
<PropertyGroup>
2632
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
33+
<_MTPResultsDirectory>$(ArtifactsTestResultsDir)</_MTPResultsDirectory>
34+
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --results-directory $(_MTPResultsDirectory) --report-trx --report-trx-filename $(MSBuildProjectName).$(TargetFramework).$(OS).trx</TestingPlatformCommandLineArguments>
2735
</PropertyGroup>
2836

2937
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

Directory.Build.targets

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)