C#: Remove legacy odasa support
#8322
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaelnebel
previously approved these changes
Mar 7, 2022
LGTM. Very nice with some cleanup.
Have added a couple of comments. Nothing that should block a merge.
|
|
||
| SourceArchiveDir = | ||
| Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR") ?? | ||
| Actions.GetEnvironmentVariable("SOURCE_ARCHIVE") ?? | ||
| throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR or SOURCE_ARCHIVE has not been set."); |
There was a problem hiding this comment.
SOURCE_ARCHIVE needs to be removed from exception message.
| @@ -70,7 +70,7 @@ public BuildCommand(string exe, string? argumentsOpt, bool silent, string? worki | |||
| this.environment = environment; | |||
| } | |||
|
|
|||
| public override string ToString() => exe + " " + arguments; | |||
| public override string ToString() => arguments.Length > 0 ? exe + " " + arguments : exe; | |||
There was a problem hiding this comment.
Maybe use !string.IsNullOrEmpty.
There was a problem hiding this comment.
arguments cannot be null (we are using C# 8 nullable reference types), so we only need the emptiness check.
There was a problem hiding this comment.
Yes, let's keep it as it is :-)
The following environment variables are no longer supported: ``` ODASA_BUILD_ERROR_DIR ODASA_CSHARP_LAYOUT ODASA_SNAPSHOT SEMMLE_DIST SEMMLE_EXTRACTOR_OPTIONS SEMMLE_PLATFORM_TOOLS SEMMLE_PRESERVE_SYMLINKS SOURCE_ARCHIVE TRAP_FOLDER ```
|
Rebased to resolve merge conflict. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
The following environment variables are no longer supported: