Move ContinuousIntegrationBuild to workflow file for consistency

bitwarden · Sep 25, 2023 · 9ee386c · 9ee386c
1 parent 970d86b
commit 9ee386c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -77,7 +77,10 @@ jobs:
         run: dotnet restore
 
       - name: Run build
-        run: dotnet build --no-restore --configuration Release
+        run: >
+          dotnet build
+          --no-restore
+          --configuration Release
 
       - name: Run tests
         run: >
@@ -108,7 +111,11 @@ jobs:
         run: dotnet restore
 
       - name: Run build
-        run: dotnet build --no-restore --configuration Release
+        run: >
+          dotnet build
+          --no-restore
+          --configuration Release
+          -p:ContinuousIntegrationBuild=true
 
       # When triggered by `push` or `pull_request` events, generate a prerelease version
       # for the package, so as to clearly indicate that it's not a stable version release.
@@ -127,6 +134,7 @@ jobs:
           --no-restore
           --no-build
           --configuration Release
+          -p:ContinuousIntegrationBuild=true
           ${{ steps.prerelease-version.outputs.suffix && format('--version-suffix {0}', steps.prerelease-version.outputs.suffix) || '' }}
 
       - name: Upload artifacts

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,9 +4,8 @@
     <CurrentPreviewTfm>net8.0</CurrentPreviewTfm>
     <!--<IncludePreview>true</IncludePreview>-->
     <IncludePreview Condition="'$(IncludePreview)' == ''">false</IncludePreview>
-    <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
   </PropertyGroup>
-    
+
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>