Skip to content

Commit 9fc22e1

Browse files
Copilotbartelink
andauthored
Remove IsCiBuild and delete package target
Agent-Logs-Url: https://github.com/jet/equinox/sessions/65986a44-e649-4ba0-9e24-08bff4fdda4b Co-authored-by: bartelink <206668+bartelink@users.noreply.github.com>
1 parent 28fa5a8 commit 9fc22e1

5 files changed

Lines changed: 8 additions & 11 deletions

File tree

Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
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-
<IsCiBuild Condition=" '$(CI)' == 'true' or '$(TF_BUILD)' != '' ">true</IsCiBuild>
18-
<!-- We want to opt in to publishing nugets per library, but only in CI -->
17+
<!-- We want to opt in to publishing nugets per library, but only when CI=true -->
1918
<IsPackable>false</IsPackable>
2019
<PackageOutputPath>$(MSBuildThisFileDirectory)artifacts\nupkg</PackageOutputPath>
2120
</PropertyGroup>

Directory.Build.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,4 @@
55
<FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(BUILD_ID)</FileVersion>
66
</PropertyGroup>
77
</Target>
8-
<Target Name="SetGeneratePackageOnBuild" BeforeTargets="Build">
9-
<PropertyGroup>
10-
<GeneratePackageOnBuild Condition=" '$(IsCiBuild)' == 'true' and '$(IsPackable)' == 'true' ">true</GeneratePackageOnBuild>
11-
</PropertyGroup>
12-
</Target>
138
</Project>

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
vmImage: $(vmImage)
1414
variables:
1515
BUILD_ID: $(BUILD.BUILDNUMBER)
16+
CI: true
1617
EQUINOX_INTEGRATION_SKIP_EVENTSTORE: true
1718
EQUINOX_INTEGRATION_SKIP_COSMOS: true
1819
steps:

src/Directory.Build.props

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

tools/Directory.Build.props

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

0 commit comments

Comments
 (0)