From a0dfefbe5d1835744bc56ea6f762b40c72d24e5f Mon Sep 17 00:00:00 2001
From: AraHaan <seandhunt_7@yahoo.com>
Date: Wed, 20 Oct 2021 23:18:45 -0400
Subject: [PATCH 1/2] Shorten up the package build props file.

This should make it easier to edit it in the future as well.
---
 .../DotNet.ReproducibleBuilds.props           | 92 +++++++------------
 1 file changed, 31 insertions(+), 61 deletions(-)

diff --git a/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props b/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props
index a0d6a24..9016e70 100644
--- a/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props
+++ b/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props
@@ -12,67 +12,37 @@
   
   <!-- Enable ContinuousIntegrationBuild when running on CI -->
 
-  <!-- Azure Pipelines / DevOpsServer -->
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  
-  <!-- GitHub Actions -->
-  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  
-  <!-- AppVeyor -->
-  <PropertyGroup Condition="'$(APPVEYOR)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  
-  <!-- Set by many build agents -->
-  <PropertyGroup Condition="'$(CI)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  
-  <!-- Travis CI -->
-  <PropertyGroup Condition="'$(TRAVIS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  
-  <!-- Circle CI -->
-  <PropertyGroup Condition="'$(CIRCLECI)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  
-  <!-- AWS CodeBuild -->
-  <PropertyGroup Condition="'$(CODEBUILD_BUILD_ID)' != '' and '$(AWS_REGION)' != '' ">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <!-- Jenkins
-  https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
-  -->  
-  <PropertyGroup Condition="'$(BUILD_ID)' != '' and '$(BUILD_URL)' != '' ">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <!-- Google Cloud Build
-  https://cloud.google.com/build/docs/configuring-builds/substitute-variable-values
-  -->
-  <PropertyGroup Condition="'$(BUILD_ID)' != '' and '$(PROJECT_ID)' != '' ">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <!-- TeamCity
-  https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Server+Build+Properties
-  -->
-  <PropertyGroup Condition="'$(TEAMCITY_VERSION)' != '' ">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <!-- JetBrains Space
-  https://www.jetbrains.com/help/space/automation-environment-variables.html#general
-  -->
-  <PropertyGroup Condition="'$(JB_SPACE_API_URL)' != '' ">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  <PropertyGroup>
+    <!-- Azure Pipelines / DevOpsServer -->
+    <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild>
+    <!-- GitHub Actions -->
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+    <!-- AppVeyor -->
+    <ContinuousIntegrationBuild Condition="'$(APPVEYOR)' == 'true'">true</ContinuousIntegrationBuild>
+    <!-- Set by many build agents -->
+    <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
+    <!-- Travis CI -->
+    <ContinuousIntegrationBuild Condition="'$(TRAVIS)' == 'true'">true</ContinuousIntegrationBuild>
+    <!-- Circle CI -->
+    <ContinuousIntegrationBuild Condition="'$(CIRCLECI)' == 'true'">true</ContinuousIntegrationBuild>
+    <!-- AWS CodeBuild -->
+    <ContinuousIntegrationBuild Condition="'$(CODEBUILD_BUILD_ID)' != '' and '$(AWS_REGION)' != '' ">true</ContinuousIntegrationBuild>
+    <!-- Jenkins
+    https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
+    -->
+    <ContinuousIntegrationBuild Condition="'$(BUILD_ID)' != '' and '$(BUILD_URL)' != '' ">true</ContinuousIntegrationBuild>
+    <!-- Google Cloud Build
+    https://cloud.google.com/build/docs/configuring-builds/substitute-variable-values
+    -->
+    <ContinuousIntegrationBuild Condition="'$(BUILD_ID)' != '' and '$(PROJECT_ID)' != '' ">true</ContinuousIntegrationBuild>
+    <!-- TeamCity
+    https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Server+Build+Properties
+    -->
+    <ContinuousIntegrationBuild Condition="'$(TEAMCITY_VERSION)' != '' ">true</ContinuousIntegrationBuild>
+    <!-- JetBrains Space
+    https://www.jetbrains.com/help/space/automation-environment-variables.html#general
+    -->
+    <ContinuousIntegrationBuild Condition="'$(JB_SPACE_API_URL)' != '' ">true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
 </Project>

From 72f2f4266f80323d8b6a269ae1abb56bd5171a93 Mon Sep 17 00:00:00 2001
From: AraHaan <seandhunt_7@yahoo.com>
Date: Tue, 17 Jan 2023 18:13:09 -0500
Subject: [PATCH 2/2] Update DotNet.ReproducibleBuilds.props

---
 .../DotNet.ReproducibleBuilds.props           | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props b/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props
index 9016e70..d18a54c 100644
--- a/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props
+++ b/src/DotNet.ReproducibleBuilds/DotNet.ReproducibleBuilds.props
@@ -12,37 +12,50 @@
   
   <!-- Enable ContinuousIntegrationBuild when running on CI -->
 
+  <!--
+    Covers all of the following:
+      - Azure Pipelines / DevOpsServer
+      - GitHub Actions
+      - AppVeyor
+      - Travis CI
+      - Circle CI
+      - AWS CodeBuild
+      - Jenkins (https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables)
+      - Google Cloud Build (https://cloud.google.com/build/docs/configuring-builds/substitute-variable-values)
+      - TeamCity (https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Server+Build+Properties)
+      - JetBrains Space (https://www.jetbrains.com/help/space/automation-environment-variables.html#general)
+      - All CI specific builds when the CI variable is set.
+  -->
   <PropertyGroup>
+    <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
     <!-- Azure Pipelines / DevOpsServer -->
-    <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- GitHub Actions -->
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- AppVeyor -->
-    <ContinuousIntegrationBuild Condition="'$(APPVEYOR)' == 'true'">true</ContinuousIntegrationBuild>
-    <!-- Set by many build agents -->
-    <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(APPVEYOR)' == 'true' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- Travis CI -->
-    <ContinuousIntegrationBuild Condition="'$(TRAVIS)' == 'true'">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(TRAVIS)' == 'true' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- Circle CI -->
-    <ContinuousIntegrationBuild Condition="'$(CIRCLECI)' == 'true'">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(CIRCLECI)' == 'true' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- AWS CodeBuild -->
-    <ContinuousIntegrationBuild Condition="'$(CODEBUILD_BUILD_ID)' != '' and '$(AWS_REGION)' != '' ">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(CODEBUILD_BUILD_ID)' != '' AND '$(AWS_REGION)' != '' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- Jenkins
     https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
     -->
-    <ContinuousIntegrationBuild Condition="'$(BUILD_ID)' != '' and '$(BUILD_URL)' != '' ">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(BUILD_ID)' != '' AND '$(BUILD_URL)' != '' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- Google Cloud Build
     https://cloud.google.com/build/docs/configuring-builds/substitute-variable-values
     -->
-    <ContinuousIntegrationBuild Condition="'$(BUILD_ID)' != '' and '$(PROJECT_ID)' != '' ">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(BUILD_ID)' != '' AND '$(PROJECT_ID)' != '' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- TeamCity
     https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Server+Build+Properties
     -->
-    <ContinuousIntegrationBuild Condition="'$(TEAMCITY_VERSION)' != '' ">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(TEAMCITY_VERSION)' != '' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
     <!-- JetBrains Space
     https://www.jetbrains.com/help/space/automation-environment-variables.html#general
     -->
-    <ContinuousIntegrationBuild Condition="'$(JB_SPACE_API_URL)' != '' ">true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(JB_SPACE_API_URL)' != '' AND '$(ContinuousIntegrationBuild)' != 'true'">true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
 </Project>