Merge branch 'release/0.15.0'

* release/0.15.0: (#69) Remove stamp of CCMVersion TeamCity param (#67) Reset eazfuscator settings each iteration
chocolatey · Jul 13, 2022 · 1089f48 · 1089f48
2 parents 02c741f + 1015897
commit 1089f48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Chocolatey.Cake.Recipe/Content/eazfuscator.cake b/Chocolatey.Cake.Recipe/Content/eazfuscator.cake
@@ -35,6 +35,9 @@ BuildParameters.Tasks.ObfuscateAssembliesTask = Task("Obfuscate-Assemblies")
 
             foreach (var file in BuildParameters.GetFilesToObfuscate())
             {
+                // This needs to be "reset" so that previously set properties aren't in place for the next iteration.
+                settings = new EazfuscatorNetSettings();
+
                 var fileName = file.GetFilenameWithoutExtension();
                 var msbuildPathFilePath = new FilePath(string.Format("{0}/{1}/{1}.csproj", BuildParameters.SourceDirectoryPath.FullPath, fileName));
 

diff --git a/Chocolatey.Cake.Recipe/Content/gitversion.cake b/Chocolatey.Cake.Recipe/Content/gitversion.cake
@@ -219,12 +219,6 @@ public class BuildVersion
         {
             // use the asserted package version for the build number in TeamCity
             context.BuildSystem().TeamCity.SetBuildNumber(packageVersion);
-
-            if (BuildParameters.Title == "ChocolateySoftware.ChocolateyManagement")
-            {
-                // Only set this when it is a CCM Build
-                context.BuildSystem().TeamCity.SetParameter("CCMVersion", packageVersion);
-            }
         }
 
         return new BuildVersion