Skip to content

Commit be779c7

Browse files
fabiocavfabiocav
committed
Referencing NetStandard.Library 2.0. Adjusting System.Net.Http redirects.
1 parent 7c01149 commit be779c7

File tree

9 files changed

+26
-18
lines changed

9 files changed

+26
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<dependentAssembly>
182182
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
183183
<!--Explicitly redirecting back to 4.0.0. See https://github.com/dotnet/corefx/issues/15693 for details-->
184-
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.0.0.0" />
184+
<bindingRedirect oldVersion="0.0.0.0-4.9.0.0" newVersion="4.0.0.0" />
185185
</dependentAssembly>
186186
<dependentAssembly>
187187
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -202,7 +202,7 @@
202202
<dependentAssembly>
203203
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
204204
<!--Explicitly redirecting back to 4.0.0. See https://github.com/dotnet/corefx/issues/16805 for details-->
205-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
205+
<bindingRedirect oldVersion="0.0.0.0-4.9.0.0" newVersion="4.0.0.0" />
206206
</dependentAssembly>
207207
<dependentAssembly>
208208
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,9 @@
371371
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
372372
</Reference>
373373
<Reference Include="System.Net" />
374-
<Reference Include="System.Net.Http" />
374+
<Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
375+
<HintPath>..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
376+
</Reference>
375377
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
376378
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
377379
<Private>True</Private>
@@ -641,9 +643,11 @@
641643
</PropertyGroup>
642644
<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'))" />
643645
<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'))" />
646+
<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'))" />
644647
</Target>
645648
<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')" />
646649
<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')" />
650+
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
647651
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
648652
Other similar extension points exist, see Microsoft.Common.targets.
649653
<Target Name="BeforeBuild">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
8484
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" targetFramework="net46" />
8585
<package id="ncrontab" version="3.3.0" targetFramework="net46" />
86-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
86+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net46" />
8787
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
8888
<package id="RestSharp" version="105.2.3" targetFramework="net46" />
8989
<package id="Sendgrid" version="8.0.5" targetFramework="net46" />
@@ -111,7 +111,7 @@
111111
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
112112
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
113113
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
114-
<package id="System.Net.Http" version="4.3.0" targetFramework="net46" />
114+
<package id="System.Net.Http" version="4.3.2" targetFramework="net46" />
115115
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net46" />
116116
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />
117117
<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
@@ -104,7 +104,7 @@
104104
<dependentAssembly>
105105
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
106106
<!--Explicitly redirecting back to 4.0.0. See https://github.com/dotnet/corefx/issues/16805 for details-->
107-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
107+
<bindingRedirect oldVersion="0.0.0.0-4.9.0.0" newVersion="4.0.0.0" />
108108
</dependentAssembly>
109109
<dependentAssembly>
110110
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,8 @@
297297
<SpecificVersion>False</SpecificVersion>
298298
<HintPath>..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\WindowsPowerShell\3.0\System.Management.Automation.dll</HintPath>
299299
</Reference>
300-
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
301-
<HintPath>..\..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
302-
<Private>True</Private>
300+
<Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
301+
<HintPath>..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
303302
</Reference>
304303
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
305304
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -593,7 +592,9 @@
593592
<AdditionalFiles Include="..\..\stylecop.json">
594593
<Link>stylecop.json</Link>
595594
</AdditionalFiles>
596-
<None Include="packages.config" />
595+
<None Include="packages.config">
596+
<SubType>Designer</SubType>
597+
</None>
597598
<None Include="TestScripts\CSharp\CosmosDBTrigger\function.json">
598599
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
599600
</None>
@@ -1262,8 +1263,10 @@
12621263
<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'))" />
12631264
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
12641265
<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'))" />
1266+
<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'))" />
12651267
</Target>
12661268
<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')" />
1269+
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
12671270
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12681271
Other similar extension points exist, see Microsoft.Common.targets.
12691272
<Target Name="BeforeBuild">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" targetFramework="net46" />
7171
<package id="Moq" version="4.5.28" targetFramework="net46" />
7272
<package id="ncrontab" version="3.3.0" targetFramework="net46" />
73-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
73+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net46" />
7474
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
7575
<package id="RestSharp" version="105.2.3" targetFramework="net46" />
7676
<package id="Sendgrid" version="8.0.5" targetFramework="net46" />
@@ -99,7 +99,7 @@
9999
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
100100
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
101101
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
102-
<package id="System.Net.Http" version="4.3.0" targetFramework="net46" />
102+
<package id="System.Net.Http" version="4.3.2" targetFramework="net46" />
103103
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net46" />
104104
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />
105105
<package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,8 @@
322322
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
323323
</Reference>
324324
<Reference Include="System.Net" />
325-
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
326-
<HintPath>..\..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
327-
<Private>True</Private>
325+
<Reference Include="System.Net.Http, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
326+
<HintPath>..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll</HintPath>
328327
</Reference>
329328
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
330329
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -630,6 +629,7 @@
630629
<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'))" />
631630
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
632631
<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'))" />
632+
<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'))" />
633633
</Target>
634634
<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')" />
635635
<Target Name="BeforeBuild">
@@ -640,6 +640,7 @@
640640
<PostBuildEvent>xcopy "$(ProjectDir)..\WebJobs.Script.Tests.Integration\TestScripts" "$(TargetDir)TestScripts\" /S /Y /I</PostBuildEvent>
641641
</PropertyGroup>
642642
<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')" />
643+
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
643644
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
644645
Other similar extension points exist, see Microsoft.Common.targets.
645646
<Target Name="AfterBuild">

‎test/WebJobs.Script.Tests/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
</dependentAssembly>
109109
<dependentAssembly>
110110
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
111-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
111+
<bindingRedirect oldVersion="0.0.0.0-4.9.0.0" newVersion="4.0.0.0" />
112112
</dependentAssembly>
113113
<dependentAssembly>
114114
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

‎test/WebJobs.Script.Tests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" targetFramework="net46" />
7373
<package id="Moq" version="4.5.28" targetFramework="net46" />
7474
<package id="ncrontab" version="3.3.0" targetFramework="net46" />
75-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
75+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net46" />
7676
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
7777
<package id="RestSharp" version="105.2.3" targetFramework="net46" />
7878
<package id="Sendgrid" version="8.0.5" targetFramework="net46" />
@@ -104,7 +104,7 @@
104104
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
105105
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
106106
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
107-
<package id="System.Net.Http" version="4.3.0" targetFramework="net46" />
107+
<package id="System.Net.Http" version="4.3.2" targetFramework="net46" />
108108
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net46" />
109109
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />
110110
<package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />

0 commit comments

Comments
 (0)