Decouple Script from Storage (Azure#1615)

Peidyen · Jul 13, 2017 · 2ef27b7 · 2ef27b7
1 parent 4bc5a86
commit 2ef27b7
Show file tree

Hide file tree

Showing 23 changed files with 483 additions and 565 deletions.
diff --git a/src/WebJobs.Script.Extensibility/WebJobs.Script.Extensibility.csproj b/src/WebJobs.Script.Extensibility/WebJobs.Script.Extensibility.csproj
@@ -43,10 +43,10 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Data.Edm.5.8.1\lib\net40\Microsoft.Data.Edm.dll</HintPath>

diff --git a/src/WebJobs.Script.Extensibility/packages.config b/src/WebJobs.Script.Extensibility/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" />
-  <package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10811" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10811" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10851" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10851" targetFramework="net46" />
   <package id="Microsoft.Data.Edm" version="5.8.1" targetFramework="net45" />
   <package id="Microsoft.Data.OData" version="5.8.1" targetFramework="net45" />
   <package id="Microsoft.Data.Services.Client" version="5.8.1" targetFramework="net45" />

diff --git a/src/WebJobs.Script.Host/WebJobs.Script.Host.csproj b/src/WebJobs.Script.Host/WebJobs.Script.Host.csproj
@@ -104,43 +104,43 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta3-10955\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Bot.Connector.DirectLine.3.0.0-beta\lib\net45\Microsoft.Bot.Connector.DirectLine.dll</HintPath>

diff --git a/src/WebJobs.Script.Host/packages.config b/src/WebJobs.Script.Host/packages.config
@@ -16,19 +16,19 @@
   <package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net46" />
   <package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10811" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10811" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10450" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10450" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10851" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10851" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10452" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10452" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10450" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10450" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10450" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10450" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10450" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10811" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10452" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10452" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10452" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10452" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10452" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10851" targetFramework="net46" />
   <package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta3-10955" targetFramework="net46" />
-  <package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10811" targetFramework="net46" />
+  <package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10851" targetFramework="net46" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
   <package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net46" />

diff --git a/src/WebJobs.Script.NuGet/WebJobs.Script.nuspec b/src/WebJobs.Script.NuGet/WebJobs.Script.nuspec
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package>
-  <metadata>
-    <id>$NuGetPackageId$</id>
-    <title>Microsoft.Azure.WebJobs.Script</title>
-    <version>$NuGetPackageVersion$</version>
-    <authors>Microsoft</authors>
-    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-    <summary>Microsoft.Azure.WebJobs.Script enables a multi-language scripting model for the WebJobs SDK.</summary>
-    <description>This package contains the runtime assemblies for Microsoft.Azure.WebJobs.Script. For more information, please visit http://github.com/Azure/azure-webjobs-sdk-script</description>
-    <language>en-US</language>
-    <projectUrl>https://azure.microsoft.com/en-us/documentation/articles/websites-webjobs-resources</projectUrl>
-    <licenseUrl>$PackageEULA$</licenseUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
-    <dependencies>
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>$NuGetPackageId$</id>
+    <title>Microsoft.Azure.WebJobs.Script</title>
+    <version>$NuGetPackageVersion$</version>
+    <authors>Microsoft</authors>
+    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
+    <summary>Microsoft.Azure.WebJobs.Script enables a multi-language scripting model for the WebJobs SDK.</summary>
+    <description>This package contains the runtime assemblies for Microsoft.Azure.WebJobs.Script. For more information, please visit http://github.com/Azure/azure-webjobs-sdk-script</description>
+    <language>en-US</language>
+    <projectUrl>https://azure.microsoft.com/en-us/documentation/articles/websites-webjobs-resources</projectUrl>
+    <licenseUrl>$PackageEULA$</licenseUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
+    <dependencies>
       <dependency id="Edge.js" version="6.5.1" />
       <dependency id="FSharp.Compiler.Service" version="9.0.1" />
       <dependency id="FSharp.Core" version="4.0.0.1" />
+      <dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10851" />
       <dependency id="Microsoft.ApplicationInsights.WindowsServer" version="2.3.0" />
       <dependency id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10450" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10452" />
       <dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10450" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1-10450" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10450" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10450" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10450" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10450" />
-      <dependency id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta3-10955" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10452" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1-10452" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10452" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10452" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10452" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10452" />
       <dependency id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" />
       <dependency id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" />
       <dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.0.0" />
@@ -46,7 +46,7 @@
       <dependency id="System.Threading.Thread" version="4.3.0" />
       <dependency id="System.ValueTuple" version="4.3.0" />
       <dependency id="System.Xml.XmlDocument" version="4.3.0" />
-      <dependency id="System.Xml.XPath.XDocument" version="4.3.0" />
-    </dependencies>
-  </metadata>
-</package>
+      <dependency id="System.Xml.XPath.XDocument" version="4.3.0" />
+    </dependencies>
+  </metadata>
+</package>