Rename csharpscript and align host.json (#824)

* Rename csharpscript and align host.json

* Default Trace

* Add back csx extension bundle

builds/azure-pipelines/template-steps-build-test.yml

@@ -198,7 +198,7 @@ steps:
     TEST_SERVER: '$(testServer)'
     NODE_MODULES_PATH: '$(nodeModulesPath)'
     AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
-    LANGUAGES_TO_TEST: 'Java,JavaScript,OutOfProc,PowerShell,Python,CSharpscript'
+    LANGUAGES_TO_TEST: 'Java,JavaScript,OutOfProc,PowerShell,Python,Csx'
   inputs:
     command: test
     projects: '${{ parameters.solution }}'

docs/SetupGuide_DotnetCSharpScript.md

@@ -130,19 +130,19 @@ The database scripts used for the following samples can be found [here](https://
 
 #### Query String
 
-See the [GetProducts](https://github.com/Azure/azure-functions-sql-extension/blob/main/samples/samples-csharpscript/InputBindingSamples/GetProducts) sample
+See the [GetProducts](https://github.com/Azure/azure-functions-sql-extension/blob/main/samples/samples-csx/InputBindingSamples/GetProducts) sample
 
 #### Empty Parameter Value
 
-See the [GetProductsNameEmpty](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csharpscript/InputBindingSamples/GetProductsNameEmpty) sample
+See the [GetProductsNameEmpty](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty) sample
 
 #### Null Parameter Value
 
-See the [GetProductsNameNull](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csharpscript/InputBindingSamples/GetProductsNameNull) sample
+See the [GetProductsNameNull](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csx/InputBindingSamples/GetProductsNameNull) sample
 
 #### Stored Procedure
 
-See the [GetProductsStoredProcedure](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedure) sample
+See the [GetProductsStoredProcedure](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure) sample
 
 ## Output Binding
 
@@ -218,12 +218,12 @@ Note: This tutorial requires that a SQL database is setup as shown in [Create a
 
 #### Array
 
-See the [AddProductsArray](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray) sample
+See the [AddProductsArray](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csx/OutputBindingSamples/AddProductsArray) sample
 
 #### Single Row
 
-See the [AddProduct](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csharpscript/OutputBindingSamples/AddProduct) sample
+See the [AddProduct](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csx/OutputBindingSamples/AddProduct) sample
 
 ### Sample with multiple Bindings
 
-See the [GetAndAddProducts](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts) sample
+See the [GetAndAddProducts](https://github.com/Azure/azure-functions-sql-extension/tree/main/samples/samples-csx/InputBindingSamples/GetAndAddProducts) sample

samples/samples-csharp/host.json

@@ -1,14 +1,14 @@
 {
-    "version": "2.0",
-    "logging": {
-        "applicationInsights": {
-            "samplingExcludedTypes": "Request",
-            "samplingSettings": {
-                "isEnabled": true
-            }
-        },
-        "logLevel": {
-          "default": "Information"
-        }
+  "version": "2.0",
+  "logging": {
+    "applicationInsights": {
+      "samplingSettings": {
+        "isEnabled": true,
+        "excludedTypes": "Request"
+      }
+    },
+    "logLevel": {
+      "default": "Trace"
     }
-}
+  }
+}

samples/samples-csharpscript/InputBindingSamples/host.json → samples/samples-csx/InputBindingSamples/host.json

@@ -6,10 +6,13 @@
         "isEnabled": true,
         "excludedTypes": "Request"
       }
+    },
+    "logLevel": {
+      "default": "Trace"
     }
   },
   "extensionBundle": {
    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
       "version": "[4.*, 5.0.0)"
   }
-}
+}

samples/samples-csharpscript/OutputBindingSamples/host.json → samples/samples-csx/OutputBindingSamples/host.json

@@ -6,10 +6,13 @@
         "isEnabled": true,
         "excludedTypes": "Request"
       }
+    },
+    "logLevel": {
+      "default": "Trace"
     }
   },
   "extensionBundle": {
    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
       "version": "[4.*, 5.0.0)"
   }
-}
+}

samples/samples-java/host.json

@@ -1,8 +1,14 @@
 {
   "version": "2.0",
   "logging": {
+    "applicationInsights": {
+      "samplingSettings": {
+        "isEnabled": true,
+        "excludedTypes": "Request"
+      }
+    },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   },
   "extensionBundle": {

samples/samples-js/host.json

@@ -8,7 +8,7 @@
       }
     },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   },
   "extensionBundle": {

samples/samples-outofproc/host.json

@@ -8,7 +8,7 @@
       }
     },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   }
