From 0281c6ce99fe0a0cc6956c236609c744c74fd67a Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Wed, 13 Jul 2022 08:20:41 +0100 Subject: [PATCH 1/2] (#67) Reset eazfuscator settings each iteration This will ensure that previously set properties, for example, the MSBuild filepath, are not remembered between each iteration of the foreach loop. --- Chocolatey.Cake.Recipe/Content/eazfuscator.cake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Chocolatey.Cake.Recipe/Content/eazfuscator.cake b/Chocolatey.Cake.Recipe/Content/eazfuscator.cake index c21f5ac..53fb60c 100644 --- 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)); From 09d1df60386184d49a3844739441c039c184ce92 Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Wed, 6 Jul 2022 11:02:18 -0700 Subject: [PATCH 2/2] (#69) Remove stamp of CCMVersion TeamCity param We don't need to set the CCMVersion because we're able to pull it from the build.number parameter that is already set. --- Chocolatey.Cake.Recipe/Content/gitversion.cake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Chocolatey.Cake.Recipe/Content/gitversion.cake b/Chocolatey.Cake.Recipe/Content/gitversion.cake index 4f781f7..773ac3a 100644 --- 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