Skip to content

Commit 2ef27b7

Browse files
MikeStallMikeStall
authored
Decouple Script from Storage (#1615)
1 parent 4bc5a86 commit 2ef27b7

23 files changed

+483
-565
lines changed

‎src/WebJobs.Script.Extensibility/WebJobs.Script.Extensibility.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
46+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
49+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.1\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎src/WebJobs.Script.Extensibility/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" />
4-
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10811" targetFramework="net46" />
5-
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10811" targetFramework="net46" />
4+
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10851" targetFramework="net46" />
5+
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10851" targetFramework="net46" />
66
<package id="Microsoft.Data.Edm" version="5.8.1" targetFramework="net45" />
77
<package id="Microsoft.Data.OData" version="5.8.1" targetFramework="net45" />
88
<package id="Microsoft.Data.Services.Client" version="5.8.1" targetFramework="net45" />

‎src/WebJobs.Script.Host/WebJobs.Script.Host.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,43 +104,43 @@
104104
<Private>True</Private>
105105
</Reference>
106106
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
107+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
113-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
113+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
114114
</Reference>
115115
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
116116
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
117117
</Reference>
118118
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
119-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
119+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
120120
</Reference>
121121
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
122-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
122+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
123123
</Reference>
124124
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
125-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
125+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
126126
</Reference>
127127
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
128-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
128+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
129129
</Reference>
130130
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
131-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta1-10450\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
131+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta1-10452\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
132132
</Reference>
133133
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
134+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
135135
</Reference>
136136
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
137+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
138138
</Reference>
139139
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
140140
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta3-10955\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
141141
</Reference>
142142
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
143-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10811\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
143+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10851\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
144144
</Reference>
145145
<Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146146
<HintPath>..\..\packages\Microsoft.Bot.Connector.DirectLine.3.0.0-beta\lib\net45\Microsoft.Bot.Connector.DirectLine.dll</HintPath>

‎src/WebJobs.Script.Host/packages.config‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net46" />
1717
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net46" />
1818
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net46" />
19-
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10811" targetFramework="net46" />
20-
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10811" targetFramework="net46" />
21-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10450" targetFramework="net46" />
22-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10450" targetFramework="net46" />
19+
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10851" targetFramework="net46" />
20+
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10851" targetFramework="net46" />
21+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10452" targetFramework="net46" />
22+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10452" targetFramework="net46" />
2323
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net46" />
24-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10450" targetFramework="net46" />
25-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10450" targetFramework="net46" />
26-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10450" targetFramework="net46" />
27-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10450" targetFramework="net46" />
28-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10450" targetFramework="net46" />
29-
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10811" targetFramework="net46" />
24+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10452" targetFramework="net46" />
25+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10452" targetFramework="net46" />
26+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10452" targetFramework="net46" />
27+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10452" targetFramework="net46" />
28+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10452" targetFramework="net46" />
29+
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10851" targetFramework="net46" />
3030
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta3-10955" targetFramework="net46" />
31-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10811" targetFramework="net46" />
31+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10851" targetFramework="net46" />
3232
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
3333
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
3434
<package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net46" />

‎src/WebJobs.Script.NuGet/WebJobs.Script.nuspec‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<package>
3-
<metadata>
4-
<id>$NuGetPackageId$</id>
5-
<title>Microsoft.Azure.WebJobs.Script</title>
6-
<version>$NuGetPackageVersion$</version>
7-
<authors>Microsoft</authors>
8-
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
9-
<summary>Microsoft.Azure.WebJobs.Script enables a multi-language scripting model for the WebJobs SDK.</summary>
10-
<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>
11-
<language>en-US</language>
12-
<projectUrl>https://azure.microsoft.com/en-us/documentation/articles/websites-webjobs-resources</projectUrl>
13-
<licenseUrl>$PackageEULA$</licenseUrl>
14-
<requireLicenseAcceptance>true</requireLicenseAcceptance>
15-
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
16-
<dependencies>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package>
3+
<metadata>
4+
<id>$NuGetPackageId$</id>
5+
<title>Microsoft.Azure.WebJobs.Script</title>
6+
<version>$NuGetPackageVersion$</version>
7+
<authors>Microsoft</authors>
8+
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
9+
<summary>Microsoft.Azure.WebJobs.Script enables a multi-language scripting model for the WebJobs SDK.</summary>
10+
<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>
11+
<language>en-US</language>
12+
<projectUrl>https://azure.microsoft.com/en-us/documentation/articles/websites-webjobs-resources</projectUrl>
13+
<licenseUrl>$PackageEULA$</licenseUrl>
14+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
15+
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
16+
<dependencies>
1717
<dependency id="Edge.js" version="6.5.1" />
1818
<dependency id="FSharp.Compiler.Service" version="9.0.1" />
1919
<dependency id="FSharp.Core" version="4.0.0.1" />
20+
<dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10851" />
2021
<dependency id="Microsoft.ApplicationInsights.WindowsServer" version="2.3.0" />
2122
<dependency id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" />
22-
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10450" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10452" />
2324
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" />
24-
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10450" />
25-
<dependency id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1-10450" />
26-
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10450" />
27-
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10450" />
28-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10450" />
29-
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10450" />
30-
<dependency id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta3-10955" />
25+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10452" />
26+
<dependency id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1-10452" />
27+
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10452" />
28+
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10452" />
29+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10452" />
30+
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10452" />
3131
<dependency id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" />
3232
<dependency id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" />
3333
<dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.0.0" />
@@ -46,7 +46,7 @@
4646
<dependency id="System.Threading.Thread" version="4.3.0" />
4747
<dependency id="System.ValueTuple" version="4.3.0" />
4848
<dependency id="System.Xml.XmlDocument" version="4.3.0" />
49-
<dependency id="System.Xml.XPath.XDocument" version="4.3.0" />
50-
</dependencies>
51-
</metadata>
52-
</package>
49+
<dependency id="System.Xml.XPath.XDocument" version="4.3.0" />
50+
</dependencies>
51+
</metadata>
52+
</package>

0 commit comments

Comments
 (0)