Skip to content

Commit fe3ba4f

Browse files
HaploisHaplois
authored
Refactored projects to use PackageReference. (#830)
1 parent 0b95a26 commit fe3ba4f

File tree

82 files changed

+1218
-1652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1218
-1652
lines changed

‎TestFx.sln

+4
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ EndProject
119119
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformServices.Portable.Unit.Tests", "test\UnitTests\PlatformServices.Portable.Unit.Tests\PlatformServices.Portable.Unit.Tests.csproj", "{E3C630FE-AF89-4C95-B1B9-2409B1107208}"
120120
EndProject
121121
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformServices.Universal.Unit.Tests", "test\UnitTests\PlatformServices.Universal.Unit.Tests\PlatformServices.Universal.Unit.Tests.csproj", "{FA7C719F-A400-45AF-8091-7C23435617A8}"
122+
ProjectSection(ProjectDependencies) = postProject
123+
{DF131865-84EE-4540-8112-E88ACEBDEA09} = {DF131865-84EE-4540-8112-E88ACEBDEA09}
124+
{5D153CAA-80C2-4551-9549-6C406FCEEFB1} = {5D153CAA-80C2-4551-9549-6C406FCEEFB1}
125+
EndProjectSection
122126
EndProject
123127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTest.Core.Unit.Tests", "test\UnitTests\MSTest.Core.Unit.Tests\MSTest.Core.Unit.Tests.csproj", "{0A4A76DD-FEE1-4D04-926B-38E1A24A7ED2}"
124128
EndProject

‎samples/FxExtensibility/FxExtensibility.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TestFxRoot Condition="$(TestFxRoot) == ''">..\..\</TestFxRoot>
4+
<TestFxRoot Condition=" '$(TestFxRoot)' == '' ">..\..\</TestFxRoot>
55
</PropertyGroup>
66
<Import Project="$(TestFxRoot)scripts\build\TestFx.Settings.targets" />
7+
78
<PropertyGroup>
89
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
910
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,7 +40,7 @@
3940
<Compile Include="Properties\AssemblyInfo.cs" />
4041
</ItemGroup>
4142
<ItemGroup>
42-
<ProjectReference Include="..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj">
43+
<ProjectReference Include="$(TestFxRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj">
4344
<Project>{7252d9e3-267d-442c-96bc-c73aef3241d6}</Project>
4445
<Name>MSTest.Core</Name>
4546
</ProjectReference>

‎scripts/Build.ps1

+7-60
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,6 @@ $TFB_Solutions = @(
8282
"TestFx.sln"
8383
)
8484

85-
$TFB_NetCoreProjects = @(
86-
"src\Adapter\PlatformServices.NetCore\PlatformServices.NetCore.csproj"
87-
88-
"test\ComponentTests\TestAssets\TestProjectForAssemblyResolution\TestProjectForAssemblyResolution.csproj"
89-
"test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj"
90-
"test\E2ETests\TestAssets\DataRowTestProject\DataRowTestProject.csproj"
91-
"test\E2ETests\TestAssets\DataSourceTestProject\DataSourceTestProject.csproj"
92-
"test\E2ETests\TestAssets\DeploymentTestProject\DeploymentTestProject.csproj"
93-
"test\E2ETests\TestAssets\DeploymentTestProjectNetCore\DeploymentTestProjectNetCore.csproj"
94-
"test\E2ETests\TestAssets\DoNotParallelizeTestProject\DoNotParallelizeTestProject.csproj"
95-
"test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj"
96-
"test\E2ETests\TestAssets\TimeoutTestProject\TimeoutTestProject.csproj"
97-
"test\E2ETests\TestAssets\TimeoutTestProjectNetCore\TimeoutTestProjectNetCore.csproj"
98-
"test\UnitTests\PlatformServices.NetCore.Unit.Tests\PlatformServices.NetCore.Unit.Tests.csproj"
99-
)
100-
10185
#
10286
# Script Preferences
10387
#
@@ -154,43 +138,34 @@ function Perform-Restore {
154138
$toolset = Locate-Toolset
155139

156140
if ($TFB_ClearPackageCache) {
157-
Write-Log " Clearing local package cache..."
141+
Write-Log "Clearing local package cache..."
158142
& $nuget locals all -clear
159143
}
160144

161-
Write-Log " Starting toolset restore..."
162-
Write-Verbose "$nuget restore -msbuildVersion $msbuildVersion -verbosity normal -nonInteractive -configFile $nugetConfig $toolset"
163-
& $nuget restore -msbuildVersion $msbuildVersion -verbosity normal -nonInteractive -configFile $nugetConfig $toolset
145+
Write-Log "Starting toolset restore..."
146+
Write-Verbose "$nuget restore -verbosity normal -nonInteractive -configFile $nugetConfig $toolset"
147+
& $nuget restore -verbosity normal -nonInteractive -configFile $nugetConfig $toolset
164148

165149
if ($lastExitCode -ne 0) {
166150
throw "The restore failed with an exit code of '$lastExitCode'."
167151
}
168152

169153
Write-Verbose "Locating MSBuild install path..."
170154
$msbuildPath = Locate-MSBuildPath
155+
Write-Verbose "MSBuild install path: $msbuildPath"
171156

172157
Write-Verbose "Starting solution restore..."
173158
foreach ($solution in $TFB_Solutions) {
174159
$solutionPath = Locate-Item -relativePath $solution
175160

176-
Write-Verbose "$nuget restore -msbuildPath $msbuildPath -verbosity quiet -nonInteractive -configFile $nugetConfig $solutionPath"
177-
& $nuget restore -msbuildPath $msbuildPath -verbosity quiet -nonInteractive -configFile $nugetConfig $solutionPath
161+
Write-Verbose "$nuget restore -msbuildPath $msbuildPath -verbosity normal -nonInteractive -configFile $nugetConfig $solutionPath"
162+
& $nuget restore -msbuildPath $msbuildPath -verbosity normal -nonInteractive -configFile $nugetConfig $solutionPath
178163
}
179164

180165
if ($lastExitCode -ne 0) {
181166
throw "The restore failed with an exit code of '$lastExitCode'."
182167
}
183168

184-
$msbuild = Join-Path $msbuildPath "MSBuild.exe"
185-
186-
Write-Verbose "Starting restore for NetCore Projects"
187-
foreach ($project in $TFB_NetCoreProjects) {
188-
$projectPath = Locate-Item -relativePath $project
189-
190-
Write-Verbose "$msbuild /t:restore -verbosity:minimal $projectPath /m"
191-
& $msbuild /t:restore -verbosity:minimal $projectPath /m
192-
}
193-
194169
if ($lastExitCode -ne 0) {
195170
throw "The restore failed with an exit code of '$lastExitCode'."
196171
}
@@ -300,34 +275,6 @@ function Create-NugetPackages {
300275
Write-Log "Create-NugetPackages: Complete. {$(Get-ElapsedTime($timer))}"
301276
}
302277

303-
function Replace-InFile($File, $RegEx, $ReplaceWith) {
304-
$content = Get-Content -Raw -Encoding utf8 $File
305-
$newContent = ($content -replace $RegEx, $ReplaceWith)
306-
if (-not $content.Equals($newContent)) {
307-
Write-Log "Updating TestPlatform version in $File"
308-
$newContent | Set-Content -Encoding utf8 $File -NoNewline
309-
}
310-
}
311-
312-
function Sync-PackageVersions {
313-
$versionsRegex = '(?mi)<(TestPlatformVersion.*?)>(.*?)<\/TestPlatformVersion>'
314-
$packageRegex = '(?mi)<package id="Microsoft\.TestPlatform([0-9a-z.]+)?" version="([0-9a-z.-]*)"'
315-
$sourceRegex = '(?mi)(.+[a-z =]+\@?\")Microsoft\.TestPlatform\.([0-9.-a-z]+)\";'
316-
317-
if ([String]::IsNullOrWhiteSpace($TestPlatformVersion)) {
318-
$TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.TestPlatformVersion).InnerText
319-
}
320-
else {
321-
Replace-InFile -File $TF_VERSIONS_FILE -RegEx $versionsRegex -ReplaceWith "<`$1>$TestPlatformVersion</TestPlatformVersion>"
322-
}
323-
324-
(Get-ChildItem "$PSScriptRoot\..\src\*packages.config", "$PSScriptRoot\..\test\*packages.config" -Recurse) | ForEach-Object {
325-
Replace-InFile -File $_ -RegEx $packageRegex -ReplaceWith ('<package id="Microsoft.TestPlatform$1" version="{0}"' -f $TestPlatformVersion)
326-
}
327-
328-
Replace-InFile -File "$PSScriptRoot\..\test\E2ETests\Automation.CLI\CLITestBase.common.cs" -RegEx $sourceRegex -ReplaceWith ('$1Microsoft.TestPlatform.{0}";' -f $TestPlatformVersion)
329-
}
330-
331278
function ShouldRunStep([string[]]$CurrentSteps) {
332279
if ($Force) {
333280
return $true

‎scripts/PortableToFullPdb.ps1

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ Param(
88
[System.String] $Configuration = "Release"
99
)
1010

11+
. $PSScriptRoot\common.lib.ps1
12+
1113
#
1214
# Variables
1315
#
1416
Write-Verbose "Setup environment variables."
15-
$TF_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName
16-
$TF_PACKAGES_DIR = Join-Path $TF_ROOT_DIR "packages"
17-
$TF_OUT_DIR = Join-Path $TF_ROOT_DIR "artifacts"
18-
$TF_PortablePdbs =@("PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb")
17+
$TF_PortablePdbs = @("PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb")
1918

20-
$PdbConverterToolVersion = "1.1.0-beta2-21064-01"
19+
$PdbConverterToolVersion = Get-PackageVersion -PackageName "MicrosoftDiaSymReaderPdb2PdbVersion"
2120

2221
function Locate-PdbConverterTool
2322
{
24-
$pdbConverter = Join-Path -path $TF_PACKAGES_DIR -ChildPath "Microsoft.DiaSymReader.Pdb2Pdb.$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
23+
$pdbConverter = Join-Path -path $TF_PACKAGES_DIR -ChildPath "Microsoft.DiaSymReader.Pdb2Pdb\$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
2524

2625
if (!(Test-Path -path $pdbConverter))
2726
{

‎scripts/build/TestFx.Loc.targets

+15-15
Original file line numberDiff line numberDiff line change
@@ -23,55 +23,55 @@
2323

2424
<!-- Localization for Libraries.
2525
'UseSharedResources' flag is true for desktop and netcore as their resources are common and present at a shared location -->
26-
<Target Name="TestFxLocalization" Condition="$(IsVsixProj) =='' and $(IsVsixProj) !='true'" BeforeTargets="BeforeBuild" DependsOnTargets="GatherResxResources">
27-
<CallTarget Targets="CreateLocalizeXLF;CreateLocalizeResx" Condition="'$(HasResxResources)' == 'true' and '$(UseSharedResources)' == ''"/>
28-
<CallTarget Targets="CreateLocalizeXLFShared;CreateLocalizeResxShared" Condition="'$(HasResxResources)' == 'true' and '$(UseSharedResources)' == 'true'"/>
26+
<Target Name="TestFxLocalization" Condition=" '$(IsVsixProj)' == '' and '$(IsVsixProj)' !='true' " BeforeTargets="BeforeBuild" DependsOnTargets="GatherResxResources">
27+
<CallTarget Targets="CreateLocalizeXLF;CreateLocalizeResx" Condition=" '$(HasResxResources)' == 'true' and '$(UseSharedResources)' == '' "/>
28+
<CallTarget Targets="CreateLocalizeXLFShared;CreateLocalizeResxShared" Condition=" '$(HasResxResources)' == 'true' and '$(UseSharedResources)' == 'true' "/>
2929
</Target>
3030

3131
<!-- Generate xlf files from Resources.resx by using command Build.cmd -uxlf -->
32-
<Target Name="CreateLocalizeXLF" Condition="'$(UpdateXlf)' == 'true'">
32+
<Target Name="CreateLocalizeXLF" Condition=" '$(UpdateXlf)' == 'true' ">
3333
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
3434
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
3535
</CreateItem>
36-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
37-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(ResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
36+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\$(FmDevXlfToolVersion)\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
37+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\$(FmDevXlfToolVersion)\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(ResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
3838
</Target>
3939

4040
<!-- Generate xlf files from Resources.resx for shared resources by using command Build.cmd -uxlf -->
41-
<Target Name="CreateLocalizeXLFShared" Condition="'$(UpdateXlf)' == 'true'">
41+
<Target Name="CreateLocalizeXLFShared" Condition=" '$(UpdateXlf)' == 'true' ">
4242
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
4343
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
4444
</CreateItem>
45-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
46-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
45+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\$(FmDevXlfToolVersion)\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
46+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\$(FmDevXlfToolVersion)\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
4747
</Target>
4848

4949
<!-- Generate language specific resx files from the xlf files -->
50-
<Target Name="CreateLocalizeResx" Condition="'$(IsLocalizedBuild)' == 'true'">
50+
<Target Name="CreateLocalizeResx" Condition=" '$(IsLocalizedBuild)' == 'true' ">
5151
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
5252
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
5353
</CreateItem>
54-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
54+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\$(FmDevXlfToolVersion)\tools\xlftool.exe writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
5555
<ItemGroup>
5656
<EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
5757
</ItemGroup>
5858
</Target>
5959

6060
<!-- Generate language specific resx files from the xlf files for shared resources -->
61-
<Target Name="CreateLocalizeResxShared" Condition="'$(IsLocalizedBuild)' == 'true'">
61+
<Target Name="CreateLocalizeResxShared" Condition=" '$(IsLocalizedBuild)' == 'true' ">
6262
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
6363
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
6464
</CreateItem>
65-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe writeTarget -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
65+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\$(FmDevXlfToolVersion)\tools\xlftool.exe writeTarget -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
6666
<ItemGroup>
6767
<EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
6868
</ItemGroup>
6969
</Target>
7070

7171
<!-- Localization for documentation files. -->
72-
<Target Name="CopyLocalizedXmls" BeforeTargets="BeforeBuild" Condition="$(LocDocumentationSubPath) != ''">
72+
<Target Name="CopyLocalizedXmls" BeforeTargets="BeforeBuild" Condition=" '$(LocDocumentationSubPath)' != ''">
7373
<PropertyGroup>
74-
<_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)</_SourcePath>
74+
<_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation\$(MsTestInternalTestFxLocalizedDocumentationVersion)\contentFiles\any\any\$(LocDocumentationSubPath)</_SourcePath>
7575
</PropertyGroup>
7676
<ItemGroup>
7777
<_LocalizedFiles Include="$(_SourcePath)\**\*.*" />

‎scripts/build/TestFx.Settings.targets

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TestFxRoot Condition="$(TestFxRoot) == ''">..\..\</TestFxRoot>
5-
<RepoRoot Condition="$(RepoRoot) == ''">$(MSBuildThisFileDirectory)..\..\</RepoRoot>
6-
<IncludeMicrosoftCommon Condition="$(IncludeMicrosoftCommon) == ''">true</IncludeMicrosoftCommon>
4+
<TestFxRoot Condition=" '$(TestFxRoot)' == '' ">..\..\</TestFxRoot>
5+
<RepoRoot Condition=" '$(RepoRoot)' == '' ">$(MSBuildThisFileDirectory)..\..\</RepoRoot>
6+
<IncludeMicrosoftCommon Condition=" '$(IncludeMicrosoftCommon)' == '' ">true</IncludeMicrosoftCommon>
77
</PropertyGroup>
88

99
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') and $(FrameworkIdentifier) != 'NetCore' and $(IncludeMicrosoftCommon) == 'true'" />
10-
<!-- Import props/targets with $(RepoRoot) since msbuild takes the relative path based on settings.targets and not with respect to the project. -->
11-
<Import Project="$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
12-
<Import Project="TestFx.Versions.targets" />
10+
<Import Project="$(MSBuildThisFileDirectory)TestFx.Versions.targets" />
1311

1412
<PropertyGroup>
1513
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -19,11 +17,11 @@
1917
<GenerateLCE>true</GenerateLCE>
2018
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
2119
<SignAssembly>true</SignAssembly>
22-
<PublicSign Condition="'$(IsLocalizedBuild)' == '' or '$(IsLocalizedBuild)' != 'true'">true</PublicSign>
20+
<PublicSign Condition=" '$(IsLocalizedBuild)' == '' or '$(IsLocalizedBuild)' != 'true'">true</PublicSign>
2321
<!-- Temporarily turning on Delay signing for Localized builds because publickey = true is not passed on to the assembler to create resource assmblies.-->
24-
<DelaySign Condition="'$(IsLocalizedBuild)' == 'true'">true</DelaySign>
25-
<OutputPath Condition="$(OutputPath) == ''">$(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
26-
<IntermediatePath Condition="$(IntermediatePath) == ''">$(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\obj\</IntermediatePath>
22+
<DelaySign Condition=" '$(IsLocalizedBuild)' == 'true' ">true</DelaySign>
23+
<OutputPath Condition=" '$(OutputPath)' == '' ">$(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
24+
<IntermediatePath Condition=" '$(IntermediatePath)' == '' ">$(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\obj\</IntermediatePath>
2725
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2826
</PropertyGroup>
2927

@@ -35,6 +33,6 @@
3533
<PropertyGroup>
3634
<RunCodeAnalysis>false</RunCodeAnalysis>
3735
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)stylecop.ruleset</CodeAnalysisRuleSet>
38-
<CodeAnalysisRuleSet Condition="$(IsTest) == 'true'">$(MSBuildThisFileDirectory)stylecop.test.ruleset</CodeAnalysisRuleSet>
36+
<CodeAnalysisRuleSet Condition=" '$(IsTest)' == 'true' ">$(MSBuildThisFileDirectory)stylecop.test.ruleset</CodeAnalysisRuleSet>
3937
</PropertyGroup>
4038
</Project>

0 commit comments

Comments
 (0)