Skip to content

Commit 2aa6a49

Browse files
Copilotbartelink
andauthored
Use TF_BUILD for CI package generation
Agent-Logs-Url: https://github.com/jet/equinox/sessions/9be0439c-738e-4a00-bc46-2b82022886f1 Co-authored-by: bartelink <206668+bartelink@users.noreply.github.com>
1 parent dd2f447 commit 2aa6a49

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
Tools and Tests flip this to false in order to ensure we validate with the recent one embdedded in the SDK-->
1515
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1616

17-
<!-- We want to opt in to publishing nugets per library, but only when CI=true -->
17+
<IsCiBuild Condition=" '$(CI)' == 'true' or '$(TF_BUILD)' == 'true' or '$(TF_BUILD)' == 'True' ">true</IsCiBuild>
18+
<!-- We want to opt in to publishing nugets per library, but only in CI -->
1819
<IsPackable>false</IsPackable>
1920
<PackageOutputPath>$(MSBuildThisFileDirectory)artifacts\nupkg</PackageOutputPath>
2021
</PropertyGroup>

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Target>
88
<Target Name="ComputeFileVersion" BeforeTargets="Build">
99
<PropertyGroup>
10-
<GeneratePackageOnBuild Condition=" '$(CI)' == 'true' and '$(IsPackable)' == 'true' ">true</GeneratePackageOnBuild>
10+
<GeneratePackageOnBuild Condition=" '$(IsCiBuild)' == 'true' and '$(IsPackable)' == 'true' ">true</GeneratePackageOnBuild>
1111
</PropertyGroup>
1212
</Target>
1313
</Project>

azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
vmImage: $(vmImage)
1414
variables:
1515
BUILD_ID: $(BUILD.BUILDNUMBER)
16-
CI: true
1716
EQUINOX_INTEGRATION_SKIP_EVENTSTORE: true
1817
EQUINOX_INTEGRATION_SKIP_COSMOS: true
1918
steps:

src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
33
<PropertyGroup>
44
<IsPackable>true</IsPackable>
5-
<GenerateDocumentationFile Condition=" '$(CI)' == 'true' ">true</GenerateDocumentationFile>
6-
<EnablePackageValidation Condition=" '$(CI)' == 'true' ">true</EnablePackageValidation>
5+
<GenerateDocumentationFile Condition=" '$(IsCiBuild)' == 'true' ">true</GenerateDocumentationFile>
6+
<EnablePackageValidation Condition=" '$(IsCiBuild)' == 'true' ">true</EnablePackageValidation>
77
</PropertyGroup>
88
</Project>

tools/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
33
<PropertyGroup>
44
<IsPackable>true</IsPackable>
5-
<GenerateDocumentationFile Condition=" '$(CI)' == 'true' ">true</GenerateDocumentationFile>
6-
<EnablePackageValidation Condition=" '$(CI)' == 'true' ">true</EnablePackageValidation>
5+
<GenerateDocumentationFile Condition=" '$(IsCiBuild)' == 'true' ">true</GenerateDocumentationFile>
6+
<EnablePackageValidation Condition=" '$(IsCiBuild)' == 'true' ">true</EnablePackageValidation>
77
</PropertyGroup>
88
</Project>

0 commit comments

Comments
 (0)