From c7d1401883bd524dfd3736991b793125db89b1f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 21 May 2019 21:13:47 +0000 Subject: [PATCH 1/3] Build(deps): Bump PackageManagement from 1.3.2 to 1.4 in /src/Modules Bumps PackageManagement from 1.3.2 to 1.4. Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 680721738cf..8ce0d39f0ea 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -4,7 +4,7 @@ - + From 40a267d8e2850ca1a286a5c3293553a154cf92d4 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 21 May 2019 14:56:19 -0700 Subject: [PATCH 2/3] Fix build issue --- build.psm1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.psm1 b/build.psm1 index 3f66cc3020a..dfa0299560c 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2250,7 +2250,10 @@ function Copy-PSGalleryModules # Remove the build revision from the src (nuget drops it). $srcVer = if ($version -match "(\d+.\d+.\d+).0") { $matches[1] - } else { + } elseif ($version -match "^\d+.\d+$") { + "$version.0" + } + else { $version } @@ -2262,7 +2265,7 @@ function Copy-PSGalleryModules New-Item -Path $dest -ItemType Directory -Force -ErrorAction Stop > $null # Exclude files/folders that are not needed. The fullclr folder is coming from the PackageManagement module $dontCopy = '*.nupkg', '*.nupkg.metadata', '*.nupkg.sha512', '*.nuspec', 'System.Runtime.InteropServices.RuntimeInformation.dll', 'fullclr' - Copy-Item -Exclude $dontCopy -Recurse $src/* $dest + Copy-Item -Exclude $dontCopy -Recurse $src/* $dest -ErrorAction Stop } } From 68ab269f6b241a09375222c995259bf1c334fdbe Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 21 May 2019 14:57:44 -0700 Subject: [PATCH 3/3] fix formatting and add spelling --- build.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.psm1 b/build.psm1 index dfa0299560c..c3f11cd3713 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2251,9 +2251,9 @@ function Copy-PSGalleryModules $srcVer = if ($version -match "(\d+.\d+.\d+).0") { $matches[1] } elseif ($version -match "^\d+.\d+$") { + # Two digit versions are stored as three digit versions "$version.0" - } - else { + } else { $version }