From 7b258d77cdcae697358ae8061d902f13f9ea51f4 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:51:31 -0700 Subject: [PATCH 01/18] Try add 3.1 --- ado-build.yml | 114 +++++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 48 deletions(-) diff --git a/ado-build.yml b/ado-build.yml index 201ab2113..48af9dd1c 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -1,51 +1,69 @@ pr: -- '*' + - "*" jobs: -- job: linux - pool: - vmImage: 'ubuntu-20.04' - steps: - - checkout: self - submodules: true - - - task: Bash@3 - displayName: 'Build and Test' - inputs: - filePath: 'BuildAndTest.sh' - failOnStderr: true - -- job: windows - pool: - vmImage: 'windows-latest' - steps: - - checkout: self - submodules: true - - - task: CmdLine@2 - displayName: 'Build and Test' - inputs: - script: 'BuildAndTest.cmd' - - - task: ComponentGovernanceComponentDetection@0 - inputs: - ignoreDirectories: 'src\sarif-sdk' - -- job: mac - pool: - vmImage: 'macOS-latest' - steps: - - checkout: self - submodules: true - - - task: Bash@3 - displayName: 'Build and Test' - inputs: - filePath: 'BuildAndTest.sh' - failOnStderr: true - - - task: Bash@3 - displayName: 'Run BinSkim' - inputs: - targetType: 'inline' - script: 'dotnet bld/bin/x64_Release/netcoreapp3.1/binskim.dll analyze src/Test.FunctionalTests.BinSkim.Driver/BaselineTestData/macho.*' + - job: linux + pool: + vmImage: "ubuntu-20.04" + steps: + - task: UseDotNet@2 + displayName: .NET Core 3.1 sdk + inputs: + version: "3.1.x" + packageType: sdk + + - checkout: self + submodules: true + + - task: Bash@3 + displayName: "Build and Test" + inputs: + filePath: "BuildAndTest.sh" + failOnStderr: true + + - job: windows + pool: + vmImage: "windows-latest" + steps: + - task: UseDotNet@2 + displayName: .NET Core 3.1 sdk + inputs: + version: "3.1.x" + packageType: sdk + + - checkout: self + submodules: true + + - task: CmdLine@2 + displayName: "Build and Test" + inputs: + script: "BuildAndTest.cmd" + + - task: ComponentGovernanceComponentDetection@0 + inputs: + ignoreDirectories: 'src\sarif-sdk' + + - job: mac + pool: + vmImage: "macOS-latest" + steps: + - task: UseDotNet@2 + displayName: .NET Core 3.1 sdk + inputs: + version: "3.1.x" + packageType: sdk + + - checkout: self + submodules: true + + - task: Bash@3 + displayName: "Build and Test" + inputs: + filePath: "BuildAndTest.sh" + failOnStderr: true + + - task: Bash@3 + displayName: "Run BinSkim" + inputs: + targetType: "inline" + script: "dotnet bld/bin/x64_Release/netcoreapp3.1/binskim.dll analyze src/Test.FunctionalTests.BinSkim.Driver/BaselineTestData/macho.*" From d4cbba5405fc77923c65fb4b1b4f81dade49cb3e Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:52:29 -0700 Subject: [PATCH 02/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 48af9dd1c..e5dc438d3 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test" + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 8db5d618578457f8979d1b9af04d076049c02a45 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:52:40 -0700 Subject: [PATCH 03/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index e5dc438d3..b0489189a 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From c9821fb12a47c0d408bdced27385c20132d57734 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:52:50 -0700 Subject: [PATCH 04/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index b0489189a..01659076d 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From b1e92fcc2dec40d2df429e8a1f8c8fea3f95ffc2 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:53:01 -0700 Subject: [PATCH 05/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 01659076d..d30674464 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 15ba747f7b8acce9476ced2b81e14c31b554f81b Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:53:11 -0700 Subject: [PATCH 06/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index d30674464..33f319c93 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 0951e8dd9aba2568882a652063428f954ed4b5b7 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:53:21 -0700 Subject: [PATCH 07/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 33f319c93..7b84312bd 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 768fe5a8099af3270e61a07c16eda9634cea3be2 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:53:32 -0700 Subject: [PATCH 08/18] trigger --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 7b84312bd..25ef373b9 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 8a590af70bb8118a6cd7b44db7bc940ad66f9c0c Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 11:53:46 -0700 Subject: [PATCH 09/18] done --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 25ef373b9..48af9dd1c 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -16,7 +16,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test" inputs: filePath: "BuildAndTest.sh" failOnStderr: true From a3130b2b474b6ebbb4ad01e4fd30b8594540fd17 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:05:23 -0700 Subject: [PATCH 10/18] add 6.0 --- ado-build.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ado-build.yml b/ado-build.yml index 48af9dd1c..44e14a51e 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -12,6 +12,12 @@ jobs: version: "3.1.x" packageType: sdk + - task: UseDotNet@2 + displayName: .NET Core 6.0 sdk + inputs: + version: "6.0.x" + packageType: sdk + - checkout: self submodules: true @@ -31,6 +37,12 @@ jobs: version: "3.1.x" packageType: sdk + - task: UseDotNet@2 + displayName: .NET Core 6.0 sdk + inputs: + version: "6.0.x" + packageType: sdk + - checkout: self submodules: true @@ -53,6 +65,12 @@ jobs: version: "3.1.x" packageType: sdk + - task: UseDotNet@2 + displayName: .NET Core 6.0 sdk + inputs: + version: "6.0.x" + packageType: sdk + - checkout: self submodules: true From c963bc4010958e59d1a574999d5b375b6b24a3f9 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:06:06 -0700 Subject: [PATCH 11/18] 1 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 44e14a51e..d9f57174f 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test" + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 194a04a644861e5017bb6924d875cba95898573a Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:06:15 -0700 Subject: [PATCH 12/18] 2 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index d9f57174f..3e719ef3b 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From eb939469de595453c6ea939902bea382a3e3f673 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:06:24 -0700 Subject: [PATCH 13/18] 3 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 3e719ef3b..1aeb51f64 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 53ccfcd82879bd447a7b688914e0dc6306380f06 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:06:40 -0700 Subject: [PATCH 14/18] 4 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 1aeb51f64..701b32faa 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 80fb3474f48efde1e674d4d4c8ffe1955d7ad466 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:06:50 -0700 Subject: [PATCH 15/18] 5 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 701b32faa..59c14af18 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From d8e45700018f016d331bbd730283218e2119d835 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:07:02 -0700 Subject: [PATCH 16/18] 6 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 59c14af18..e31c3e88b 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From fe8b3979854c9dcbceca057aa215699a0ef9bdc9 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:07:12 -0700 Subject: [PATCH 17/18] 7 --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index e31c3e88b..919de6956 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test " inputs: filePath: "BuildAndTest.sh" failOnStderr: true From 920f56a1943f1ffb7e5b44eb445d3f5687e19373 Mon Sep 17 00:00:00 2001 From: Shaopeng Li Date: Thu, 13 Jul 2023 12:08:22 -0700 Subject: [PATCH 18/18] done test --- ado-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ado-build.yml b/ado-build.yml index 919de6956..44e14a51e 100644 --- a/ado-build.yml +++ b/ado-build.yml @@ -22,7 +22,7 @@ jobs: submodules: true - task: Bash@3 - displayName: "Build and Test " + displayName: "Build and Test" inputs: filePath: "BuildAndTest.sh" failOnStderr: true