Merge dev into master

Author: fabiocav

.gitignore

@@ -14,4 +14,5 @@ Publish
 /TestResults
 
 /tools/NuGet.exe
-/node_modules
+/node_modules
+/.output

CustomDictionary.xml

@@ -82,6 +82,7 @@
       <Term CompoundAlternate="TableName">tableName</Term>
       <Term CompoundAlternate="ETag">etag</Term>
       <Term CompoundAlternate="ETag">eTag</Term>
+      <Term CompoundAlternate="Typescript">TypeScript</Term>
     </Compound>
     <DiscreteExceptions>
 		<Term>WebJobs</Term>

WebJobs.Script.sln

@@ -1,8 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 15 (VS2017)
+VisualStudioVersion = 15.1.26403.7
+MinimumVisualStudioVersion = 15.0.0.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Script", "src\WebJobs.Script\WebJobs.Script.csproj", "{1DC670CD-F42F-4D8F-97BD-0E1AA8221094}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}"
@@ -442,6 +442,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "swagger", "swagger", "{DCC9
 		sample\.azurefunctions\swagger\swagger.json = sample\.azurefunctions\swagger\swagger.json
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpTrigger-TypeScript", "HttpTrigger-TypeScript", "{62489417-341D-42AD-9E84-E97EB8236979}"
+	ProjectSection(SolutionItems) = preProject
+		sample\HttpTrigger-TypeScript\function.json = sample\HttpTrigger-TypeScript\function.json
+		sample\HttpTrigger-TypeScript\index.ts = sample\HttpTrigger-TypeScript\index.ts
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{35a2025d-f68a-4b57-83a2-ed4eb9c3894d}*SharedItemsImports = 4
@@ -566,5 +572,6 @@ Global
 		{EB76E1C8-C823-4707-BD83-20304425EFC4} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 		{7D50E081-A161-4E83-A6D4-F8529E518613} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 		{DCC9EBEB-5F60-4117-95D2-26507F9DE9A6} = {7D50E081-A161-4E83-A6D4-F8529E518613}
+		{62489417-341D-42AD-9E84-E97EB8236979} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 	EndGlobalSection
 EndGlobal

sample/HttpTrigger-TypeScript/function.json

@@ -0,0 +1,15 @@
+{
+    "bindings": [
+        {
+            "type": "httpTrigger",
+            "name": "req",
+            "direction": "in",
+            "methods": [ "get" ]
+        },
+        {
+            "type": "http",
+            "name": "$return",
+            "direction": "out"
+        }
+    ]
+}

sample/HttpTrigger-TypeScript/index.ts

@@ -0,0 +1,29 @@
+export function index(context: any, req: any) {
+    context.log('Node.js HTTP trigger function processed a request. Name=%s', req.query.name);
+    var headerValue = req.headers['test-header'];
+    if (headerValue) {
+        context.log('test-header=' + headerValue);
+    }
+
+    var res;
+    if (typeof req.query.name == 'undefined') {
+        res = {
+            status: 400,
+            body: "Please pass a name on the query string",
+            headers: {
+                'Content-Type': 'text/plain'
+            }
+        };
+    }
+    else {
+        res = {
+            status: 200,
+            body: "Hello" + req.query.name,
+            headers: {
+                'Content-Type': 'text/plain'
+            }
+        };
+    }
+
+    context.done(null, res);
+}

schemas/json/function.json

@@ -3,13 +3,29 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "properties": {
+    "disabled": {
+      "type": "boolean",
+      "description": "If set to true, marks the function as disabled (it cannot be triggered)."
+    },
+    "excluded": {
+      "type": "boolean",
+      "description": "If set to true, the function will not be loaded, compiled, or triggered."
+    },
+    "scriptFile": {
+      "type": "string",
+      "description": "Optional path to function script file."
+    },
+    "entryPoint": {
+      "type": "string",
+      "description": "Optional named entry point."
+    },
     "bindings": {
       "type": "array",
       "description": "A list of function bindings.",
       "items": {
         "oneOf": [
           { "$ref": "#/definitions/dynamicBinding" },
-          { 
+          {
             "oneOf": [
               { "$ref": "#/definitions/serviceBusBinding" },
               { "$ref": "#/definitions/blobBinding" },
@@ -30,22 +46,6 @@
         "allOf": [
           { "$ref": "#/definitions/bindingBase" }
         ]
-      },
-      "disabled": {
-        "type": "boolean",
-        "description": "If set to true, marks the function as disabled (it cannot be triggered)."
-      },
-      "excluded": {
-        "type": "boolean",
-        "description": "If set to true, the function will not be loaded, compiled, or triggered."
-      },
-      "scriptFile": {
-        "type": "string",
-        "description": "Optional path to function script file."
-      },
-      "entryPoint": {
-        "type": "string",
-        "description": "Optional named entry point."
       }
     }
   },

src/Common/CommonAssemblyInfo.cs

@@ -10,7 +10,6 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
 
 [assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
 
 [assembly: AssemblyVersion("1.0.0.0")]
 

src/Packages/Packages.csproj

@@ -6,7 +6,8 @@
     <SkipCopyBuildProduct>true</SkipCopyBuildProduct>
     <ProjectGuid>{34AB8F63-18DE-4E0D-B21C-15E33B091634}</ProjectGuid>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>d7fae0d2</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -70,7 +71,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/Packages/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
   <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net46" developmentDependency="true" />
 </packages>

src/WebJobs.Script.Extensibility.NuGet/WebJobs.Script.Extensibility.nuspec

@@ -14,7 +14,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>Microsoft Azure WebJobs Jobs Script Extensibility</tags>
     <dependencies>
-      <dependency id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10547" />
+      <dependency id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10677" />
     </dependencies>
   </metadata>
 </package>