From 4e0eace63fda9203773301d321b966ba17872a63 Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <andrea.spadaccini@microsoft.com>
Date: Fri, 2 Aug 2019 13:34:27 +0100
Subject: [PATCH 1/5] Do not rely on versioned paths when importing deps

This will remove the need to keep in sync the version in the psm1 with the
version in the .csproj.

Unfortunately, this is the best way I know of fixing issue #8.

There seems to be no automated way of downloading dependencies when
running Install-Module, so it's best to put DLLs inside the package itself.

Fixes #8
---
 FeatureFlags.psm1 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FeatureFlags.psm1 b/FeatureFlags.psm1
index 69e936d..d2db9e6 100644
--- a/FeatureFlags.psm1
+++ b/FeatureFlags.psm1
@@ -18,13 +18,14 @@ function Get-FeatureFlagConfigFromFile([string]$jsonConfigPath) {
 }
 
 # Import the JSON and JSON schema libraries, and load the JSON schema.
-# TODO: don't rely on versioned paths. Use dotnet build / pack properly.
-$schemaLibPath = Join-Path -Path $PSScriptRoot -ChildPath "External/njsonschema/9.13.19/lib/netstandard1.0/NJsonSchema.dll"
+$libs = Get-ChildItem -Recurse -Path "$PSScriptRoot/External"
+$libs = $libs | Where-Object {$_.Extension -ieq ".dll" -and $_.FullName -ilike "*netstandard1.0*"} | ForEach-Object {$_.FullName}
+$schemaLibPath = $libs | Where-Object {$_ -ilike "*NJsonSchema.dll"}
 if (-not (Test-Path -Path $schemaLibPath -PathType Leaf)) {
     Write-Error "Could not find the DLL for NJSonSchema: $schemaLibPath"
 }
 
-$jsonLibPath = Join-Path -Path $PSScriptRoot -ChildPath "External/newtonsoft.json/9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll"
+$jsonLibPath = $libs | Where-Object {$_ -ilike "*Newtonsoft.Json.dll"}
 if (-not (Test-Path -Path $jsonLibPath -PathType Leaf)) {
     Write-Error "Could not find the DLL for Newtonsoft.Json: $jsonLibPath"
 }

From eac762225eff48d37791da21478317f7b295187f Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <andrea.spadaccini@microsoft.com>
Date: Fri, 2 Aug 2019 13:35:04 +0100
Subject: [PATCH 2/5] Remove todo about .NET standard 2.0

NJSonSchema depends on Newtonsoft.json 9, which does not
support .NET standard 1.0
---
 PowerShell-FeatureFlags.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/PowerShell-FeatureFlags.csproj b/PowerShell-FeatureFlags.csproj
index 38d6a3e..35a59ea 100644
--- a/PowerShell-FeatureFlags.csproj
+++ b/PowerShell-FeatureFlags.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- TODO: target .NET Standard 2.0 -->
     <TargetFramework>netstandard1.0</TargetFramework>
     <AssemblyName>PowerShell_FeatureFlags</AssemblyName>
     <!-- Make sure dependencies are always copied in the output folder. 

From 5d36727fa0d6300730c7ee63a020f7e84191a0aa Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <andrea.spadaccini@microsoft.com>
Date: Fri, 2 Aug 2019 13:39:30 +0100
Subject: [PATCH 3/5] Install Pester only if it's not found

Find pester among available modules
---
 tools/run-tests.ps1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/run-tests.ps1 b/tools/run-tests.ps1
index 307d09d..6f327a8 100644
--- a/tools/run-tests.ps1
+++ b/tools/run-tests.ps1
@@ -2,7 +2,11 @@
 $parentDir = Split-Path -Parent (Split-Path -Parent $PSCommandPath)
 $testDir = Join-Path $parentDir -ChildPath "test"
 
-Install-Module Pester -Force -Scope CurrentUser
+$pester = Get-Module -ListAvailable | Where-Object {$_.Name -eq "Pester"}
+if ($pester.Count -eq 0) {
+    Write-Host "Cannot find the Pester module. Installing it."
+    Install-Module Pester -Force -Scope CurrentUser
+}
 $FailedTests = Invoke-Pester $testDir -EnableExit
 if ($FailedTests -gt 0) {
     Write-Error "Error: $FailedTests Pester tests failed."

From 576ddbcb2f7a9938f6afbee71136bea936140e42 Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <andrea.spadaccini@microsoft.com>
Date: Fri, 2 Aug 2019 13:44:57 +0100
Subject: [PATCH 4/5] Improve load error logging

Add some verbose logging for type loading
---
 FeatureFlags.psm1 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/FeatureFlags.psm1 b/FeatureFlags.psm1
index d2db9e6..57cfd0a 100644
--- a/FeatureFlags.psm1
+++ b/FeatureFlags.psm1
@@ -24,18 +24,21 @@ $schemaLibPath = $libs | Where-Object {$_ -ilike "*NJsonSchema.dll"}
 if (-not (Test-Path -Path $schemaLibPath -PathType Leaf)) {
     Write-Error "Could not find the DLL for NJSonSchema: $schemaLibPath"
 }
+Write-Verbose "Found NJsonSchema assembly at $schemaLibPath"
 
 $jsonLibPath = $libs | Where-Object {$_ -ilike "*Newtonsoft.Json.dll"}
 if (-not (Test-Path -Path $jsonLibPath -PathType Leaf)) {
     Write-Error "Could not find the DLL for Newtonsoft.Json: $jsonLibPath"
 }
+Write-Verbose "Found JSON.Net assembly at $jsonLibPath"
 
 try {
-    Add-Type -Path $jsonLibPath
-    Add-Type -Path $schemaLibPath
+    $jsonType = Add-Type -Path $jsonLibPath -PassThru
+    $jsonSchemaType = Add-Type -Path $schemaLibPath -PassThru
+    Write-Verbose "JSON.Net type: $jsonType"
+    Write-Verbose "NjsonSchema type: $jsonSchemaType"
 } catch {
-    Write-Error "Error loading JSON libraries"
-    Write-Host $_.Exception.LoaderExceptions
+    Write-Error "Error loading JSON libraries ($jsonLibPath, $schemaLibPath): $($_.Exception.Message)"
 }
 
 $script:schema = $null

From b7a493c4de816dc4a0f1af9a5e93ab815d5164c8 Mon Sep 17 00:00:00 2001
From: Andrea Spadaccini <andrea.spadaccini@microsoft.com>
Date: Fri, 2 Aug 2019 14:17:32 +0100
Subject: [PATCH 5/5] Make sure that Pester 4 is present

Windows Powershell bundles an old version (3.something) which does not
support the modern Pester syntax.
---
 tools/run-tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/run-tests.ps1 b/tools/run-tests.ps1
index 6f327a8..3b6532d 100644
--- a/tools/run-tests.ps1
+++ b/tools/run-tests.ps1
@@ -2,7 +2,7 @@
 $parentDir = Split-Path -Parent (Split-Path -Parent $PSCommandPath)
 $testDir = Join-Path $parentDir -ChildPath "test"
 
-$pester = Get-Module -ListAvailable | Where-Object {$_.Name -eq "Pester"}
+$pester = Get-Module -ListAvailable | Where-Object {$_.Name -eq "Pester" -and $_.Version -gt '4.0.0'}
 if ($pester.Count -eq 0) {
     Write-Host "Cannot find the Pester module. Installing it."
     Install-Module Pester -Force -Scope CurrentUser