Skip to content

Commit 24046ff

Browse files
author
Simon Zhao
committed
Add props file
1 parent 3b1b0d8 commit 24046ff

File tree

20 files changed

+39
-51
lines changed

20 files changed

+39
-51
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<Import Project="$(RepositoryEngineeringDir)CodeStyle.props" />
55
<Import Project="$(RepositoryEngineeringDir)FacadeAssemblies.props" />
66
<Import Project="$(RepositoryEngineeringDir)ApiCompatibility\PublicApiAnalyzer.props" />
7+
<Import Project="$(RepositoryEngineeringDir)Test.props" Condition="'$(IsTestProject)' == 'true'"/>
78

89
<PropertyGroup>
910
<!-- Remove hardcoded .NET versions when Arcade is upgraded to .NET 9.0. https://github.com/dotnet/winforms/issues/9851-->
@@ -25,11 +26,6 @@
2526
>true</IsAnalyzerProject>
2627
</PropertyGroup>
2728

28-
<!-- Making all tests run sequentially until we regroup tests. Tracked under issue https://github.com/dotnet/winforms/issues/8810. -->
29-
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
30-
<XUnitCoreSettingsFile>$(RepositoryEngineeringDir)xunit.runner.json</XUnitCoreSettingsFile>
31-
</PropertyGroup>
32-
3329
<!--
3430
Set assembly version to align with major and minor version, as for the patches and revisions should be manually
3531
updated per assembly if it is serviced.

‎Directory.Build.targets

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<Import Project="$(RepositoryEngineeringDir)packageContent.targets" />
66
<Import Project="$(RepositoryEngineeringDir)versioning.targets" />
77
<Import Project="$(RepositoryEngineeringDir)ApiCompatibility\PublicApiAnalyzer.targets" />
8+
<Import Project="$(RepositoryEngineeringDir)Test.targets" Condition="'$(IsTestProject)' == 'true' "/>
89

910
<!-- CA1416 Validate platform compatibility. Do not apply to netstandard as it does not have the attribute. -->
1011
<ItemGroup>
@@ -43,12 +44,6 @@
4344
<RedistTargetFrameworkName>$(NetCurrent)</RedistTargetFrameworkName>
4445
</PropertyGroup>
4546

46-
<PropertyGroup Condition="'$(IsTestProject)' == 'true' ">
47-
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
48-
<Platform Condition="'$(Platform)' == 'AnyCPU' or '$(Platform)' == 'Any CPU'">$(TargetArchitecture)</Platform>
49-
<TestArchitectures>$(TargetArchitecture)</TestArchitectures>
50-
</PropertyGroup>
51-
5247
<Target Name="InstrumentModulesNoBuild" BeforeTargets="RunTests" Condition="'$(IsUnitTestProject)' == 'true'">
5348
<Coverlet.MSbuild.Tasks.InstrumentationTask
5449
Condition="'$(CollectCoverage)' == 'true'"

‎eng/Test.props

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<!-- Making all tests run sequentially until we regroup tests. Tracked under issue https://github.com/dotnet/winforms/issues/8810. -->
4+
<PropertyGroup>
5+
<XUnitCoreSettingsFile>$(RepositoryEngineeringDir)xunit.runner.json</XUnitCoreSettingsFile>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
10+
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
11+
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
12+
</ItemGroup>
13+
</Project>

‎eng/Test.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
5+
<Platform Condition="'$(Platform)' == 'AnyCPU' or '$(Platform)' == 'Any CPU'">$(TargetArchitecture)</Platform>
6+
<TestArchitectures>$(TargetArchitecture)</TestArchitectures>
7+
</PropertyGroup>
8+
</Project>

‎eng/pipelines/build.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,22 @@ jobs:
134134
/bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\PackSignPublish-${{ parameters.targetArchitecture }}.binlog
135135
displayName: Pack, Sign, and Publish
136136