-}
+}

samples/samples-powershell/host.json

@@ -8,7 +8,7 @@
       }
     },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   },
   "extensionBundle": {

samples/samples-python-v2/host.json

@@ -6,10 +6,13 @@
         "isEnabled": true,
         "excludedTypes": "Request"
       }
+    },
+    "logLevel": {
+      "default": "Trace"
     }
   },
   "extensionBundle": {
     "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
-    "version": "[4.0.0, 5.0.0)"
+    "version": "[4.*, 5.0.0)"
   }
-}
+}

samples/samples-python/host.json

@@ -8,11 +8,11 @@
       }
     },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   },
   "extensionBundle": {
     "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
     "version": "[4.*, 5.0.0)"
   }
-}
+}

test-outofproc/host.json

@@ -8,7 +8,7 @@
       }
     },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   }
 }

test/Common/SupportedLanguagesTestAttribute.cs

@@ -78,7 +78,7 @@ public UnsupportedLanguagesAttribute(params SupportedLanguages[] argsWithUnsuppo
     public enum SupportedLanguages
     {
         CSharp,
-        CSharpscript,
+        Csx,
         JavaScript,
         PowerShell,
         Java,

test/Integration/SqlOutputBindingIntegrationTests.cs

@@ -481,7 +481,7 @@ public void AddProductWithDifferentPropertiesTest(SupportedLanguages lang)
         // Only the JavaScript function passes an empty JSON to the SQL extension.
         // C#, Java, and Python throw an error while creating the Product object in the function and in PowerShell,
         // the JSON would be passed as {"ProductId": null, "Name": null, "Cost": null}.
-        [UnsupportedLanguages(SupportedLanguages.CSharp, SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.PowerShell, SupportedLanguages.Python, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharp, SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.PowerShell, SupportedLanguages.Python, SupportedLanguages.Csx)]
         public async Task NoPropertiesThrows(SupportedLanguages lang)
         {
             var foundExpectedMessageSource = new TaskCompletionSource<bool>();

test/Integration/test-csx/host.json

@@ -6,10 +6,13 @@
         "isEnabled": true,
         "excludedTypes": "Request"
       }
+    },
+    "logLevel": {
+      "default": "Trace"
     }
   },
   "extensionBundle": {
-   "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
-      "version": "[4.*, 5.0.0)"
+    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "version": "[4.*, 5.0.0)"
   }
-}
+}

test/Integration/test-java/host.json

@@ -8,7 +8,7 @@
       }
     },
     "logLevel": {
-      "default": "Information"
+      "default": "Trace"
     }
   },
   "extensionBundle": {

test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj

@@ -67,15 +67,15 @@
     <Copy SourceFiles="@(_PythonCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Python\%(RecursiveDir)" />
     <Message Text="Copied Python Samples output to $(OutDir)\SqlExtensionSamples\Python" Importance="high" />
     <ItemGroup>
-      <_CSharpScriptCopyItems Include="..\samples\samples-csharpscript\InputBindingSamples\**\*.*" />
-      <_CSharpScriptCopyItems Include="..\samples\samples-csharpscript\OutputBindingSamples\**\*.*" />
-      <_CSharpScriptCopyItems Include="Integration\test-csx\**\*.*" />
+      <_CsxCopyItems Include="..\samples\samples-csx\InputBindingSamples\**\*.*" />
+      <_CsxCopyItems Include="..\samples\samples-csx\OutputBindingSamples\**\*.*" />
+      <_CsxCopyItems Include="Integration\test-csx\**\*.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_CSharpScriptCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\CSharpscript\%(RecursiveDir)" />
+    <Copy SourceFiles="@(_CsxCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Csx\%(RecursiveDir)" />
     <ItemGroup>
-      <_CommonCopyItems Include="..\samples\samples-csharpscript\Common\**\*.*" />
+      <_CommonCopyItems Include="..\samples\samples-csx\Common\**\*.*" />
     </ItemGroup>
     <Copy SourceFiles="@(_CommonCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Common\%(RecursiveDir)" />
-    <Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\CSharpscript" Importance="high" />
+    <Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\Csx" Importance="high" />
   </Target>
 </Project>