From f06686fa9917f6dfe367c1d3f95b1821b8b93178 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 13 Oct 2022 11:48:14 -0700 Subject: [PATCH 1/8] Attempting to stablize the API Compatibility CI. --- build/Common.prod.props | 12 +++++++++--- build/PreBuild.ps1 | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/build/Common.prod.props b/build/Common.prod.props index 915644b775..afc20ad9a1 100644 --- a/build/Common.prod.props +++ b/build/Common.prod.props @@ -13,11 +13,17 @@ - + - - + + + diff --git a/build/PreBuild.ps1 b/build/PreBuild.ps1 index 847c4d52c7..3d88bdf9bd 100644 --- a/build/PreBuild.ps1 +++ b/build/PreBuild.ps1 @@ -1,6 +1,9 @@ -param([string]$package, [string]$version) +param( + [string]$package, + [string]$version, + [string]$workDir = "..\LastMajorVersionBinaries" +) -$workDir = "..\LastMajorVersionBinaries" if (-Not (Test-Path $workDir)) { Write-Host "Working directory for previous package versions not found, creating..." @@ -16,6 +19,7 @@ else Write-Host "Retrieving $package @$version for compatibility check" Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/$package/$version -Outfile "$workDir\$package.$version.zip" } + if (Test-Path -Path "$workDir\$package\$version\lib") { Write-Debug "Previous package version already extracted" From 6ead96e3fef25e7ba6991d1ea95373fef9602752 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 13 Oct 2022 11:55:49 -0700 Subject: [PATCH 2/8] Tweak. --- build/PreBuild.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/PreBuild.ps1 b/build/PreBuild.ps1 index 3d88bdf9bd..e70c5b7b85 100644 --- a/build/PreBuild.ps1 +++ b/build/PreBuild.ps1 @@ -1,7 +1,7 @@ param( [string]$package, [string]$version, - [string]$workDir = "..\LastMajorVersionBinaries" + [string]$workDir = ".\LastMajorVersionBinaries" ) if (-Not (Test-Path $workDir)) From ec44429a2f975dd8f79ef86ea2e7c76f6e494971 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 13 Oct 2022 13:01:21 -0700 Subject: [PATCH 3/8] More logging. --- build/PreBuild.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/PreBuild.ps1 b/build/PreBuild.ps1 index e70c5b7b85..6bb374db5d 100644 --- a/build/PreBuild.ps1 +++ b/build/PreBuild.ps1 @@ -6,25 +6,26 @@ param( if (-Not (Test-Path $workDir)) { - Write-Host "Working directory for previous package versions not found, creating..." + Write-Host "Working directory for compatibility check packages '$workDir' not found, creating..." New-Item -Path $workDir -ItemType "directory" | Out-Null } if (Test-Path -Path "$workDir\$package.$version.zip") { - Write-Debug "Previous package version already downloaded" + Write-Host "Previous package $package@$version already downloaded for compatibility check" } else { - Write-Host "Retrieving $package @$version for compatibility check" + Write-Host "Retrieving package $package@$version for compatibility check" Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/$package/$version -Outfile "$workDir\$package.$version.zip" } if (Test-Path -Path "$workDir\$package\$version\lib") { - Write-Debug "Previous package version already extracted" + Write-Host "Previous package $package@$version already extracted to '$workDir\$package\$version\lib'" } else { + Write-Host "Extracting package $package@$version from '$workDir\$package.$version.zip' to '$workDir\$package\$version' for compatibility check" Expand-Archive -LiteralPath "$workDir\$package.$version.zip" -DestinationPath "$workDir\$package\$version" -Force } From edb7ec13dc4cc2f2b3a8d1dd70c8e2f6e0af484d Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 13 Oct 2022 13:50:40 -0700 Subject: [PATCH 4/8] Increase build logging level for api compat ci job. --- .github/workflows/apicompatibility.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/apicompatibility.yml b/.github/workflows/apicompatibility.yml index 9ab30cf373..376ed6b651 100644 --- a/.github/workflows/apicompatibility.yml +++ b/.github/workflows/apicompatibility.yml @@ -26,4 +26,4 @@ jobs: run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet build -v normal --configuration Release --no-restore From ce6a7347636bb7e6ccbf38c814720838f2697c02 Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Thu, 13 Oct 2022 14:08:07 -0700 Subject: [PATCH 5/8] Tweak. --- build/Common.prod.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Common.prod.props b/build/Common.prod.props index afc20ad9a1..32d7c775bb 100644 --- a/build/Common.prod.props +++ b/build/Common.prod.props @@ -16,7 +16,7 @@ - +