Skip to content

Commit 9c09e69

Browse files
fabiocavfabiocav
committed
Updating FSharp.Core packages
1 parent ff8ac4c commit 9c09e69

File tree

13 files changed

+35
-35
lines changed

13 files changed

+35
-35
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependentAssembly>
2929
<dependentAssembly>
3030
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -104,7 +104,7 @@
104104
</dependentAssembly>
105105
<dependentAssembly>
106106
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
107-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
107+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.0.0.0" />
108108
</dependentAssembly>
109109
<dependentAssembly>
110110
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
<None Include="packages.config">
5656
<SubType>Designer</SubType>
5757
</None>
58-
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata">
58+
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.sigdata">
5959
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6060
</Content>
61-
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata">
61+
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.optdata">
6262
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6363
</Content>
6464
</ItemGroup>
@@ -247,9 +247,8 @@
247247
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
248248
</Reference>
249249
<Reference Include="System.Net" />
250-
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
251-
<HintPath>..\..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
252-
<Private>True</Private>
250+
<Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
251+
<HintPath>..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
253252
</Reference>
254253
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
255254
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -336,16 +335,18 @@
336335
</PropertyGroup>
337336
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
338337
<Error Condition="!Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\build\Microsoft.Azure.DocumentDB.targets'))" />
338+
<Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets'))" />
339339
</Target>
340340
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
341341
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
342342
Other similar extension points exist, see Microsoft.Common.targets.-->
343343
<Target Name="BeforeBuild">
344344
</Target>
345345
<Target Name="AfterBuild">
346-
<Copy SourceFiles="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" />
347-
<Copy SourceFiles="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" />
346+
<Copy SourceFiles="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" />
347+
<Copy SourceFiles="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" />
348348
</Target>
349349
<Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\build\Microsoft.Azure.DocumentDB.targets')" />
350-
<Import Project="..\..\tools\Clean.targets"/>
350+
<Import Project="..\..\tools\Clean.targets" />
351+
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
351352
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
4747
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" targetFramework="net46" />
4848
<package id="ncrontab" version="3.3.0" targetFramework="net46" />
49-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
49+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net46" />
5050
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
5151
<package id="RestSharp" version="105.2.3" targetFramework="net46" />
5252
<package id="Sendgrid" version="8.0.5" targetFramework="net46" />
@@ -71,7 +71,7 @@
7171
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
7272
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
7373
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
74-
<package id="System.Net.Http" version="4.3.0" targetFramework="net46" />
74+
<package id="System.Net.Http" version="4.3.2" targetFramework="net46" />
7575
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net46" />
7676
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />
7777
<package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<dependency id="Edge.js" version="6.11.3" />
1818
<dependency id="FSharp.Compiler.Service" version="9.0.1" />
19-
<dependency id="FSharp.Core" version="4.0.0.1" />
19+
<dependency id="FSharp.Core" version="4.2.3" />
2020
<dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-11013" />
2121
<dependency id="Microsoft.ApplicationInsights.WindowsServer" version="2.4.1" />
2222
<dependency id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</dependentAssembly>
8989
<dependentAssembly>
9090
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
91-
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
91+
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
9292
</dependentAssembly>
9393
<dependentAssembly>
9494
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,10 @@
586586
<None Include="Web.Release.config">
587587
<DependentUpon>Web.config</DependentUpon>
588588
</None>
589-
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata">
589+
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.sigdata">
590590
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
591591
</Content>
592-
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata">
592+
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.optdata">
593593
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
594594
</Content>
595595
</ItemGroup>

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,12 @@
4949
<ItemGroup>
5050
<Reference Include="FSharp.Compiler.Service, Version=9.0.1.0, Culture=neutral, processorArchitecture=MSIL">
5151
<HintPath>..\..\packages\FSharp.Compiler.Service.9.0.1\lib\net45\FSharp.Compiler.Service.dll</HintPath>
52-
<Private>True</Private>
5352
</Reference>
5453
<Reference Include="FSharp.Compiler.Service.MSBuild.v12, Version=9.0.1.0, Culture=neutral, processorArchitecture=MSIL">
5554
<HintPath>..\..\packages\FSharp.Compiler.Service.9.0.1\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
56-
<Private>True</Private>
5755
</Reference>
58-
<Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
56+
<Reference Include="FSharp.Core">
57+
<HintPath>..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
6058
<Private>True</Private>
6159
</Reference>
6260
<Reference Include="Microsoft.AI.Agent.Intercept, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -277,9 +275,8 @@
277275
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
278276
</Reference>
279277
<Reference Include="System.Net" />
280-
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
281-
<HintPath>..\..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
282-
<Private>True</Private>
278+
<Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
279+
<HintPath>..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
283280
</Reference>
284281
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
285282
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -644,6 +641,7 @@
644641
</PropertyGroup>
645642
<Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.50.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.50.0\build\StyleCop.MSBuild.Targets'))" />
646643
<Error Condition="!Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\build\Microsoft.Azure.DocumentDB.targets'))" />
644+
<Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets'))" />
647645
</Target>
648646
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
649647
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -661,4 +659,5 @@
661659
</Target>
662660
-->
663661
<Import Project="..\..\tools\Clean.targets" />
662+
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
664663
</Project>

‎src/WebJobs.Script/app.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependentAssembly>
2929
<dependentAssembly>
3030
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -100,7 +100,7 @@
100100
</dependentAssembly>
101101
<dependentAssembly>
102102
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
103-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
103+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.0.0.0" />
104104
</dependentAssembly>
105105
<dependentAssembly>
106106
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎src/WebJobs.Script/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Edge.js" version="6.11.3" targetFramework="net46" />
44
<package id="FSharp.Compiler.Service" version="9.0.1" targetFramework="net46" />
5-
<package id="FSharp.Core" version="4.0.0.1" targetFramework="net46" />
5+
<package id="FSharp.Core" version="4.2.3" targetFramework="net46" />
66
<package id="Microsoft.ApplicationInsights" version="2.4.0" targetFramework="net46" />
77
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.4.0" targetFramework="net46" />
88
<package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.4.1" targetFramework="net46" />
@@ -54,7 +54,7 @@
5454
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
5555
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" targetFramework="net46" />
5656
<package id="ncrontab" version="3.3.0" targetFramework="net46" />
57-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
57+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net46" />
5858
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
5959
<package id="NuGet.Frameworks" version="3.4.3" targetFramework="net46" />
6060
<package id="NuGet.LibraryModel" version="3.4.3" targetFramework="net46" />
@@ -87,7 +87,7 @@
8787
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
8888
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
8989
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
90-
<package id="System.Net.Http" version="4.3.0" targetFramework="net46" />
90+
<package id="System.Net.Http" version="4.3.2" targetFramework="net46" />
9191
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net46" />
9292
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />
9393
<package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />

‎test/WebJobs.Script.Tests.Integration/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</dependentAssembly>
7272
<dependentAssembly>
7373
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
74-
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
74+
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
7575
</dependentAssembly>
7676
<dependentAssembly>
7777
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />

0 commit comments

Comments
 (0)