Skip to content

Commit e3453f4

Browse files
mathewcmathewc
committed
Removing our custom NameResolver and fixing rand-guid
1 parent 22ed319 commit e3453f4

File tree

20 files changed

+135
-82
lines changed

20 files changed

+135
-82
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Extensibility</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10360" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10368" />
1818
</dependencies>
1919
</metadata>
2020
</package>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="Microsoft.Azure.WebJobs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
46+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
50+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎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.0.0-alpha-10360" targetFramework="net45" />
5-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-alpha-10360" targetFramework="net45" />
4+
<package id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10368" targetFramework="net45" />
5+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-alpha-10368" targetFramework="net45" />
66
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net452" />
77
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net452" />
88
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net452" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="Microsoft.Azure.WebJobs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
80+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -105,15 +105,15 @@
105105
<Private>True</Private>
106106
</Reference>
107107
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
108+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
109109
<Private>True</Private>
110110
</Reference>
111111
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
112112
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-alpha1-10307\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
113113
<Private>True</Private>
114114
</Reference>
115115
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
116+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
117117
<Private>True</Private>
118118
</Reference>
119119
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
<package id="Microsoft.Azure.Mobile.Client" version="2.0.1" targetFramework="net46" />
1111
<package id="Microsoft.Azure.NotificationHubs" version="1.0.5" targetFramework="net46" />
1212
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.1.5" targetFramework="net46" />
13-
<package id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10360" targetFramework="net46" />
14-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-alpha-10360" targetFramework="net46" />
13+
<package id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10368" targetFramework="net46" />
14+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-alpha-10368" targetFramework="net46" />
1515
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-alpha-10323" targetFramework="net46" />
1616
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-alpha-10323" targetFramework="net46" />
1717
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-alpha-10323" targetFramework="net46" />
1818
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-alpha-10323" targetFramework="net46" />
1919
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-alpha-10323" targetFramework="net46" />
2020
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-alpha-10323" targetFramework="net46" />
2121
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-alpha1-10307" targetFramework="net46" />
22-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-alpha-10360" targetFramework="net46" />
22+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-alpha-10368" targetFramework="net46" />
2323
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
2424
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
2525
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net46" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10360" />
18-
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-alpha-10360" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10368" />
18+
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-alpha-10368" />
1919
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-alpha-10323" />
2020
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-alpha-10323" />
2121
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-alpha-10323" />

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<Private>True</Private>
139139
</Reference>
140140
<Reference Include="Microsoft.Azure.WebJobs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
141+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
142142
<Private>True</Private>
143143
</Reference>
144144
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -166,19 +166,19 @@
166166
<Private>True</Private>
167167
</Reference>
168168
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
169-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
169+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
170170
<Private>True</Private>
171171
</Reference>
172172
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
173-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
173+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
174174
<Private>True</Private>
175175
</Reference>
176176
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
177177
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-alpha1-10307\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
178178
<Private>True</Private>
179179
</Reference>
180180
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
181-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0-alpha-10360\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
181+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0-alpha-10368\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
182182
<Private>True</Private>
183183
</Reference>
184184
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
<package id="Microsoft.Azure.Mobile.Client" version="2.0.1" targetFramework="net46" />
2929
<package id="Microsoft.Azure.NotificationHubs" version="1.0.5" targetFramework="net46" />
3030
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.1.5" targetFramework="net46" />
31-
<package id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10360" targetFramework="net46" />
32-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-alpha-10360" targetFramework="net46" />
31+
<package id="Microsoft.Azure.WebJobs" version="2.0.0-alpha-10368" targetFramework="net46" />
32+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-alpha-10368" targetFramework="net46" />
3333
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-alpha-10323" targetFramework="net46" />
3434
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-alpha-10323" targetFramework="net46" />
3535
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-alpha-10323" targetFramework="net46" />
3636
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-alpha-10323" targetFramework="net46" />
3737
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-alpha-10323" targetFramework="net46" />
3838
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-alpha-10323" targetFramework="net46" />
39-
<package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-alpha-10360" targetFramework="net46" />
39+
<package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-alpha-10368" targetFramework="net46" />
4040
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-alpha1-10307" targetFramework="net46" />
41-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-alpha-10360" targetFramework="net46" />
41+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-alpha-10368" targetFramework="net46" />
4242
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
4343
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
4444
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.1" targetFramework="net46" />

‎src/WebJobs.Script/Binding/ServiceBusScriptBindingProvider.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ public override void Initialize()
5454
{
5555
serviceBusConfig.MessageOptions.MaxConcurrentCalls = (int)value;
5656
}
57+
58+
if (configSection.TryGetValue("prefetchCount", StringComparison.OrdinalIgnoreCase, out value))
59+
{
60+
serviceBusConfig.PrefetchCount = (int)value;
61+
}
5762
}
5863

5964
Config.UseServiceBus(serviceBusConfig);

‎src/WebJobs.Script/Config/NameResolver.cs‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)