From 89a619f4b9dcc0fba1e9a43d1e76d301c8d94d76 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <v-mazhuk@microsoft.com>
Date: Mon, 23 Nov 2020 13:29:46 +0300
Subject: [PATCH] Fix PowerShell issue with relative paths

---
 azure-pipelines/templates/build-job.yml | 12 +++++++++++-
 builders/build-python.ps1               |  6 +++---
 builders/macos-python-builder.psm1      |  2 +-
 builders/nix-python-builder.psm1        |  2 +-
 builders/ubuntu-python-builder.psm1     |  2 +-
 builders/win-python-builder.psm1        |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines/templates/build-job.yml b/azure-pipelines/templates/build-job.yml
index 0d949fe..084e308 100644
--- a/azure-pipelines/templates/build-job.yml
+++ b/azure-pipelines/templates/build-job.yml
@@ -7,7 +7,17 @@ jobs:
   steps:
   - checkout: self
     submodules: true
-    
+
+# We need this temporary step to have a consistent version of PowerShell on all images.
+  - task: PowerShell@2
+    displayName: 'Update PowerShell version for macOS'
+    condition: eq(variables['Platform'], 'darwin')
+    inputs:
+      TargetType: inline
+      script: |
+        brew update
+        brew cask upgrade powershell
+
   - task: PowerShell@2
     displayName: 'Build Python $(VERSION)'
     inputs:
diff --git a/builders/build-python.ps1 b/builders/build-python.ps1
index a14f020..cced69e 100644
--- a/builders/build-python.ps1
+++ b/builders/build-python.ps1
@@ -1,6 +1,6 @@
-using module "./builders/win-python-builder.psm1"
-using module "./builders/ubuntu-python-builder.psm1"
-using module "./builders/macos-python-builder.psm1"
+using module "./win-python-builder.psm1"
+using module "./ubuntu-python-builder.psm1"
+using module "./macos-python-builder.psm1"
 
 <#
 .SYNOPSIS
diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1
index 7041fcc..e6710a4 100644
--- a/builders/macos-python-builder.psm1
+++ b/builders/macos-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/nix-python-builder.psm1"
+using module "./nix-python-builder.psm1"
 
 class macOSPythonBuilder : NixPythonBuilder {
     <#
diff --git a/builders/nix-python-builder.psm1 b/builders/nix-python-builder.psm1
index a90e131..4f27c44 100644
--- a/builders/nix-python-builder.psm1
+++ b/builders/nix-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/python-builder.psm1"
+using module "./python-builder.psm1"
 
 class NixPythonBuilder : PythonBuilder {
     <#
diff --git a/builders/ubuntu-python-builder.psm1 b/builders/ubuntu-python-builder.psm1
index a674168..8906148 100644
--- a/builders/ubuntu-python-builder.psm1
+++ b/builders/ubuntu-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/nix-python-builder.psm1"
+using module "./nix-python-builder.psm1"
 
 class UbuntuPythonBuilder : NixPythonBuilder {
     <#
diff --git a/builders/win-python-builder.psm1 b/builders/win-python-builder.psm1
index f7b7461..cdaa049 100644
--- a/builders/win-python-builder.psm1
+++ b/builders/win-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/python-builder.psm1"
+using module "./python-builder.psm1"
 
 class WinPythonBuilder : PythonBuilder {
     <#