Skip to content

Commit 542011d

Browse files
fabiocavfabiocav
committed
Reverting F# Core update
1 parent 9828d85 commit 542011d

File tree

12 files changed

+22
-20
lines changed

12 files changed

+22
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
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.1.0" newVersion="4.4.1.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />

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

Lines changed: 4 additions & 4 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.2.3\lib\net45\FSharp.Core.sigdata">
58+
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata">
5959
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6060
</Content>
61-
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.optdata">
61+
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata">
6262
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6363
</Content>
6464
</ItemGroup>
@@ -343,8 +343,8 @@
343343
<Target Name="BeforeBuild">
344344
</Target>
345345
<Target Name="AfterBuild">
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)" />
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)" />
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')" />
350350
<Import Project="..\..\tools\Clean.targets" />

‎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.2.3" />
19+
<dependency id="FSharp.Core" version="4.0.0.1" />
2020
<dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-11031" />
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.1.0" newVersion="4.4.1.0" />
91+
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.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
@@ -584,10 +584,10 @@
584584
<None Include="Web.Release.config">
585585
<DependentUpon>Web.config</DependentUpon>
586586
</None>
587-
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.sigdata">
587+
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata">
588588
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
589589
</Content>
590-
<Content Include="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.optdata">
590+
<Content Include="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata">
591591
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
592592
</Content>
593593
</ItemGroup>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@
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>
5253
</Reference>
5354
<Reference Include="FSharp.Compiler.Service.MSBuild.v12, Version=9.0.1.0, Culture=neutral, processorArchitecture=MSIL">
5455
<HintPath>..\..\packages\FSharp.Compiler.Service.9.0.1\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
56+
<Private>True</Private>
5557
</Reference>
56-
<Reference Include="FSharp.Core">
57-
<HintPath>..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
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>
5860
<Private>True</Private>
5961
</Reference>
6062
<Reference Include="Microsoft.AI.Agent.Intercept, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/WebJobs.Script/app.config‎

Lines changed: 1 addition & 1 deletion
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.1.0" newVersion="4.4.1.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎src/WebJobs.Script/packages.config‎

Lines changed: 1 addition & 1 deletion
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.2.3" targetFramework="net46" />
5+
<package id="FSharp.Core" version="4.0.0.1" 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" />

‎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.1.0" newVersion="4.4.1.0" />
74+
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
7575
</dependentAssembly>
7676
<dependentAssembly>
7777
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />

‎test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
58-
<Reference Include="FSharp.Core">
59-
<HintPath>..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
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>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="Microsoft.AI.Agent.Intercept, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -632,8 +632,8 @@
632632
</Target>
633633
<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')" />
634634
<Target Name="BeforeBuild">
635-
<Copy SourceFiles="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.optdata" DestinationFolder="$(TargetDir)" />
636-
<Copy SourceFiles="..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.sigdata" DestinationFolder="$(TargetDir)" />
635+
<Copy SourceFiles="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata" DestinationFolder="$(TargetDir)" />
636+
<Copy SourceFiles="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata" DestinationFolder="$(TargetDir)" />
637637
</Target>
638638
<PropertyGroup Condition="'$(OS)'!='Unix'">
639639
<PostBuildEvent>xcopy "$(ProjectDir)..\WebJobs.Script.Tests.Integration\TestScripts" "$(TargetDir)TestScripts\" /S /Y /I</PostBuildEvent>

0 commit comments

Comments
 (0)