Skip to content

Commit 0bc10be

Browse files
Allow repos to opt-out of building tests (#46394)
1 parent e90b269 commit 0bc10be

File tree

8 files changed

+24
-1
lines changed

8 files changed

+24
-1
lines changed

src/SourceBuild/content/repo-projects/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101

102102
<!-- Only pass these properites through when necessary to reduce command line noise. -->
103103
<BuildArgs Condition="'$(CrossBuild)' == 'true'">$(BuildArgs) /p:CrossBuild=true</BuildArgs>
104-
<BuildArgs Condition="'$(DotNetBuildTests)' == 'true'">$(BuildArgs) /p:DotNetBuildTests=true</BuildArgs>
105104
<BuildArgs Condition="'$(NuGetConfigFile)' != ''">$(BuildArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</BuildArgs>
106105
<BuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(BuildArgs) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime)</BuildArgs>
107106
<BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</BuildArgs>

src/SourceBuild/content/repo-projects/Directory.Build.targets

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
<BuildArgs>$(BuildArgs) /p:PortableBuild=$(PortableBuild)</BuildArgs>
3838
<BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
3939
<BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
40+
41+
<!-- Only pass when enabled to reduce command line noise. -->
42+
<BuildArgs Condition="'$(DotNetBuildTests)' == 'true' and '$(DotNetBuildTestsOptOut)' != 'true'">$(BuildArgs) /p:DotNetBuildTests=true</BuildArgs>
4043
</PropertyGroup>
4144

4245
<PropertyGroup>

src/SourceBuild/content/repo-projects/aspnetcore.proj

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<BuildArgs>$(BuildArgs) /p:EnablePackageValidation=false</BuildArgs>
3131

3232
<LogVerbosityOptOut>true</LogVerbosityOptOut>
33+
34+
<!-- Tests are failing to build: https://github.com/dotnet/aspnetcore/issues/60095 -->
35+
<DotNetBuildTestsOptOut>true</DotNetBuildTestsOptOut>
3336
</PropertyGroup>
3437

3538
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">

src/SourceBuild/content/repo-projects/efcore.proj

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<!-- Tests are failing to build: https://github.com/dotnet/efcore/issues/35547 -->
5+
<DotNetBuildTestsOptOut>true</DotNetBuildTestsOptOut>
6+
</PropertyGroup>
7+
38
<ItemGroup>
49
<RepositoryReference Include="arcade" />
510
<RepositoryReference Include="runtime" />

src/SourceBuild/content/repo-projects/roslyn.proj

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<PropertyGroup>
44
<LogVerbosityOptOut>true</LogVerbosityOptOut>
55

6+
<!-- Tests are failing to build: https://github.com/dotnet/roslyn/issues/76960 -->
7+
<DotNetBuildTestsOptOut>true</DotNetBuildTestsOptOut>
8+
69
<!-- Roslyn's build.cmd adds -build automatically. On non-windows, use the default -->
710
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(FlagParameterPrefix)restore</BuildActions>
811
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(BuildActions) $(FlagParameterPrefix)pack</BuildActions>

src/SourceBuild/content/repo-projects/vstest.proj

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
<PropertyGroup>
44
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
5+
6+
<!-- Tests are failing to build: https://github.com/microsoft/vstest/issues/14994 -->
7+
<DotNetBuildTestsOptOut>true</DotNetBuildTestsOptOut>
58
</PropertyGroup>
69

710
<ItemGroup>

test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
<PropertyGroup>
1010
<TargetFramework>net472</TargetFramework>
11+
<!-- For product build, the .NET Framework TFM only builds in the second build pass as it depends on assets from other
12+
verticals that are built in the first build pass.
13+
Disabling this project as references are not building in this case. -->
14+
<ExcludeFromBuild Condition="'$(DotNetBuild)' == 'true' and '$(DotNetBuildPass)' != '2'">true</ExcludeFromBuild>
1115
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
1216

1317
<!-- By default test projects don't append TargetFramework to output path, but for multi-targeted tests

test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<PropertyGroup>
33
<TargetFrameworks>net472;$(ToolsetTargetFramework)</TargetFrameworks>
44
<TargetFrameworks Condition=" '$([MSBuild]::IsOSPlatform(`Windows`))' == 'false' ">$(ToolsetTargetFramework)</TargetFrameworks>
5+
<!-- For product build, the .NET Framework TFM only builds in the second build pass as it depends on assets from other
6+
verticals that are built in the first build pass. -->
7+
<TargetFrameworks Condition="'$(DotNetBuild)' == 'true' and '$(DotNetBuildPass)' != '2'">$(ToolsetTargetFramework)</TargetFrameworks>
58
<OutputType Condition="'$(TargetFramework)' == '$(ToolsetTargetFramework)'">Exe</OutputType>
69
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
710

0 commit comments

Comments
 (0)