Module.Template 2.0.2

ili101 · Aug 25, 2019 · 6c9db54 · 6c9db54
1 parent 04fd0cb
commit 6c9db54
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 8 deletions.
diff --git a/Install.ps1 b/Install.ps1
@@ -77,7 +77,7 @@ Try {
         else {
             $ModulePathIndex = 1
         }
-        if ($IsLinux) {
+        if ($IsLinux -or $IsMacOS) {
             $ModulePathSeparator = ':'
         }
         else {

diff --git a/README.md b/README.md
@@ -3,9 +3,16 @@ Join-Object LINQ Edition.
 Aims to provide the exact functionality of https://github.com/RamblingCookieMonster/PowerShell/blob/master/Join-Object.ps1 with much better performance.
 Initial testing shows at last 100 times faster.
 
-| Master | PowerShell Gallery | Beta | Alpha |
-|--------|--------------------|------|-------|
-|[![Build status](https://ci.appveyor.com/api/projects/status/sk2d54q6q85i1ejm/branch/master?svg=true)](https://ci.appveyor.com/project/ili101/join-object)|[![PowerShell Gallery](https://img.shields.io/powershellgallery/v/Join-Object.svg)](https://www.powershellgallery.com/packages/Join-Object/) [![PowerShell Gallery](https://img.shields.io/powershellgallery/dt/Join-Object.svg)](https://www.powershellgallery.com/packages/Join-Object/)|[![Build status](https://ci.appveyor.com/api/projects/status/sk2d54q6q85i1ejm/branch/Beta?svg=true)](https://ci.appveyor.com/project/ili101/join-object)|[![Build status](https://ci.appveyor.com/api/projects/status/sk2d54q6q85i1ejm/branch/Alpha?svg=true)](https://ci.appveyor.com/project/ili101/join-object)|
+[![PowerShell Gallery](https://img.shields.io/powershellgallery/v/Join-Object.svg)](https://www.powershellgallery.com/packages/Join-Object/)
+[![Downloads](https://img.shields.io/powershellgallery/dt/Join-Object.svg)](https://www.powershellgallery.com/packages/Join-Object/)
+
+| CI System    | Environment                   | Master                                                                                                                                                                                                                             | Beta                                                                                                                                                                                                                           |
+|--------------|-------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| AppVeyor     | Windows, Core preview, Ubuntu | [![Build status](https://ci.appveyor.com/api/projects/status/sk2d54q6q85i1ejm/branch/master?svg=true)](https://ci.appveyor.com/project/ili101/Join-Object)                                                                         | [![Build status](https://ci.appveyor.com/api/projects/status/sk2d54q6q85i1ejm/branch/Beta?svg=true)](https://ci.appveyor.com/project/ili101/Join-Object)                                                                       |
+| Azure DevOps | Windows                       | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=master&jobName=Windows)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=master)       | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=Beta&jobName=Windows)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=Beta)       |
+| Azure DevOps | Windows (Core)                | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=master&jobName=WindowsPSCore)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=master) | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=Beta&jobName=WindowsPSCore)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=Beta) |
+| Azure DevOps | Ubuntu                        | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=master&jobName=Ubuntu)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=master)        | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=Beta&jobName=Ubuntu)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=Beta)        |
+| Azure DevOps | macOS                         | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=master&jobName=macOS)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=master)         | [![Build Status](https://dev.azure.com/ili101/Join-Object/_apis/build/status/ili101.Join-Object?branchName=Beta&jobName=macOS)](https://dev.azure.com/ili101/Join-Object/_build/latest?definitionId=1&branchName=Beta)         |
 
 ## Explanation and usage Examples
 See RamblingCookieMonster guide http://ramblingcookiemonster.github.io/Join-Object/ and [Join-Object.Examples.ps1](https://github.com/ili101/Join-Object/blob/master/Examples/Join-Object.Examples.ps1).

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,9 +15,9 @@ trigger:
     - CHANGELOG.md
 
 jobs:
-  - job: windows2019
+  - job: Windows
     pool:
-      vmImage: 'windows-2019'
+      vmImage: 'windows-latest'
 
     steps:
     - powershell: 'Install-Module -Name Pester -Force -SkipPublisherCheck'
@@ -42,9 +42,41 @@ jobs:
         targetPath: '$(Build.SourcesDirectory)'
         artifact: 'Source'
 
-  - job: ubuntu1604
+  - job: WindowsPSCore
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'windows-latest'
+
+    steps:
+    - pwsh: 'Install-Module -Name Pester -Force'
+      displayName: 'Update Pester'
+    - pwsh: '& ./Tests/Assert.ps1 ; ./Tests/CI.ps1 -Test'
+      displayName: 'Install and Test'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'NUnit'
+        testResultsFiles: '**/TestResults*.xml'
+        failTaskOnFailedTests: true
+
+  - job: Ubuntu
+    pool:
+      vmImage: 'ubuntu-latest'
+
+    steps:
+    - powershell: 'Install-Module -Name Pester -Force'
+      displayName: 'Update Pester'
+    - powershell: '& ./Tests/Assert.ps1 ; ./Tests/CI.ps1 -Test'
+      displayName: 'Install and Test'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'NUnit'
+        testResultsFiles: '**/TestResults*.xml'
+        failTaskOnFailedTests: true
+
+  - job: macOS
+    pool:
+      vmImage: 'macOS-latest'
 
     steps:
     - powershell: 'Install-Module -Name Pester -Force'