Skip to content

Commit

Permalink
Update runtime to 10955. Fixes #124
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmelsayed committed May 5, 2017
1 parent 9113834 commit be89030
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 90 deletions.
8 changes: 6 additions & 2 deletions src/Azure.Functions.Cli/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
Expand Down Expand Up @@ -159,6 +159,10 @@
<assemblyIdentity name="Microsoft.AI.ServerTelemetryChannel" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.serviceModel>
Expand Down
59 changes: 32 additions & 27 deletions src/Azure.Functions.Cli/Azure.Functions.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -210,53 +210,56 @@
<HintPath>..\..\packages\Microsoft.Azure.NotificationHubs.1.0.7\lib\net45-full\Microsoft.Azure.NotificationHubs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.1-alpha1-10677\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.1-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
<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\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-beta3-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta4\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.13-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.14-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.1-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.0.0-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.0.0-beta1\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.1-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.1-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.1-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.1-alpha1-10433\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.1-alpha1-10677\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.0.1-alpha1-10677\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta1\lib\net45\Microsoft.Azure.WebJobs.Logging.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\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Script, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.1.0.0-beta2-10917\lib\net451\Microsoft.Azure.WebJobs.Script.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.1.0.0-beta3-10955\lib\net451\Microsoft.Azure.WebJobs.Script.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-beta2-10893\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
<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.Script.WebHost, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.WebHost.1.0.0-beta2-10917\lib\net451\Microsoft.Azure.WebJobs.Script.WebHost.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.WebHost.1.0.0-beta3-10955\lib\net451\Microsoft.Azure.WebJobs.Script.WebHost.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.1-alpha1-10677\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
<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\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.79-alpha\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
Expand Down Expand Up @@ -650,7 +653,9 @@
<Compile Include="TypeAttributePair.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="ApplicationInsights.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
33 changes: 17 additions & 16 deletions src/Azure.Functions.Cli/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,23 @@
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net461" />
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10677" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.1-alpha1-10677" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.13-beta" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10433" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging" version="2.0.1-alpha1-10677" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script" version="1.0.0-beta2-10917" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10893" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.WebHost" version="1.0.0-beta2-10917" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.1-alpha1-10677" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.14-beta" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script" version="1.0.0-beta3-10955" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta3-10955" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.WebHost" version="1.0.0-beta3-10955" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1" targetFramework="net461" />
<package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.79-alpha" targetFramework="net461" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
Expand Down
Loading

0 comments on commit be89030

Please sign in to comment.