Skip to content

Commit bd63b0b

Browse files
MikeStallMikeStall
committed
Move Bot onto the new BYOB pipeline.
This pulls in a simplified Bot extension that no longer depends on Script.Extensibility nuget. That was the last public dependency, so remove Script.Extensibility nuget package (keep the actual project, which we still need internally) Update Nuget for Bot and SDK. SDK has a breaking change for Bot, so we need a new Bot nuget too. Pulls in a SDK that lets us remove an internal hack from Bot. (#76)
1 parent 5d65c06 commit bd63b0b

File tree

18 files changed

+69
-132
lines changed

18 files changed

+69
-132
lines changed

‎WebJobs.Script.proj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<PublishType>File</PublishType>
3030
<PublishPath>$(PublishPath)\Packages</PublishPath>
3131
</Build>
32-
<Build Include="src\WebJobs.Script.Extensibility.NuGet\WebJobs.Script.Extensibility.nuproj">
33-
<PublishType>File</PublishType>
34-
<PublishPath>$(PublishPath)\Packages</PublishPath>
35-
</Build>
3632
<Build Include="src\WebJobs.Script.WebHost.NuGet\WebJobs.Script.WebHost.nuproj">
3733
<PublishType>File</PublishType>
3834
<PublishPath>$(PublishPath)\Packages</PublishPath>

‎src/Packages/Packages.csproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@
2626
<Link>WebJobs.Script\WebJobs.Script.nuspec</Link>
2727
</NuGetSpec>
2828
</ItemGroup>
29-
<ItemGroup>
30-
<NuGetProject Include="..\WebJobs.Script.Extensibility.NuGet\WebJobs.Script.Extensibility.nuproj">
31-
<Link>WebJobs.Script.Extensibility\WebJobs.Script.Extensibility.nuproj</Link>
32-
</NuGetProject>
33-
</ItemGroup>
34-
<ItemGroup>
35-
<NuGetSpec Include="..\WebJobs.Script.Extensibility.NuGet\WebJobs.Script.Extensibility.nuspec">
36-
<Link>WebJobs.Script.Extensibility\WebJobs.Script.Extensibility.nuspec</Link>
37-
</NuGetSpec>
38-
</ItemGroup>
3929
<ItemGroup>
4030
<NuGetProject Include="..\WebJobs.Script.WebHost.NuGet\WebJobs.Script.WebHost.nuproj">
4131
<Link>WebJobs.Script.WebHost\WebJobs.Script.WebHost.nuproj</Link>

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

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

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

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

‎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-10761\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
46+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10762\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-10761\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
49+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10762\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-10761" targetFramework="net46" />
5-
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10761" targetFramework="net46" />
4+
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10762" targetFramework="net46" />
5+
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10762" 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
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-10761\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
107+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10762\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">
110110
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta1-10445\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
@@ -113,7 +113,7 @@
113113
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4-10445\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">
116-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.14-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
116+
<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">
119119
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta1-10445\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
@@ -131,16 +131,16 @@
131131
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta1-10445\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-10761\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
134+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10762\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-10761\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
137+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10762\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-10761\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
143+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10762\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: 5 additions & 5 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-10761" targetFramework="net46" />
20-
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10761" targetFramework="net46" />
19+
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10762" targetFramework="net46" />
20+
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10762" targetFramework="net46" />
2121
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10445" targetFramework="net46" />
2222
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10445" targetFramework="net46" />
23-
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.14-beta" targetFramework="net46" />
23+
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net46" />
2424
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10445" targetFramework="net46" />
2525
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10445" targetFramework="net46" />
2626
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10445" targetFramework="net46" />
2727
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10445" targetFramework="net46" />
2828
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10445" targetFramework="net46" />
29-
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10761" targetFramework="net46" />
29+
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10762" 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-10761" targetFramework="net46" />
31+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10762" 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10761" />
18-
<dependency id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10761" />
19-
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10761" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10762" />
18+
<dependency id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10762" />
19+
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10762" />
2020
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10445" />
2121
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10445" />
2222
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10445" />
23-
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.14-beta" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" />
2424
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10445" />
2525
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10445" />
2626
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10445" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<Private>True</Private>
185185
</Reference>
186186
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
187-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10761\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
187+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta1-10762\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
188188
</Reference>
189189
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
190190
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta1-10445\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
@@ -193,7 +193,7 @@
193193
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4-10445\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
194194
</Reference>
195195
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
196-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.14-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
196+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
197197
</Reference>
198198
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
199199
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta1-10445\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
@@ -214,19 +214,19 @@
214214
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta1-10445\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
215215
</Reference>
216216
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
217-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10761\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
217+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta1-10762\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
218218
</Reference>
219219
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
220-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta1-10761\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
220+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta1-10762\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
221221
</Reference>
222222
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
223-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10761\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
223+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta1-10762\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
224224
</Reference>
225225
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
226226
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta3-10955\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
227227
</Reference>
228228
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
229-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10761\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
229+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta1-10762\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
230230
</Reference>
231231
<Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
232232
<HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.79-alpha\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>

0 commit comments

Comments
 (0)