From aba2f7e04524159a289378de0447a0fe6b384e32 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 11:39:09 -0800 Subject: [PATCH 01/13] update to .NET 8 version --- bin/win/publish.cmd | 3 +- src/AdoPat.Test/AdoPat.Test.csproj | 15 +--- src/AdoPat/AdoPat.csproj | 14 ++-- src/AzureAuth.Test/AzureAuth.Test.csproj | 14 +--- src/AzureAuth/AzureAuth.csproj | 17 +--- .../MSALWrapper.Benchmark.csproj | 77 ++++++++----------- src/MSALWrapper.Test/MSALWrapper.Test.csproj | 10 +-- src/MSALWrapper/MSALWrapper.csproj | 13 +--- src/TestHelper/TestHelper.csproj | 9 +-- 9 files changed, 60 insertions(+), 112 deletions(-) diff --git a/bin/win/publish.cmd b/bin/win/publish.cmd index 3dde948f..67522527 100644 --- a/bin/win/publish.cmd +++ b/bin/win/publish.cmd @@ -8,4 +8,5 @@ if exist %~dp0\dist ( rmdir /S /Q %~dp0\dist ) -CALL %~dp0\dotnet.cmd publish %~dp0\..\..\src\AzureAuth\AzureAuth.csproj --self-contained true -r win10-x64 -c release -o %~dp0\..\..\dist %* + +CALL %~dp0\dotnet.cmd publish %~dp0\..\..\src\AzureAuth\AzureAuth.csproj --self-contained true -p:PublishTrimmed=false -r win-x64 -c release -o %~dp0\..\..\dist %* \ No newline at end of file diff --git a/src/AdoPat.Test/AdoPat.Test.csproj b/src/AdoPat.Test/AdoPat.Test.csproj index 48439666..4ea1450c 100644 --- a/src/AdoPat.Test/AdoPat.Test.csproj +++ b/src/AdoPat.Test/AdoPat.Test.csproj @@ -1,21 +1,16 @@ - - net6.0 - + net8.0 false - True - - - + + - @@ -24,10 +19,8 @@ - - - + \ No newline at end of file diff --git a/src/AdoPat/AdoPat.csproj b/src/AdoPat/AdoPat.csproj index 5e615c97..d51007de 100644 --- a/src/AdoPat/AdoPat.csproj +++ b/src/AdoPat/AdoPat.csproj @@ -1,23 +1,19 @@  - Microsoft.Authentication.AdoPat - net6.0 + net8.0 Microsoft.Authentication.AdoPat - - + - - - + + - - + \ No newline at end of file diff --git a/src/AzureAuth.Test/AzureAuth.Test.csproj b/src/AzureAuth.Test/AzureAuth.Test.csproj index 8d5eb823..39500583 100644 --- a/src/AzureAuth.Test/AzureAuth.Test.csproj +++ b/src/AzureAuth.Test/AzureAuth.Test.csproj @@ -1,22 +1,18 @@  - PlatformWindows - - net6.0 + net8.0 false Microsoft.Authentication.AzureAuth.Test - - - + + - @@ -26,10 +22,8 @@ - - - + \ No newline at end of file diff --git a/src/AzureAuth/AzureAuth.csproj b/src/AzureAuth/AzureAuth.csproj index 859cc209..8d4326a9 100644 --- a/src/AzureAuth/AzureAuth.csproj +++ b/src/AzureAuth/AzureAuth.csproj @@ -1,50 +1,41 @@ - PlatformWindows true - - + true true true - - net6.0 + net8.0 microsoft.authentication.azureauth Exe azureauth Microsoft.Authentication.AzureAuth - AzureAuth.nuspec $(NuspecProperties);Configuration=$(Configuration);Version=$(Version)$(VersionSuffix) - True - - - + - - - + \ No newline at end of file diff --git a/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj b/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj index 2e2c3892..b3d3f218 100644 --- a/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj +++ b/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj @@ -1,46 +1,37 @@ - - net6.0-windows10.0.19041.0 - PlatformWindows - true - - - - net6.0 - - - - net6.0 - - - - enable - enable - Microsoft.Authentication.$(MSBuildProjectName.Replace(" ", "_")) - Exe - - - - - - - - - - - - - 4.61.3 - - - - $(PkgPMicrosoft_Identity_Client)\lib\net5.0-windows10.0.17763\Microsoft.Identity.Client.dll - - - - + + $(PkgPMicrosoft_Identity_Client)\lib\net5.0-windows10.0.17763\Microsoft.Identity.Client.dll + + + - - - + + + \ No newline at end of file diff --git a/src/MSALWrapper.Test/MSALWrapper.Test.csproj b/src/MSALWrapper.Test/MSALWrapper.Test.csproj index d2d9a1f6..b26bc171 100644 --- a/src/MSALWrapper.Test/MSALWrapper.Test.csproj +++ b/src/MSALWrapper.Test/MSALWrapper.Test.csproj @@ -1,18 +1,15 @@  - - net6.0 + net8.0 false Microsoft.Authentication.MSALWrapper.Test - - @@ -20,14 +17,11 @@ - PlatformWindows - - - + \ No newline at end of file diff --git a/src/MSALWrapper/MSALWrapper.csproj b/src/MSALWrapper/MSALWrapper.csproj index 9a3229d8..dddb5d34 100644 --- a/src/MSALWrapper/MSALWrapper.csproj +++ b/src/MSALWrapper/MSALWrapper.csproj @@ -1,40 +1,31 @@  - Microsoft.Authentication.MSALWrapper - net6.0 + net8.0 Microsoft.Authentication.MSALWrapper - ../ - Microsoft Authentication MSAL Wrapper https://github.com/AzureAD/microsoft-authentication-cli A library for quickly authenticating with various Azure resources MSAL;authentication - true True - PlatformWindows - - - + - - \ No newline at end of file diff --git a/src/TestHelper/TestHelper.csproj b/src/TestHelper/TestHelper.csproj index f8c168c6..7a7b90e4 100644 --- a/src/TestHelper/TestHelper.csproj +++ b/src/TestHelper/TestHelper.csproj @@ -1,13 +1,10 @@ - - net6.0 + net8.0 enable - - + - - + \ No newline at end of file From 0e5506ded9972c7a40be81126b7cd54dda24fea9 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 12:12:44 -0800 Subject: [PATCH 02/13] drop an unnecessary update --- src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj b/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj index b3d3f218..6f7be1c9 100644 --- a/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj +++ b/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj @@ -18,7 +18,7 @@ - + @@ -32,6 +32,6 @@ - + \ No newline at end of file From 76dfff255c37e191cac3252744b0da05cbfdd111 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 13:17:34 -0800 Subject: [PATCH 03/13] update CHANGELOG file --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a938cb5..49adaaf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Temporarily paused the publishing of Linux binaries. - Upgrade MSAL from `4.59.1` to `4.61.3`. -- Upgrade Lasso from `2024.8.24.1` to `2024.10.14.1`. +- Upgrade Lasso from `2024.8.24.1` to `2024.10.23.1`. +- Upgrade from .NET 6 to .NET 8. ## [0.8.6] - 2024-04-25 ### Changed From 2b39173f8d8424554551884b23b7095672831a20 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 13:33:27 -0800 Subject: [PATCH 04/13] update mac publish script --- bin/mac/publish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mac/publish b/bin/mac/publish index 9e8536ee..e64f4e98 100755 --- a/bin/mac/publish +++ b/bin/mac/publish @@ -42,4 +42,4 @@ esac #------------------------------------------ # Publish -$GIT_DIR/bin/mac/dotnet publish "$GIT_DIR/src/AzureAuth/AzureAuth.csproj" --self-contained true -r "$runtime" -c release -o $DIST $* +$GIT_DIR/bin/mac/dotnet publish "$GIT_DIR/src/AzureAuth/AzureAuth.csproj" --self-contained true -p:PublishTrimmed=false -r "$runtime" -c release -o $DIST $* From f0491e2be5424a1d130d364846f73e2873860e58 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 14:07:36 -0800 Subject: [PATCH 05/13] disable trimmed version and update CHANGELOG --- CHANGELOG.md | 1 + bin/mac/publish | 2 +- bin/win/publish.cmd | 2 +- src/AzureAuth/AzureAuth.csproj | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49adaaf6..fa6a5d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Upgrade MSAL from `4.59.1` to `4.61.3`. - Upgrade Lasso from `2024.8.24.1` to `2024.10.23.1`. - Upgrade from .NET 6 to .NET 8. +- Disable trimmed version when publishing AzureAuth. ## [0.8.6] - 2024-04-25 ### Changed diff --git a/bin/mac/publish b/bin/mac/publish index e64f4e98..9e8536ee 100755 --- a/bin/mac/publish +++ b/bin/mac/publish @@ -42,4 +42,4 @@ esac #------------------------------------------ # Publish -$GIT_DIR/bin/mac/dotnet publish "$GIT_DIR/src/AzureAuth/AzureAuth.csproj" --self-contained true -p:PublishTrimmed=false -r "$runtime" -c release -o $DIST $* +$GIT_DIR/bin/mac/dotnet publish "$GIT_DIR/src/AzureAuth/AzureAuth.csproj" --self-contained true -r "$runtime" -c release -o $DIST $* diff --git a/bin/win/publish.cmd b/bin/win/publish.cmd index 67522527..2e133890 100644 --- a/bin/win/publish.cmd +++ b/bin/win/publish.cmd @@ -9,4 +9,4 @@ if exist %~dp0\dist ( ) -CALL %~dp0\dotnet.cmd publish %~dp0\..\..\src\AzureAuth\AzureAuth.csproj --self-contained true -p:PublishTrimmed=false -r win-x64 -c release -o %~dp0\..\..\dist %* \ No newline at end of file +CALL %~dp0\dotnet.cmd publish %~dp0\..\..\src\AzureAuth\AzureAuth.csproj --self-contained true -r win-x64 -c release -o %~dp0\..\..\dist %* \ No newline at end of file diff --git a/src/AzureAuth/AzureAuth.csproj b/src/AzureAuth/AzureAuth.csproj index 8d4326a9..b9a8ab85 100644 --- a/src/AzureAuth/AzureAuth.csproj +++ b/src/AzureAuth/AzureAuth.csproj @@ -7,7 +7,7 @@ true true - true + false net8.0 From 01907e39dfd3e96b5f804208f638de96d095cadb Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 14:48:45 -0800 Subject: [PATCH 06/13] update .net version in pipelines --- .github/workflows/azure-devops-pipelines-cg.yml | 2 +- .github/workflows/dotnet-test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/azure-devops-pipelines-cg.yml b/.github/workflows/azure-devops-pipelines-cg.yml index 086abdc3..8f3dde7a 100644 --- a/.github/workflows/azure-devops-pipelines-cg.yml +++ b/.github/workflows/azure-devops-pipelines-cg.yml @@ -37,7 +37,7 @@ extends: - task: UseDotNet@2 inputs: packageType: 'sdk' - version: '6.x' + version: '8.x' - task: DotNetCoreCLI@2 displayName: dotnet restore inputs: diff --git a/.github/workflows/dotnet-test.yml b/.github/workflows/dotnet-test.yml index b5f03379..683f5c36 100644 --- a/.github/workflows/dotnet-test.yml +++ b/.github/workflows/dotnet-test.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup .NET 6 + - name: Setup .NET 8 uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Get Azure DevOps Access Token id: getToken From 3390024a7b1de219e9fa56265d3c68ba8966699d Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 15:01:50 -0800 Subject: [PATCH 07/13] fix comments --- bin/win/publish.cmd | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/win/publish.cmd b/bin/win/publish.cmd index 2e133890..e51beb46 100644 --- a/bin/win/publish.cmd +++ b/bin/win/publish.cmd @@ -8,5 +8,4 @@ if exist %~dp0\dist ( rmdir /S /Q %~dp0\dist ) - CALL %~dp0\dotnet.cmd publish %~dp0\..\..\src\AzureAuth\AzureAuth.csproj --self-contained true -r win-x64 -c release -o %~dp0\..\..\dist %* \ No newline at end of file From d530c4d08b363e3c75dbbade37b9dace6c69395e Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 15:23:25 -0800 Subject: [PATCH 08/13] fix a typo --- src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj b/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj index 6f7be1c9..4bb47812 100644 --- a/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj +++ b/src/MSALWrapper.Benchmark/MSALWrapper.Benchmark.csproj @@ -26,7 +26,7 @@ - + $(PkgPMicrosoft_Identity_Client)\lib\net5.0-windows10.0.17763\Microsoft.Identity.Client.dll From 1ee3089adc9789d564f97707d5a4a13c2f55a4fa Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Mon, 4 Nov 2024 15:42:57 -0800 Subject: [PATCH 09/13] update .net vesion in release pipeline --- .github/workflows/release-azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-azure-pipelines.yml b/.github/workflows/release-azure-pipelines.yml index 2b393026..83b3492c 100644 --- a/.github/workflows/release-azure-pipelines.yml +++ b/.github/workflows/release-azure-pipelines.yml @@ -101,9 +101,9 @@ extends: steps: - checkout: self - task: UseDotNet@2 - displayName: Use .NET Core sdk 6.x + displayName: Use .NET Core sdk 8.x inputs: - version: 6.x + version: 8.x - task: NuGetToolInstaller@0 displayName: Use NuGet 6.x inputs: From 4d8aa151ab1708c1a5f8bf36258aee34c96305bf Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Tue, 5 Nov 2024 11:02:18 -0800 Subject: [PATCH 10/13] test changes in release pipeline --- .github/workflows/release-azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-azure-pipelines.yml b/.github/workflows/release-azure-pipelines.yml index 83b3492c..7825331b 100644 --- a/.github/workflows/release-azure-pipelines.yml +++ b/.github/workflows/release-azure-pipelines.yml @@ -105,9 +105,9 @@ extends: inputs: version: 8.x - task: NuGetToolInstaller@0 - displayName: Use NuGet 6.x + displayName: Use NuGet 8.x inputs: - versionSpec: 6.x + versionSpec: 8.x - task: DotNetCoreCLI@2 displayName: Install dependencies inputs: From cd06a01fce231dd246824fbcec1c3f7f9b9a4bb6 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Wed, 6 Nov 2024 10:25:54 -0800 Subject: [PATCH 11/13] replace win10-x64 with win-x64 and add ado_token for build_projects step in release yaml file --- .github/workflows/release-azure-pipelines.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-azure-pipelines.yml b/.github/workflows/release-azure-pipelines.yml index 7825331b..e503e404 100644 --- a/.github/workflows/release-azure-pipelines.yml +++ b/.github/workflows/release-azure-pipelines.yml @@ -13,7 +13,7 @@ parameters: name: Azure-Pipelines-1ESPT-ExDShared image: windows-latest os: windows - runtime: win10-x64 + runtime: win-x64 archiveExt: zip - pool: name: Azure Pipelines @@ -105,9 +105,9 @@ extends: inputs: version: 8.x - task: NuGetToolInstaller@0 - displayName: Use NuGet 8.x + displayName: Use NuGet 6.x inputs: - versionSpec: 8.x + versionSpec: 6.x - task: DotNetCoreCLI@2 displayName: Install dependencies inputs: @@ -119,6 +119,8 @@ extends: # 1ES PT requires explicit build task for Roslyn analysis. Auto-injected Roslyn task will use build logs from this build. - task: DotNetCoreCLI@2 displayName: Build projects + env: + ADO_TOKEN: $(System.AccessToken) inputs: command: 'build' projects: '**/*.csproj' From 01b35618e6526129188eb653e2cffc8133ff6430 Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Wed, 6 Nov 2024 14:24:26 -0800 Subject: [PATCH 12/13] add suppression file and fix release pipeline --- .config/guardian/SDL/.gdnsuppress | 101 ++++++++++++++++++ .github/workflows/release-azure-pipelines.yml | 15 +-- 2 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 .config/guardian/SDL/.gdnsuppress diff --git a/.config/guardian/SDL/.gdnsuppress b/.config/guardian/SDL/.gdnsuppress new file mode 100644 index 00000000..aacad9c9 --- /dev/null +++ b/.config/guardian/SDL/.gdnsuppress @@ -0,0 +1,101 @@ +{ + "hydrated": false, + "properties": { + "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions", + "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance." + }, + "version": "1.0.0", + "suppressionSets": { + "default": { + "name": "default", + "createdDate": "2024-11-05 22:44:27Z", + "lastUpdatedDate": "2024-11-05 22:44:27Z" + } + }, + "results": { + "fe2acc487ef033024b04850e3353f13bd2440a4667d0a40e87e8f731e9e515e8": { + "signature": "fe2acc487ef033024b04850e3353f13bd2440a4667d0a40e87e8f731e9e515e8", + "alternativeSignatures": [ + "324d61936e58b8df281670af4015fa27e4ca538f4953cb526fadd200f9d39a2c" + ], + "target": "azureauth-0.8.6-osx-x64-signed/AzureAuth/AdoPat.dll", + "memberOf": [ + "default" + ], + "tool": "binskim", + "ruleId": "BA2021", + "createdDate": "2024-11-05 22:44:27Z", + "justification": "Not applicable to win-x64, only applicable to osx-x64" + }, + "496121e11663e27908700184fa29796a0bf716e2a84d2f1ab70a6cd06730d62d": { + "signature": "496121e11663e27908700184fa29796a0bf716e2a84d2f1ab70a6cd06730d62d", + "alternativeSignatures": [ + "71a5d359a6601a6a7521ed45e5332517fe76d21eb8c9e0da490a1cb08c51e081" + ], + "target": "azureauth-0.8.6-osx-x64-signed/AzureAuth/azureauth.dll", + "memberOf": [ + "default" + ], + "tool": "binskim", + "ruleId": "BA2021", + "createdDate": "2024-11-05 22:44:27Z", + "justification": "Not applicable to win-x64, only applicable to osx-x64" + }, + "06af3c593c39a7530472338385efa6359d040941ae019dc6f24984ba7cfbcf0a": { + "signature": "06af3c593c39a7530472338385efa6359d040941ae019dc6f24984ba7cfbcf0a", + "alternativeSignatures": [ + "7bebe0a963209c4608e803bcc52d8d946e8032ce71b05471469b19a416acfca1" + ], + "target": "azureauth-0.8.6-osx-x64-signed/AzureAuth/MSALWrapper.dll", + "memberOf": [ + "default" + ], + "tool": "binskim", + "ruleId": "BA2021", + "createdDate": "2024-11-05 22:44:27Z", + "justification": "Not applicable to win-x64, only applicable to osx-x64" + }, + "9b908590fc46385c33bd4e2b2a14d08b99c0266f747b49d84096282f3c235c7a": { + "signature": "9b908590fc46385c33bd4e2b2a14d08b99c0266f747b49d84096282f3c235c7a", + "alternativeSignatures": [ + "b1dafeea2babfc82fd9dd4d8fd95b509f46d74bcb2b9152ab7e1bba72d97f9e1" + ], + "target": "azureauth-0.8.6-osx-arm64-signed/AzureAuth/AdoPat.dll", + "memberOf": [ + "default" + ], + "tool": "binskim", + "ruleId": "BA2021", + "createdDate": "2024-11-05 22:44:37Z", + "justification": "Not applicable to win-x64, only applicable to osx-arm64" + }, + "17ed0e261bc1b517b1d242818087a3264c163346e3ba5587186b2be602b159c1": { + "signature": "17ed0e261bc1b517b1d242818087a3264c163346e3ba5587186b2be602b159c1", + "alternativeSignatures": [ + "d96cd805605923e5466365501ae55697422f1aa1a60a9e04292b56bace26fa8e" + ], + "target": "azureauth-0.8.6-osx-arm64-signed/AzureAuth/azureauth.dll", + "memberOf": [ + "default" + ], + "tool": "binskim", + "ruleId": "BA2021", + "createdDate": "2024-11-05 22:44:37Z", + "justification": "Not applicable to win-x64, only applicable to osx-arm64" + }, + "43a1ba6dd9d8f5a638e8596d7aaea53aca9812916c95467ca2828c15435c96bc": { + "signature": "43a1ba6dd9d8f5a638e8596d7aaea53aca9812916c95467ca2828c15435c96bc", + "alternativeSignatures": [ + "84717f74e20904b858d4d7ff8029ea2e98b56d862f66feced2367d4090d07632" + ], + "target": "azureauth-0.8.6-osx-arm64-signed/AzureAuth/MSALWrapper.dll", + "memberOf": [ + "default" + ], + "tool": "binskim", + "ruleId": "BA2021", + "createdDate": "2024-11-05 22:44:37Z", + "justification": "Not applicable to win-x64, only applicable to osx-arm64" + } + } +} diff --git a/.github/workflows/release-azure-pipelines.yml b/.github/workflows/release-azure-pipelines.yml index e503e404..ccd4ff96 100644 --- a/.github/workflows/release-azure-pipelines.yml +++ b/.github/workflows/release-azure-pipelines.yml @@ -153,6 +153,9 @@ extends: image: windows-latest os: windows templateContext: + sdl: + suppression: + suppressionFile: $(Build.SourcesDirectory)\.config\guardian\SDL\.gdnsuppress inputs: - input: pipelineArtifact artifactName: azureauth-${{ parameters.version }}-${{ config.runtime }} @@ -163,8 +166,8 @@ extends: targetPath: $(artifactsPath)-${{ config.runtime }}-signed steps: - task: EsrpCodeSigning@5 - displayName: Sign artifacts win10-x64 - condition: eq('${{ config.runtime }}', 'win10-x64') + displayName: Sign artifacts win-x64 + condition: eq('${{ config.runtime }}', 'win-x64') inputs: ConnectedServiceName: $(ESRP_KV_SERVICE_CONNECTION) AppRegistrationClientId: $(SIGNING_AAD_ID) @@ -292,12 +295,12 @@ extends: script: | mkdir azureauth-${{ parameters.version }}-packaged - task: ArchiveFiles@2 - displayName: Create win10-x64 archive + displayName: Create win-x64 archive inputs: - rootFolderOrFile: $(artifactsPath)-win10-x64-signed/AzureAuth + rootFolderOrFile: $(artifactsPath)-win-x64-signed/AzureAuth includeRootFolder: false archiveType: zip - archiveFile: $(artifactsPath)-packaged/azureauth-${{ parameters.version }}-win10-x64.zip + archiveFile: $(artifactsPath)-packaged/azureauth-${{ parameters.version }}-win-x64.zip - task: Bash@3 displayName: Prepare osx-x64 executables inputs: @@ -373,6 +376,6 @@ extends: releaseNotesSource: 'inline' releaseNotesInline: "Release ${{ parameters.version }}. See [`CHANGELOG.md`](https://github.com/AzureAD/microsoft-authentication-cli/blob/${{ parameters.version }}/CHANGELOG.md) for updates." assets: | - $(artifactsPath)-packaged/azureauth-${{ parameters.version }}-win10-x64.zip + $(artifactsPath)-packaged/azureauth-${{ parameters.version }}-win-x64.zip $(artifactsPath)-packaged/azureauth-${{ parameters.version }}-osx-x64.tar.gz $(artifactsPath)-packaged/azureauth-${{ parameters.version }}-osx-arm64.tar.gz \ No newline at end of file From 6a2addf93a20640621674d6c56b4838fe79797eb Mon Sep 17 00:00:00 2001 From: "REDMOND\\keyuxuan" Date: Wed, 6 Nov 2024 18:37:03 -0800 Subject: [PATCH 13/13] dsiable trimming in MSALWrapper and ADOPat csproj files as well --- src/AdoPat/AdoPat.csproj | 1 + src/MSALWrapper/MSALWrapper.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/AdoPat/AdoPat.csproj b/src/AdoPat/AdoPat.csproj index 4e2f1f53..a84af207 100644 --- a/src/AdoPat/AdoPat.csproj +++ b/src/AdoPat/AdoPat.csproj @@ -3,6 +3,7 @@ Microsoft.Authentication.AdoPat net8.0 Microsoft.Authentication.AdoPat + false diff --git a/src/MSALWrapper/MSALWrapper.csproj b/src/MSALWrapper/MSALWrapper.csproj index faed0c5f..dbb8e68a 100644 --- a/src/MSALWrapper/MSALWrapper.csproj +++ b/src/MSALWrapper/MSALWrapper.csproj @@ -5,6 +5,7 @@ net8.0 Microsoft.Authentication.MSALWrapper ../ + false Microsoft Authentication MSAL Wrapper https://github.com/AzureAD/microsoft-authentication-cli