diff --git a/CHANGELOG.md b/CHANGELOG.md index f3d307f8..d9034fb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ * [PSGSuite - ChangeLog](#psgsuite---changelog) + * [2.32.2 - 2019-09-15](#2322---2019-09-15) * [2.32.1 - 2019-09-14](#2321---2019-09-14) * [2.32.0 - 2019-09-12](#2320---2019-09-12) * [2.31.1 - 2019-08-30](#2311---2019-08-30) @@ -98,6 +99,12 @@ # PSGSuite - ChangeLog +## 2.32.2 - 2019-09-15 + +* [Issue #225](https://github.com/scrthq/PSGSuite/issues/225) + * Fixed: NuGet package versions for Google APIs fell back to the version sheet during the most recent version push due to failure to communicate with NuGet to dynamically pull the latest version, resulting in previous enhancements now failing (e.g. Admin SDK rolled back to a 2017 version). + * Added more guards and force update situations for the NuGetDependencies.json file during local builds to more concretely guarantee that the NuGet packages needed will be available. + ## 2.32.1 - 2019-09-14 * [Issue #232](https://github.com/scrthq/PSGSuite/issues/232) diff --git a/PSGSuite/PSGSuite.psd1 b/PSGSuite/PSGSuite.psd1 index 7ecd2e14..fd8c2655 100644 --- a/PSGSuite/PSGSuite.psd1 +++ b/PSGSuite/PSGSuite.psd1 @@ -12,7 +12,7 @@ RootModule = 'PSGSuite.psm1' # Version number of this module. - ModuleVersion = '2.32.1' + ModuleVersion = '2.32.2' # ID used to uniquely identify this module GUID = '9d751152-e83e-40bb-a6db-4c329092aaec' diff --git a/README.md b/README.md index bf456615..c5198bd4 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,12 @@ All other functions are either intact or have an alias included to support backw [Full CHANGELOG here](https://github.com/scrthq/PSGSuite/blob/master/CHANGELOG.md) +#### 2.32.2 - 2019-09-15 + +* [Issue #225](https://github.com/scrthq/PSGSuite/issues/225) + * Fixed: NuGet package versions for Google APIs fell back to the version sheet during the most recent version push due to failure to communicate with NuGet to dynamically pull the latest version, resulting in previous enhancements now failing (e.g. Admin SDK rolled back to a 2017 version). + * Added more guards and force update situations for the NuGetDependencies.json file during local builds to more concretely guarantee that the NuGet packages needed will be available. + #### 2.32.1 - 2019-09-14 * [Issue #232](https://github.com/scrthq/PSGSuite/issues/232) diff --git a/ci/AzurePipelinesHelpers.ps1 b/ci/AzurePipelinesHelpers.ps1 index 7810e841..d05cf94b 100644 --- a/ci/AzurePipelinesHelpers.ps1 +++ b/ci/AzurePipelinesHelpers.ps1 @@ -23,6 +23,7 @@ function Install-NuGetDependencies { ) try { Import-Module PackageManagement -Force + . ([System.IO.Path]::Combine($PSScriptRoot,"UpdateNuGetDependenciesJson.ps1")) $dllStgPath = Join-Path $PSScriptRoot "NuGetStaging" $packagesToInstall = Get-Content (Join-Path $PSScriptRoot "NuGetDependencies.json") -Raw | ConvertFrom-Json | Sort-Object BaseName if (-not (Test-Path $dllStgPath)) { @@ -36,9 +37,6 @@ function Install-NuGetDependencies { $nugHash[$_.Name] = $_ } } - if ($nugHash.Keys.Count) { - . ([System.IO.Path]::Combine($PSScriptRoot,"UpdateNuGetDependenciesJson.ps1")) - } foreach ($inst in $packagesToInstall) { try { $pkg = if ($nugHash.ContainsKey($inst.BaseName)) { diff --git a/ci/NuGetDependencies.json b/ci/NuGetDependencies.json index 81781a8b..cdd4f95c 100644 --- a/ci/NuGetDependencies.json +++ b/ci/NuGetDependencies.json @@ -9,145 +9,145 @@ "Name": "Google.Apis.dll", "BaseName": "Google.Apis", "Target": "Latest", - "LatestVersion": "1.40.0" + "LatestVersion": "1.41.1" }, { "Name": "Google.Apis.Admin.DataTransfer.datatransfer_v1.dll", "BaseName": "Google.Apis.Admin.DataTransfer.datatransfer_v1", "Target": "Latest", - "LatestVersion": "1.40.0.418" + "LatestVersion": "1.41.1.418" }, { "Name": "Google.Apis.Admin.Directory.directory_v1.dll", "BaseName": "Google.Apis.Admin.Directory.directory_v1", "Target": "Latest", - "LatestVersion": "1.40.0.1505" + "LatestVersion": "1.41.1.1678" }, { "Name": "Google.Apis.Admin.Reports.reports_v1.dll", "BaseName": "Google.Apis.Admin.Reports.reports_v1", "Target": "Latest", - "LatestVersion": "1.40.0.1578" + "LatestVersion": "1.41.1.1601" }, { "Name": "Google.Apis.Auth.dll", "BaseName": "Google.Apis.Auth", "Target": "Latest", - "LatestVersion": "1.40.0" + "LatestVersion": "1.41.1" }, { "Name": "Google.Apis.Auth.PlatformServices.dll", "BaseName": "Google.Apis.Auth.PlatformServices", "Target": "Latest", - "LatestVersion": "1.40.0" + "LatestVersion": "1.41.1" }, { "Name": "Google.Apis.Calendar.v3.dll", "BaseName": "Google.Apis.Calendar.v3", "Target": "Latest", - "LatestVersion": "1.40.0.1580" + "LatestVersion": "1.41.1.1713" }, { "Name": "Google.Apis.Classroom.v1.dll", "BaseName": "Google.Apis.Classroom.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1587" + "LatestVersion": "1.41.1.1712" }, { "Name": "Google.Apis.Core.dll", "BaseName": "Google.Apis.Core", "Target": "Latest", - "LatestVersion": "1.40.0" + "LatestVersion": "1.41.1" }, { "Name": "Google.Apis.Docs.v1.dll", "BaseName": "Google.Apis.Docs.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1581" + "LatestVersion": "1.41.1.1708" }, { "Name": "Google.Apis.Drive.v3.dll", "BaseName": "Google.Apis.Drive.v3", "Target": "Latest", - "LatestVersion": "1.40.0.1587" + "LatestVersion": "1.41.1.1705" }, { "Name": "Google.Apis.DriveActivity.v2.dll", "BaseName": "Google.Apis.DriveActivity.v2", "Target": "Latest", - "LatestVersion": "1.40.0.1589" + "LatestVersion": "1.41.1.1710" }, { "Name": "Google.Apis.Gmail.v1.dll", "BaseName": "Google.Apis.Gmail.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1572" + "LatestVersion": "1.41.1.1635" }, { "Name": "Google.Apis.Groupssettings.v1.dll", "BaseName": "Google.Apis.Groupssettings.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1534" + "LatestVersion": "1.41.1.1666" }, { "Name": "Google.Apis.HangoutsChat.v1.dll", "BaseName": "Google.Apis.HangoutsChat.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1583" + "LatestVersion": "1.41.1.1707" }, { "Name": "Google.Apis.Licensing.v1.dll", "BaseName": "Google.Apis.Licensing.v1", "Target": "Latest", - "LatestVersion": "1.40.0.774" + "LatestVersion": "1.41.1.774" }, { "Name": "Google.Apis.Oauth2.v2.dll", "BaseName": "Google.Apis.Oauth2.v2", "Target": "Latest", - "LatestVersion": "1.40.0.1532" + "LatestVersion": "1.41.1.1602" }, { "Name": "Google.Apis.PeopleService.v1.dll", "BaseName": "Google.Apis.PeopleService.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1588" + "LatestVersion": "1.41.1.1713" }, { "Name": "Google.Apis.PlatformServices.dll", "BaseName": "Google.Apis.PlatformServices", "Target": "Latest", - "LatestVersion": "1.40.0" + "LatestVersion": "1.41.1" }, { "Name": "Google.Apis.Script.v1.dll", "BaseName": "Google.Apis.Script.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1589" + "LatestVersion": "1.41.1.1710" }, { "Name": "Google.Apis.Sheets.v4.dll", "BaseName": "Google.Apis.Sheets.v4", "Target": "Latest", - "LatestVersion": "1.40.0.1588" + "LatestVersion": "1.41.1.1705" }, { "Name": "Google.Apis.Slides.v1.dll", "BaseName": "Google.Apis.Slides.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1579" + "LatestVersion": "1.41.1.1707" }, { "Name": "Google.Apis.Tasks.v1.dll", "BaseName": "Google.Apis.Tasks.v1", "Target": "Latest", - "LatestVersion": "1.40.0.1513" + "LatestVersion": "1.41.1.1711" }, { "Name": "Google.Apis.Urlshortener.v1.dll", "BaseName": "Google.Apis.Urlshortener.v1", "Target": "Latest", - "LatestVersion": "1.40.0.138" + "LatestVersion": "1.41.1.138" }, { "Name": "MimeKit.dll",