Revert "C#: Temporary changes to model generator"

This reverts commit 0f6cea6bd6ecd61139dc09e7b68bf0b8ebc009fe.

Author: hvitved

csharp/ql/src/utils/modelconverter/ExtractNeutrals.ql

@@ -10,6 +10,6 @@ import semmle.code.csharp.dataflow.ExternalFlow
 from string package, string type, string name, string signature, string kind, string provenance
 where
   neutralModel(package, type, name, signature, kind, provenance) and
-  provenance.matches("%generated")
+  not provenance.matches("%generated")
 select package, type, name, signature, kind, provenance order by
     package, type, name, signature, kind

csharp/ql/src/utils/modelconverter/ExtractSinks.ql

@@ -12,6 +12,6 @@ from
   string input, string kind, string provenance
 where
   sinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance) and
-  provenance.matches("%generated")
+  not provenance.matches("%generated")
 select namespace, type, subtypes, name, signature, ext, input, kind, provenance order by
     namespace, type, name, signature, input, kind

csharp/ql/src/utils/modelconverter/ExtractSources.ql

@@ -12,6 +12,6 @@ from
   string output, string kind, string provenance
 where
   sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance) and
-  provenance.matches("%generated")
+  not provenance.matches("%generated")
 select namespace, type, subtypes, name, signature, ext, output, kind, provenance order by
     namespace, type, name, signature, output, kind

csharp/ql/src/utils/modelconverter/ExtractSummaries.ql

@@ -12,6 +12,6 @@ from
   string input, string output, string kind, string provenance
 where
   summaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind, provenance) and
-  provenance.matches("%generated")
+  not provenance.matches("%generated")
 select namespace, type, subtypes, name, signature, ext, input, output, kind, provenance order by
     namespace, type, name, signature, input, output, kind

misc/scripts/models-as-data/convert_extensions.py

@@ -86,7 +86,7 @@ def save(self, extensions):
         extensionTemplate = """extensions:
 {0}"""
         for entry in extensions:
-            with open(self.extDir + "/generated/" + entry + self.modelFileExtension, "w") as f:
+            with open(self.extDir + "/" + entry + self.modelFileExtension, "w") as f:
                 f.write(extensionTemplate.format(extensions[entry]))
 
     def run(self):