Disable Git commit ID in Product Version

Reference: dotnet/sdk#34568
Zacam · Dec 14, 2023 · 42cd32f · 42cd32f
1 parent 04b8f82
commit 42cd32f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 169 deletions.
diff --git a/AutoUpdateBuildDate.ps1 b/AutoUpdateBuildDate.ps1
diff --git a/AutoUpdateVersion.ps1 b/AutoUpdateVersion.ps1
diff --git a/Build.ps1 b/Build.ps1
@@ -58,17 +58,17 @@ try
 
     # Update the constant variable BUILD_DATE with the current date
     $currentDate = Get-Date -Format "MM-dd-yyyy"
-    $newBuildInfoContent = $buildInformationClassFileContent -replace 'const\s+string\s+DATE\s*=\s*".*"', "const string DATE = `"$currentDate`";"
+    $newBuildInfoContent = $buildInformationClassFileContent -replace 'const\s+string\s+DATE\s*=\s*".*";', "const string DATE = `"$currentDate`";"
 
     # Update the constant variable BUILD_TIME with the current UTC time
     $currentTime = Get-Date -Format "HHmmss"
-    $newBuildInfoContent = $newBuildInfoContent -replace 'const\s+string\s+TIME\s*=\s*".*"', "const string TIME = `"$currentTime`";"
+    $newBuildInfoContent = $newBuildInfoContent -replace 'const\s+string\s+TIME\s*=\s*".*";', "const string TIME = `"$currentTime`";"
 
     $currentTimeZone = Get-Date -Format "zzz"
-    $newBuildInfoContent = $newBuildInfoContent -replace 'const\s+string\s+TIME_ZONE\s*=\s*".*"', "const string TIME_ZONE = `"$currentTimeZone`";"
+    $newBuildInfoContent = $newBuildInfoContent -replace 'const\s+string\s+TIME_ZONE\s*=\s*".*";', "const string TIME_ZONE = `"$currentTimeZone`";"
 
     # Save the updated content back to the C# class file
-    $newBuildInfoContent | Set-Content $buildInformationClassFilePath -Force
+    $newBuildInfoContent | Set-Content $buildInformationClassFilePath -NoNewline
 
     echo ([string]::Format("========== DATE updated to: {0}  ==========", $currentDate))
 	echo ([string]::Format("========== TIME updated to: {0}  ==========", $currentTime))
@@ -77,7 +77,7 @@ try
 catch
 {
     throw $_
-    return
+    exit 1
 }
 
 try
@@ -110,16 +110,16 @@ try
 	$newBuildBetaContent = $buildBetaFileContent -replace 'private static bool Enabled = .*;', ([string]::Format('private static bool Enabled = {0};', $BuildBetaBoolean))
 
     # Save the updated content back to the C# class file
-    $newBuildDevContent | Set-Content $buildDevelopmentClassFilePath -Force
-	$newBuildBetaContent | Set-Content $buildBetaClassFilePath -Force
+    $newBuildDevContent | Set-Content $buildDevelopmentClassFilePath -NoNewline
+	$newBuildBetaContent | Set-Content $buildBetaClassFilePath -NoNewline
 
     echo ([string]::Format("========== Development Enabled: {0}  ==========", $BuildDevBoolean))
 	echo ([string]::Format("========== Beta Enabled: {0}  ==========", $BuildBetaBoolean))
 }
 catch
 {
     throw $_
-    return
+    exit 1
 }
 
 try
@@ -229,14 +229,14 @@ try
 			$xmlWriter.Close()
 
 			#Save csproj (Formatted XML)
-			$stringWriter.ToString() | Out-File $path -Force
+			$stringWriter.ToString() | Out-File $path -NoNewline
 
 			echo ([string]::Format("========== New Version Number: {0}.{1}.{2} ==========",$xml.Project.PropertyGroup.VersionMajor,$xml.Project.PropertyGroup.VersionMinor,$xml.Project.PropertyGroup.VersionBuild))
 		}
 		catch
 		{
 			throw $_
-			return
+			exit 1
 		}
 	}
 	else
@@ -247,7 +247,7 @@ try
 catch
 {
 	throw $_
-	return
+	exit 1
 }
 
 try
@@ -270,5 +270,5 @@ try
 catch
 {
 	throw $_
-	return
+	exit 1
 }
diff --git a/SBRW.Launcher.Net/SBRW.Launcher.csproj b/SBRW.Launcher.Net/SBRW.Launcher.csproj
diff --git a/SBRW.Launcher.RunTime/InsiderKit/BuildBeta.cs b/SBRW.Launcher.RunTime/InsiderKit/BuildBeta.cs
@@ -1,4 +1,4 @@
-namespace SBRW.Launcher.RunTime.InsiderKit
+namespace SBRW.Launcher.RunTime.InsiderKit
 {
     /// <summary>
     /// This is only used for Beta Testers (Treated like a Public Release)

diff --git a/SBRW.Launcher.RunTime/InsiderKit/BuildDevelopment.cs b/SBRW.Launcher.RunTime/InsiderKit/BuildDevelopment.cs
@@ -1,4 +1,4 @@
-namespace SBRW.Launcher.RunTime.InsiderKit
+namespace SBRW.Launcher.RunTime.InsiderKit
 {
     /// <summary>
     /// This is only used for Developers (Bypasses Most Checks)
@@ -8,7 +8,7 @@ internal class BuildDevelopment
         /// <summary>
         /// 
         /// </summary>
-        private static bool Enabled = true;
+        private static bool Enabled = false;
         /// <summary>
         /// If User is Opt-In to Use Beta Builds
         /// </summary>

diff --git a/SBRW.Launcher.RunTime/InsiderKit/BuildInformation.cs b/SBRW.Launcher.RunTime/InsiderKit/BuildInformation.cs
@@ -1,4 +1,4 @@
-using SBRW.Launcher.RunTime.LauncherCore.Languages.Visual_Forms;
+using SBRW.Launcher.RunTime.LauncherCore.Languages.Visual_Forms;
 using SBRW.Launcher.Core.Cache;
 
 namespace SBRW.Launcher.RunTime.InsiderKit
@@ -9,9 +9,9 @@ public class BuildInformation
         /* Current month, day, year (2 digits), and letter! Ex: 12-15-20-A */
         /* If a second build gets release within the same day bump letter version up (No R2 or D2)*/
 
-        const string DATE = "";
-        const string TIME = "";
-        const string TIME_ZONE = "";
+        const string DATE = "12-13-2023";
+        const string TIME = "223017";
+        const string TIME_ZONE = "-08:00";
 
         private static string BUILD { get; set; } = DATE + "-" + TIME + " " + TIME_ZONE;