137+
- ${{ if eq(variables['_BuildConfig'], 'Debug') }}:
138+
- script: Write-Output "test1"
139+
displayName: test1
140+
141+
- ${{ if eq('${{ parameters.targetArchitecture }}', 'x64') }}:
142+
- script: Write-Output "test2"
143+
displayName: test2
144+
145+
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
146+
- script: Write-Output "test3"
147+
displayName: test3
148+
149+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
150+
- script: Write-Output "test4"
151+
displayName: test4
152+
137153
# Merge code coverage data
138154
- pwsh: eng\MergeCoverageData.ps1 -configuration $(_BuildConfig) -artifactsDir '$(Build.SourcesDirectory)\artifacts'
139155
displayName: Merge Coverage Data

‎src/Microsoft.VisualBasic.Forms/tests/UnitTests/Microsoft.VisualBasic.Forms.Tests.vbproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1010
</PropertyGroup>
1111

12-
<ItemGroup>
13-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
14-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
15-
</ItemGroup>
16-
1712
<ItemGroup>
1813
<ProjectReference Include="..\..\..\System.Design\src\System.Design.Facade.csproj" />
1914
<ProjectReference Include="..\..\..\System.Drawing\src\System.Drawing.Facade.csproj" />

‎src/Microsoft.VisualBasic/tests/UnitTests/Microsoft.VisualBasic.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
12-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
1311
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
1412
</ItemGroup>
1513

‎src/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,5 @@
140140

141141
<ItemGroup>
142142
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
143-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
144143
</ItemGroup>
145144
</Project>

‎src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
1717
<PackageReference Include="Verify.Xunit" Version="$(VerifyXunitVersion)" />
18-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
1918
</ItemGroup>
2019

2120
<ItemGroup>

‎src/System.Windows.Forms.Analyzers/tests/UnitTests/System.Windows.Forms.Analyzers.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
2424
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
2525
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
26-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

‎src/System.Windows.Forms.Design/tests/UnitTests/System.Windows.Forms.Design.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<ItemGroup>
1616
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
18-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
19-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
20-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
2118
</ItemGroup>
2219

2320
<ItemGroup>

‎src/System.Windows.Forms.Primitives/tests/TestUtilities.Tests/System.Windows.Forms.Primitives.TestUtilities.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
13-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
14-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
1512
</ItemGroup>
1613

1714
<ItemGroup>

‎src/System.Windows.Forms.Primitives/tests/TestUtilities/System.Windows.Forms.Primitives.TestUtilities.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
10-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
1110
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
12-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
1311
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
1412
</ItemGroup>
1513

‎src/System.Windows.Forms.Primitives/tests/UnitTests/System.Windows.Forms.Primitives.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
15-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
16-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
17-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
1815
</ItemGroup>
1916

2017
<ItemGroup>

‎src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/System.Windows.Forms.PrivateSourceGenerators.Tests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<ItemGroup>
4-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
5-
</ItemGroup>
6-
73
<ItemGroup>
84
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)">
95
<PrivateAssets>all</PrivateAssets>

‎src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/System.Windows.Forms.IntegrationTests.Common.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="$(MoqPackage)" Version="$(MoqPackageVersion)" />
9-
<PackageReference Include="$(XUnitStaFactPackage)" Version="$(XUnitStaFactPackageVersion)" />
10-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
118
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
129
</ItemGroup>
1310

‎src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/System.Windows.Forms.UI.IntegrationTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
16-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
1716
</ItemGroup>
1817

1918
<ItemGroup>

‎src/System.Windows.Forms/tests/InteropTests/System.Windows.Forms.Interop.Tests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010

1111
<Import Project="ProjectReference.targets" Sdk="Microsoft.DotNet.CMake.Sdk" />
1212

13-
<ItemGroup>
14-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
15-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
16-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
17-
</ItemGroup>
18-
1913
<ItemGroup>
2014
<ProjectReference Include="..\..\src\System.Windows.Forms.csproj" />
2115
<ProjectReference Include="..\TestUtilities\System.Windows.Forms.TestUtilities.csproj" />

‎src/System.Windows.Forms/tests/TestUtilities/System.Windows.Forms.TestUtilities.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
109
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
11-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
1210
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
1311
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
1412
</ItemGroup>

‎src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
18-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
19-
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
20-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
2118
</ItemGroup>
2219

2320
<ItemGroup>

0 commit comments

Comments
 (0)