Merge pull request #3587 from chocolatey/master

(maint) Finish the 2.4.1 release by merging master to develop
chocolatey · Dec 5, 2024 · 7335f19 · 7335f19
2 parents 5b5b54a + b41f97f
commit 7335f19
Show file tree

Hide file tree

Showing 23 changed files with 1,561 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
     - name: Build with .Net Framework
       shell: powershell
-      run: ./build.ps1 --verbosity=diagnostic --target=CI --testExecutionType=unit --shouldRunOpenCover=false
+      run: ./build.ps1 --verbosity=diagnostic --target=CI --testExecutionType=unit --shouldRunOpenCover=false --shouldBuildMsi=true
     - name: Upload Windows build results
       uses: actions/upload-artifact@v3
       # Always upload build results
@@ -67,6 +67,7 @@ jobs:
           code_drop\Packages\NuGet\*.nupkg
           code_drop\Packages\Chocolatey\*.nupkg
           code_drop\MsBuild.log
+          code_drop\MSIs\en-US\chocolatey-*.msi
   #  - uses: coverallsapp/github-action@master
   #    with:
   #      github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -140,4 +141,4 @@ jobs:
   #    uses: coverallsapp/github-action@master
   #    with:
   #      github-token: ${{ secrets.GITHUB_TOKEN }}
-  #      parallel-finished: true
+  #      parallel-finished: true
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -65,7 +65,7 @@ object Chocolatey : BuildType({
         script {
             name = "Call Cake"
             scriptContent = """
-                build.official.bat --verbosity=diagnostic --target=CI --testExecutionType=unit --shouldRunOpenCover=false
+                build.official.bat --verbosity=diagnostic --target=CI --testExecutionType=unit --shouldRunOpenCover=false --shouldBuildMsi=true
             """.trimIndent()
         }
     }

diff --git a/recipe.cake b/recipe.cake
@@ -167,6 +167,7 @@ Task("Prepare-Chocolatey-Packages")
     .IsDependeeOf("Create-Chocolatey-Packages")
     .IsDependeeOf("Verify-PowerShellScripts")
     .IsDependeeOf("Sign-Assemblies")
+    .IsDependentOn("Copy-Nuspec-Folders")
     .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
     .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
     .Does(() =>
@@ -363,7 +364,6 @@ Task("Prepare-NuGet-Packages")
 
 Task("Prepare-MSI")
     .WithCriteria(() => BuildParameters.ShouldBuildMsi, "Skipping because creation of MSI has been disabled")
-    .WithCriteria(() => BuildParameters.IsTagged, "Skipping because build is not tagged")
     .IsDependeeOf("Build-MSI")
     .Does(() =>
 {
@@ -378,9 +378,6 @@ Task("Prepare-MSI")
     }
 });
 
-BuildParameters.Tasks.BuildMsiTask
-    .WithCriteria(() => BuildParameters.IsTagged, "Skipping because build is not tagged");
-
 Task("Create-TarGz-Packages")
     .IsDependentOn("Build")
     .IsDependeeOf("Package")
@@ -438,7 +435,7 @@ BuildParameters.SetParameters(context: Context,
                             getMsisToSign: getMsisToSign,
                             getILMergeConfigs: getILMergeConfigs,
                             preferDotNetGlobalToolUsage: !IsRunningOnWindows(),
-                            shouldBuildMsi: true,
+                            shouldBuildMsi: false,
                             msiUsedWithinNupkg: false,
                             shouldAuthenticodeSignMsis: true,
                             shouldRunNuGet: IsRunningOnWindows(),

diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
@@ -485,6 +485,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="infrastructure.app\builders\ConfigurationBuilderSpecs.cs" />
+    <Compile Include="infrastructure.app\nuget\NugetListSpecs.cs" />
     <Compile Include="infrastructure.app\services\FilesServiceSpecs.cs" />
     <Compile Include="infrastructure\commands\CommandExecutorSpecs.cs" />
     <Compile Include="infrastructure\cryptography\CryptoHashProviderSpecs.cs" />