From eb86ad405502ff27ec222549f0b8e2464e0bd3f1 Mon Sep 17 00:00:00 2001 From: Sruthi Keerthi Rangavajhula Date: Sat, 14 Oct 2023 22:38:24 -0700 Subject: [PATCH 1/5] Suppress error --- .../CompatibilitySuppressions.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/Microsoft.IdentityModel.Tokens/CompatibilitySuppressions.xml diff --git a/src/Microsoft.IdentityModel.Tokens/CompatibilitySuppressions.xml b/src/Microsoft.IdentityModel.Tokens/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..72fc73555e --- /dev/null +++ b/src/Microsoft.IdentityModel.Tokens/CompatibilitySuppressions.xml @@ -0,0 +1,10 @@ + + + + + CP0002 + M:Microsoft.IdentityModel.Tokens.JsonWebKeyConverter.ConvertFromECDsaSecurityKey(Microsoft.IdentityModel.Tokens.ECDsaSecurityKey) + lib/netstandard2.0/Microsoft.IdentityModel.Tokens.dll + lib/net461/Microsoft.IdentityModel.Tokens.dll + + From 582314419a12931f68dc50757b3aaf938ccf0fc7 Mon Sep 17 00:00:00 2001 From: Sruthi Keerthi Rangavajhula Date: Sun, 15 Oct 2023 07:43:04 -0700 Subject: [PATCH 2/5] Throw on error --- pack.ps1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pack.ps1 b/pack.ps1 index 65a26cdde4..acbfc22897 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -63,11 +63,17 @@ Write-Host "releaseVersion: " $releaseVersion; Write-Host "nugetPreview: " $nugetPreview; CreateArtifactsFolder($artifactsRoot); -foreach($project in $buildConfiguration.SelectNodes("root/projects/src/project")) + +foreach ($project in $buildConfiguration.SelectNodes("root/projects/src/project")) { - $name = $project.name; - Write-Host ">>> Start-Process -wait -NoNewWindow $dotnetexe 'pack' --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $root\src\$name\$name.csproj" - Start-Process -Wait -PassThru -NoNewWindow $dotnetexe "pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $root\src\$name\$name.csproj" + $name = $project.name + $projectPath = "$root\src\$name\$name.csproj" + + dotnet pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $projectPath + if($LASTEXITCODE -ne 0) + { + throw "Error occurred while packaging project '$projectPath'!" + } } Write-Host "============================" From 73c9d40c5ec28eaae015b742a59fb169b7122f38 Mon Sep 17 00:00:00 2001 From: Sruthi Keerthi Rangavajhula Date: Sun, 15 Oct 2023 07:54:58 -0700 Subject: [PATCH 3/5] Add spaces --- pack.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/pack.ps1 b/pack.ps1 index acbfc22897..6582c45d8d 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -70,6 +70,7 @@ foreach ($project in $buildConfiguration.SelectNodes("root/projects/src/project" $projectPath = "$root\src\$name\$name.csproj" dotnet pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $projectPath + if($LASTEXITCODE -ne 0) { throw "Error occurred while packaging project '$projectPath'!" From 7fe17e556e77f0e1a47a121e98c067bf3ea4c4af Mon Sep 17 00:00:00 2001 From: Sruthi Keerthi Rangavajhula Date: Sun, 15 Oct 2023 14:16:00 -0700 Subject: [PATCH 4/5] Add comments --- pack.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pack.ps1 b/pack.ps1 index 6582c45d8d..3a9fde0fc5 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -69,12 +69,15 @@ foreach ($project in $buildConfiguration.SelectNodes("root/projects/src/project" $name = $project.name $projectPath = "$root\src\$name\$name.csproj" + Write-Host ">>> dotnet pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $projectPath" dotnet pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $projectPath if($LASTEXITCODE -ne 0) { throw "Error occurred while packaging project '$projectPath'!" } + + Write-Host "Packaging for project '$projectPath' completed successfully." } Write-Host "============================" From 048556e260f397b7044c0815907397d0bdb72249 Mon Sep 17 00:00:00 2001 From: Sruthi Keerthi Rangavajhula Date: Mon, 16 Oct 2023 15:53:02 -0700 Subject: [PATCH 5/5] Use Path.Combine --- pack.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.ps1 b/pack.ps1 index 3a9fde0fc5..3f26954400 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -67,7 +67,7 @@ CreateArtifactsFolder($artifactsRoot); foreach ($project in $buildConfiguration.SelectNodes("root/projects/src/project")) { $name = $project.name - $projectPath = "$root\src\$name\$name.csproj" + $projectPath = [System.IO.Path]::Combine($root, "src", $name, "$name.csproj") Write-Host ">>> dotnet pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $projectPath" dotnet pack --no-build --no-restore -nodereuse:false -c $buildType -o $artifactsRoot -v q -s $projectPath