C#: Move ASP extraction from auto builder to pre-finalize.{sh,cmd}

csharp/tools/autobuild.cmd

@@ -1,7 +1,4 @@
 @echo off
 
-rem The autobuilder is already being traced
-set CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING=true
-
 type NUL && "%CODEQL_EXTRACTOR_CSHARP_ROOT%/tools/%CODEQL_PLATFORM%/Semmle.Autobuild.CSharp.exe"
 exit /b %ERRORLEVEL%

csharp/tools/autobuild.sh

@@ -7,8 +7,4 @@ if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; th
     exit 1
 fi
 
-# The autobuilder is already being traced
-CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING="true"
-export CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING
-
 "$CODEQL_EXTRACTOR_CSHARP_ROOT/tools/$CODEQL_PLATFORM/Semmle.Autobuild.CSharp" || exit $?

csharp/tools/pre-finalize.cmd

@@ -9,4 +9,7 @@ type NUL && "%CODEQL_DIST%\codeql" database index-files ^
     --language xml ^
     -- ^
     "%CODEQL_EXTRACTOR_CSHARP_WIP_DATABASE%"
+IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+type NUL && "%CODEQL_JAVA_HOME%\bin\java.exe" -jar "%CODEQL_EXTRACTOR_CSHARP_ROOT%\tools\extractor-asp.jar" .
 exit /b %ERRORLEVEL%

csharp/tools/pre-finalize.sh

@@ -10,4 +10,6 @@ set -eu
     --size-limit 10m \
     --language xml \
     -- \
-    "$CODEQL_EXTRACTOR_CSHARP_WIP_DATABASE"
+    "$CODEQL_EXTRACTOR_CSHARP_WIP_DATABASE"
+
+"$CODEQL_JAVA_HOME/bin/java" -jar "$CODEQL_EXTRACTOR_CSHARP_ROOT/tools/extractor-asp.jar" .