diff --git a/.lgtm.yml b/.lgtm.yml index 0d70d18aa..63d7f287e 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -5,3 +5,27 @@ extraction: dotnet: arguments: "-c release" version: "3.1.201" + +extraction: + csharp: + index: + solution: "Tests/Tests.csproj" + dotnet: + arguments: "-c release" + version: "3.1.201" + +extraction: + csharp: + index: + solution: "Benchmarks/Benchmarks.csproj" + dotnet: + arguments: "-c release" + version: "3.1.201" + +extraction: + csharp: + index: + solution: "Lib/Lib.csproj" + dotnet: + arguments: "-c release" + version: "3.1.201" \ No newline at end of file diff --git a/Pipelines/pr-validation.yml b/Pipelines/pr-validation.yml index 11077f0b5..aa50da93c 100644 --- a/Pipelines/pr-validation.yml +++ b/Pipelines/pr-validation.yml @@ -15,6 +15,7 @@ pr: - Lib - Tests - Benchmarks + - Pipelines variables: solution: '**/*.sln' diff --git a/Pipelines/release.yml b/Pipelines/release.yml index e105c96b4..a2d811c72 100644 --- a/Pipelines/release.yml +++ b/Pipelines/release.yml @@ -1,11 +1,13 @@ name: ASA Release +pr: none trigger: batch: true paths: include: - Cli - Lib + - Pipelines branches: include: - release/v2.* @@ -214,18 +216,9 @@ stages: script: | VERSION="$(nbgv get-version -v AssemblyInformationalVersion | cut -d'+' -f 1)" - mkdir $BIN_DIR/Asa-linux-$VERSION - mv $BIN_DIR/linux/Asa $BIN_DIR/Asa-linux-$VERSION/res/ - - cp $SRC_DIR/Asa/AsaLaunch.sh $BIN_DIR/Asa-linux-$VERSION/AsaLaunch.sh - cp $SRC_DIR/Asa/AsaLaunchGui.sh $BIN_DIR/Asa-linux-$VERSION/AsaLaunchGui.sh - - chmod +x $BIN_DIR/Asa-linux-$VERSION/AsaLaunch.sh - chmod +x $BIN_DIR/Asa-linux-$VERSION/AsaLaunchGui.sh - chmod +x $BIN_DIR/Asa-linux-$VERSION/res/Asa - - cd $BIN_DIR - tar -czvf $ART_DIR/Asa-linux-$VERSION.tar.gz Asa-linux-$VERSION + mv $BIN_DIR/linux $BIN_DIR/Asa-linux-$VERSION + + tar -czvf $ART_DIR/Asa-linux-$VERSION.tar.gz $BIN_DIR/Asa-linux-$VERSION sha256sum $ART_DIR/Asa-linux-$VERSION.tar.gz | awk ' { n=split($2, a, "/"); $2 = a[n]; print; } ' OFS='\t' >> $BIN_DIR/HASHES_LINUX.txt displayName: 'Prepare Artifacts' @@ -277,23 +270,15 @@ stages: projects: 'Cli/Cli.csproj' arguments: '--configuration $(BuildConfiguration) --output $(build.binariesdirectory)/macos -r osx-x64' zipAfterPublish: false + - task: CmdLine@2 inputs: script: | VERSION="$(nbgv get-version -v AssemblyInformationalVersion | cut -d'+' -f 1)" - mkdir $BIN_DIR/Asa-macos-$VERSION - mv $BIN_DIR/macos/Asa $BIN_DIR/Asa-macos-$VERSION/res/ - - cp $SRC_DIR/Asa/AsaLaunch.sh $BIN_DIR/Asa-macos-$VERSION/AsaLaunch.sh - cp $SRC_DIR/Asa/AsaLaunchGui.sh $BIN_DIR/Asa-macos-$VERSION/AsaLaunchGui.sh - - chmod +x $BIN_DIR/Asa-macos-$VERSION/AsaLaunch.sh - chmod +x $BIN_DIR/Asa-macos-$VERSION/AsaLaunchGui.sh - chmod +x $BIN_DIR/Asa-macos-$VERSION/res/Asa - - cd $BIN_DIR - tar -czvf $ART_DIR/Asa-macos-$VERSION.tar.gz Asa-macos-$VERSION + mv $BIN_DIR/macos $BIN_DIR/Asa-macos-$VERSION + + tar -czvf $ART_DIR/Asa-macos-$VERSION.tar.gz $BIN_DIR/Asa-macos-$VERSION sha256sum $ART_DIR/Asa-macos-$VERSION.tar.gz | awk ' { n=split($2, a, "/"); $2 = a[n]; print; } ' OFS='\t' >> $BIN_DIR/HASHES_MAC.txt displayName: 'Prepare Artifacts' diff --git a/Pipelines/sdl.yml b/Pipelines/sdl.yml index c77cc9368..22f97d957 100644 --- a/Pipelines/sdl.yml +++ b/Pipelines/sdl.yml @@ -10,8 +10,6 @@ schedules: include: - master - releases/* - exclude: - - releases/2.0 pool: vmImage: 'windows-latest' @@ -35,27 +33,6 @@ steps: inputs: toolMajorVersion: 'V2' outputFormat: 'sarif' -- task: Semmle@0 - displayName: Semmle C# - inputs: - sourceCodeDirectory: '$(Build.SourcesDirectory)' - language: 'csharp' - cleanupBuildCommands: 'dotnet clean' - buildCommands: 'dotnet build' - querySuite: 'Recommended' - timeout: '1800' - ram: '16384' - addProjectDirToScanningExclusionList: true -- task: Semmle@0 - displayName: Semmle JS - inputs: - sourceCodeDirectory: '$(Build.SourcesDirectory)\Cli\wwwroot' - language: 'javascript' - includeNodeModules: false - querySuite: 'Recommended' - timeout: '1800' - ram: '16384' - addProjectDirToScanningExclusionList: true - task: SdtReport@1 inputs: @@ -73,7 +50,7 @@ steps: PoliCheck: false RoslynAnalyzers: false SDLNativeRules: false - Semmle: true + Semmle: false SemmleBreakOn: 'Error' TSLint: false ToolLogsNotFoundAction: 'Standard' @@ -102,12 +79,6 @@ steps: targetPath: '$(Pipeline.Workspace)\_sdt\logs\CredentialScanner\CredentialScanner-matches.sarif' artifact: 'CredScan.sarif' -- task: PublishPipelineArtifact@1 - displayName: Publish C# Semmle Result - inputs: - targetPath: '$(Pipeline.Workspace)\_sdt\logs\Semmle\csharp\microsoft.AttackSurfaceAnalyzer-csharp-1.sarif' - artifact: 'SemmleCS.sarif' - - task: PublishPipelineArtifact@1 displayName: Publish JS Semmle Result inputs: