Testingfixes (#62)

* updating Pester version (cant use v5) * totally cheating to pass the tests * still cheating but it passes the tests now * because we need a new line at the end of the file * totally cheating to not have an empty file * needs to be named the same as module * so that the examples have a name that passes the tests * so that the example name passes the tests * becasue thefile was the wrong type * because the test was looking for them * ok - now the tests pass without the thing * becasue we dont have a wiki we wont publish it yet * removing old file * fix Deprecating and removing side-by-side installs from Chocolatey CLI #61 * making sure the comment based help works after merge * updating copyright year * updating config for pester 5 * cosmetic fixes * PSSA fixes * Making test pester v5 compat * updated config * adding module QA * updating AzDO pipeline * changing image to Windows * removed setting ssl3 * using prerelease version of sampler * limiting the tests to see what fails on PS core * fix PSUseProcessBlockForPipelineCommand * removing PSDeploy * removing extra file and reenabling tests * moving HQRM tests to win PS * trying to show what id is... * trying on azDO without Set_PSModulePath task * changing artifact name for CodeCoverage * trying to fix code coverage * trying config as per DocGenerator --------- Co-authored-by: SQLDbaWithABeard <mrrobsewell@outlook.com>
chocolatey-community · Mar 19, 2023 · 9479b45 · 9479b45
1 parent 3113bd3
commit 9479b45
Show file tree

Hide file tree

Showing 77 changed files with 1,043 additions and 1,090 deletions.
diff --git a/.pipelines/public-azure-pipeline.yaml b/.pipelines/public-azure-pipeline.yaml
@@ -1,18 +1,10 @@
-pr:
+trigger:
   branches:
     include:
     - main
   paths:
     exclude:
     - CHANGELOG.md
-
-trigger:
-  branches:
-    include:
-    - main
-  paths:
-    include:
-    - source/*
   tags:
     include:
     - "v*"
@@ -23,6 +15,7 @@ variables:
   buildFolderName: output
   buildArtifactName: output
   testResultFolderName: testResults
+  defaultBranch: main
 
 stages:
   - stage: Build
@@ -32,29 +25,24 @@ stages:
         pool:
           vmImage: 'windows-latest'
         steps:
-          - task: gitversion/setup@0
-            displayName: Install GitVersion
-            inputs:
-              versionSpec: '5.x'
-
-          - task: gitversion/execute@0
-            displayName: 'Evaluate Next Version'
-            inputs:
-              useConfigFile: true
-              configfilePath: GitVersion.yml
-
+          - pwsh: |
+              dotnet tool install --global GitVersion.Tool
+              $gitVersionObject = dotnet-gitversion | ConvertFrom-Json
+              $gitVersionObject.PSObject.Properties.ForEach{
+                  Write-Host -Object "Setting Task Variable '$($_.Name)' with value '$($_.Value)'."
+                  Write-Host -Object "##vso[task.setvariable variable=$($_.Name);]$($_.Value)"
+              }
+              Write-Host -Object "##vso[build.updatebuildnumber]$($gitVersionObject.FullSemVer)"
+            displayName: Calculate ModuleVersion (GitVersion)
           - task: PowerShell@2
             name: package
             displayName: 'Build & Package Module'
             inputs:
+              filePath: './build.ps1'
+              arguments: '-ResolveDependency -tasks pack'
               pwsh: true
-              targetType: inline
-              continueOnError: true
-              script: |
-                  ./build.ps1 -Tasks noop,pack -ResolveDependency
             env:
-              ModuleVersion: $(gitVersion.NuGetVersionV2)
-
+              ModuleVersion: $(NuGetVersionV2)
           - task: PublishPipelineArtifact@1
             displayName: 'Publish Pipeline Artifact'
             inputs:
@@ -66,11 +54,47 @@ stages:
   - stage: Test
     dependsOn: Build
     jobs:
+      - job: hqrm_windows
+        displayName: 'HQRM on Windows PowerShell'
+        timeoutInMinutes: 0
+        pool:
+          vmImage: 'windows-latest'
+        steps:
+          - task: DownloadPipelineArtifact@2
+            displayName: 'Download Pipeline Artifact'
+            inputs:
+              buildType: 'current'
+              artifactName: 'output'
+              targetPath: '$(Build.SourcesDirectory)/output'
+
+          - task: PowerShell@2
+            name: test
+            displayName: 'Run Tests'
+            inputs:
+              filePath: './build.ps1'
+              arguments: '-tasks hqrmtest'
+              pwsh: false
+
+          - task: PublishTestResults@2
+            displayName: 'Publish Test Results'
+            condition: succeededOrFailed()
+            inputs:
+              testResultsFormat: 'NUnit'
+              testResultsFiles: 'output/testResults/NUnit*.xml'
+              testRunTitle: 'Windows Server (Windows PowerShell)'
+
+          - task: PublishPipelineArtifact@1
+            displayName: 'Publish Test Artifact'
+            inputs:
+              targetPath: '$(buildFolderName)/$(testResultFolderName)/'
+              artifactName: 'HQRMCodeCoverageWinPS'
+              parallel: true
+
       - job: test_windows_core
         displayName: 'Windows (PowerShell Core)'
         timeoutInMinutes: 0
         pool:
-          vmImage: 'windows-2019'
+          vmImage: 'windows-latest'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download Pipeline Artifact'
@@ -106,7 +130,7 @@ stages:
         displayName: 'Windows (Windows PowerShell)'
         timeoutInMinutes: 0
         pool:
-          vmImage: 'windows-2019'
+          vmImage: 'windows-latest'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download Pipeline Artifact'
@@ -144,7 +168,7 @@ stages:
           - test_windows_core
           - test_windows_ps
         pool:
-          vmImage: 'ubuntu 16.04'
+          vmImage: 'ubuntu-latest'
         timeoutInMinutes: 0
         steps:
           - pwsh: |
@@ -164,13 +188,13 @@ stages:
             inputs:
               buildType: 'current'
               artifactName: 'CodeCoverageWinPS51'
-              targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)/$(testResultFolderName)'
+              targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)/$(testResultFolderName)/WinPS'
           - task: DownloadPipelineArtifact@2
             displayName: 'Download Test Artifact Windows (PS7)'
             inputs:
               buildType: 'current'
               artifactName: 'CodeCoverageWinPS7'
-              targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)/$(testResultFolderName)'
+              targetPath: '$(Build.SourcesDirectory)/$(buildFolderName)/$(testResultFolderName)/pwshWin'
           - task: PowerShell@2
             name: merge
             displayName: 'Merge Code Coverage files'
@@ -188,7 +212,6 @@ stages:
               bash <(curl -s https://codecov.io/bash) -f "./$(buildFolderName)/$(testResultFolderName)/JaCoCo_coverage.xml"
             displayName: 'Upload to Codecov.io'
 
-
   - stage: Deploy
     dependsOn: Test
     condition: |
@@ -204,14 +227,14 @@ stages:
       - job: Deploy_Module
         displayName: 'Deploy Module'
         pool:
-          vmImage: 'ubuntu 16.04'
+          vmImage: 'windows-latest'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download Pipeline Artifact'
             inputs:
               buildType: 'current'
-              artifactName: $(buildArtifactName)
-              targetPath: '$(Build.SourcesDirectory)/$(buildArtifactName)'
+              artifactName: 'output'
+              targetPath: '$(Build.SourcesDirectory)/output'
           - task: PowerShell@2
             name: publishRelease
             displayName: 'Publish Release'
@@ -222,8 +245,8 @@ stages:
             env:
               GitHubToken: $(GitHubToken)
               GalleryApiToken: $(GalleryApiToken)
-              ReleaseBranch: main
-              MainGitBranch: main
+              ReleaseBranch: $(defaultBranch)
+              MainGitBranch: $(defaultBranch)
           - task: PowerShell@2
             name: sendChangelogPR
             displayName: 'Send Changelog PR'
@@ -233,3 +256,5 @@ stages:
               pwsh: true
             env:
               GitHubToken: $(GitHubToken)
+              ReleaseBranch: $(defaultBranch)
+              MainGitBranch: $(defaultBranch)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,4 +11,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- Emptied psm1 file from source code as dynamically generated.
+- Removed SideBySide option as per [#61](https://github.com/chocolatey-community/Chocolatey/issues/61).
diff --git a/Dependencies.psd1 b/Dependencies.psd1
diff --git a/Deploy.PSDeploy.ps1 b/Deploy.PSDeploy.ps1
diff --git a/README.md b/README.md
@@ -10,91 +10,6 @@ The module let you install the chocolatey binary from a Nuget feed, optionally s
 This project has adopted the Microsoft Open Source Code of Conduct.
 For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.
 
-## Content
-
-This is the current content of the module, besides the file used for managing the project.
-
-```txt
-CHOCOLATEY\CHOCOLATEY
-│   Chocolatey.psd1
-│   Chocolatey.psm1
-│
-├───docs
-├───DscResources
-│   │   DSCResourcesDefinitions.json
-│   │
-│   ├───ChocolateyFeature
-│   │       ChocolateyFeature.psm1
-│   │       ChocolateyFeature.schema.mof
-│   │
-│   ├───ChocolateyPackage
-│   │       ChocolateyPackage.psm1
-│   │       ChocolateyPackage.schema.mof
-│   │
-│   ├───ChocolateyPin
-│   │       ChocolateyPin.psm1
-│   │       ChocolateyPin.schema.mof
-│   │
-│   ├───ChocolateySetting
-│   │       ChocolateySetting.psm1
-│   │       ChocolateySetting.schema.mof
-│   │
-│   |───ChocolateySoftware
-│   │       ChocolateySoftware.psm1
-│   │       ChocolateySoftware.schema.mof
-|   |
-│   └───ChocolateySource
-│           ChocolateySource.psm1
-│           ChocolateySource.schema.mof
-│
-├───examples
-│       chocolateyConfig.ps1
-│       dsc_configuration.ps1
-│
-├───private
-│       Get-ChocolateyDefaultArguments.ps1
-│       Get-Downloader.ps1
-│       Get-RemoteFile.ps1
-│       Get-RemoteString.ps1
-│       Repair-PowerShellOutputRedirectionBug.ps1
-│       Write-Host.ps1
-│
-├───public
-│       Add-ChocolateyPin.ps1
-|       Disable-ChocolateyFeature.ps1
-│       Disable-ChocolateySource.ps1
-│       Enable-ChocolateyFeature.ps1
-│       Enable-ChocolateySource.ps1
-│       Get-ChocolateyFeature.ps1
-│       Get-ChocolateyPackage.ps1
-|       Get-ChocolateyPin.ps1
-│       Get-ChocolateySource.ps1
-│       Get-ChocolateyVersion.ps1
-│       Install-Chocolatey.ps1
-│       Install-ChocolateyPackage.ps1
-│       Install-ChocolateySoftware.ps1
-│       Register-ChocolateySource.ps1
-|       Remove-ChocolateyPin.ps1
-│       Test-ChocolateyFeature.ps1
-│       Test-ChocolateyInstall.ps1
-│       Test-ChocolateyPackageIsInstalled.ps1
-|       Test-ChocolateyPin.ps1
-│       Test-ChocolateySource.ps1
-│       Uninstall-Chocolatey.ps1
-│       Uninstall-ChocolateyPackage.ps1
-│       Unregister-ChocolateySource.ps1
-│       Update-ChocolateyPackage.ps1
-│
-└───tests
-    │
-    ├───QA
-    │
-    └───Unit
-        |
-        |───Private
-        |
-        └───Public
-```
 ## Code of Conduct
 
 This project has adopted this [Code of Conduct](CODE_OF_CONDUCT.md).

diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
@@ -9,11 +9,18 @@
 
     InvokeBuild                 = 'latest'
     PSScriptAnalyzer            = 'latest'
-    Pester                      = '4.10.1'
+    Pester                      = 'latest'
     Plaster                     = 'latest'
+    'powershell-yaml'           = 'latest'
     ModuleBuilder               = 'latest'
     ChangelogManagement         = 'latest'
-    Sampler                     = 'latest'
+    Sampler                     = @{
+        version = 'latest'
+        Parameters = @{
+            AllowPrerelease = $true
+        }
+    }
+
     'Sampler.GitHubTasks'       = 'latest'
     MarkdownLinkCheck           = 'latest'
     'DscResource.Common'        = 'latest'
@@ -22,4 +29,3 @@
     xDscResourceDesigner        = 'latest'
     'DscResource.DocGenerator'  = 'latest'
 }
-