diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2018-08-21 11:25:30 +0300 |
|---|---|---|
| committer | Marius Ungureanu <teromario@yahoo.com> | 2018-09-03 16:18:22 +0300 |
| commit | 975d3bf5edca958b55520cefafc9a9cadc383083 (patch) | |
| tree | 8cf3c71c6b85fcc73d5e60f7f2dea07308a584c5 /main | |
| parent | a91da1096bcff498beb59da3ff8a7d365f53c6ea (diff) | |
Bump System.Net.Http
Diffstat (limited to 'main')
37 files changed, 120 insertions, 108 deletions
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj index 531b1f60e3..f25697121e 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj @@ -38,7 +38,7 @@ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets" /> <Import Project="..\.paket\paket.targets" /> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ExtCore"> <HintPath>..\packages\ExtCore\lib\net45\ExtCore.dll</HintPath> @@ -49,7 +49,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Paket>True</Paket> @@ -69,7 +69,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FSharp.Core"> <HintPath>..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath> @@ -80,7 +80,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader"> <HintPath>..\packages\Microsoft.DiaSymReader\lib\net20\Microsoft.DiaSymReader.dll</HintPath> @@ -91,7 +91,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader.PortablePdb"> <HintPath>..\packages\Microsoft.DiaSymReader.PortablePdb\lib\net45\Microsoft.DiaSymReader.PortablePdb.dll</HintPath> @@ -102,7 +102,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Collections.Immutable"> <HintPath>..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath> @@ -113,7 +113,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reflection.Metadata"> <HintPath>..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath> @@ -124,7 +124,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ComponentModel.Composition"> <Paket>True</Paket> @@ -133,10 +133,10 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ValueTuple"> - <HintPath>..\packages\System.ValueTuple\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\packages\System.ValueTuple\lib\net471\System.ValueTuple.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> @@ -144,4 +144,4 @@ </When> </Choose> <Import Project="..\packages\StrongNamer\build\StrongNamer.targets" Condition="Exists('..\packages\StrongNamer\build\StrongNamer.targets')" Label="Paket" /> -</Project>
\ No newline at end of file +</Project> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj index afbde6e90c..3daf207baa 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj @@ -182,7 +182,7 @@ </MonoDevelop> </ProjectExtensions> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ExtCore"> <HintPath>..\packages\ExtCore\lib\net45\ExtCore.dll</HintPath> @@ -193,7 +193,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Paket>True</Paket> @@ -213,7 +213,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FSharp.Core"> <HintPath>..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath> @@ -224,7 +224,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader"> <HintPath>..\packages\Microsoft.DiaSymReader\lib\net20\Microsoft.DiaSymReader.dll</HintPath> @@ -235,7 +235,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader.PortablePdb"> <HintPath>..\packages\Microsoft.DiaSymReader.PortablePdb\lib\net45\Microsoft.DiaSymReader.PortablePdb.dll</HintPath> @@ -246,7 +246,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Mono.Cecil"> <HintPath>..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll</HintPath> @@ -272,7 +272,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Newtonsoft.Json"> <HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath> @@ -283,7 +283,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Collections.Immutable"> <HintPath>..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath> @@ -294,7 +294,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reflection.Metadata"> <HintPath>..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath> @@ -305,7 +305,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ComponentModel.Composition"> <Paket>True</Paket> @@ -314,10 +314,10 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ValueTuple"> - <HintPath>..\packages\System.ValueTuple\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\packages\System.ValueTuple\lib\net47\System.ValueTuple.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj index 8382abbbf5..074c9f8e3b 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj @@ -206,7 +206,7 @@ </MonoDevelop> </ProjectExtensions> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ExtCore"> <HintPath>..\packages\ExtCore\lib\net45\ExtCore.dll</HintPath> @@ -217,7 +217,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FantomasLib"> <HintPath>..\packages\Fantomas\lib\FantomasLib.dll</HintPath> @@ -228,7 +228,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FSharp.Compiler.CodeDom"> <HintPath>..\packages\FSharp.Compiler.CodeDom\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath> @@ -239,7 +239,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FSharp.Compiler.Service"> <HintPath>..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath> @@ -250,7 +250,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FSharp.Core"> <HintPath>..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath> @@ -261,7 +261,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader"> <HintPath>..\packages\Microsoft.DiaSymReader\lib\net20\Microsoft.DiaSymReader.dll</HintPath> @@ -272,7 +272,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader.PortablePdb"> <HintPath>..\packages\Microsoft.DiaSymReader.PortablePdb\lib\net45\Microsoft.DiaSymReader.PortablePdb.dll</HintPath> @@ -283,7 +283,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Mono.Cecil"> <HintPath>..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll</HintPath> @@ -309,7 +309,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Newtonsoft.Json"> <HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath> @@ -320,7 +320,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Collections.Immutable"> <HintPath>..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath> @@ -331,7 +331,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reactive.Core"> <HintPath>..\packages\System.Reactive.Core\lib\net46\System.Reactive.Core.dll</HintPath> @@ -342,7 +342,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reactive.Interfaces"> <HintPath>..\packages\System.Reactive.Interfaces\lib\net45\System.Reactive.Interfaces.dll</HintPath> @@ -353,7 +353,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reactive.Linq"> <HintPath>..\packages\System.Reactive.Linq\lib\net46\System.Reactive.Linq.dll</HintPath> @@ -364,7 +364,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reflection.Metadata"> <HintPath>..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath> @@ -375,7 +375,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ComponentModel.Composition"> <Paket>True</Paket> @@ -384,10 +384,10 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ValueTuple"> - <HintPath>..\packages\System.ValueTuple\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\packages\System.ValueTuple\lib\net47\System.ValueTuple.dll</HintPath> <Private>false</Private> <Paket>True</Paket> </Reference> diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj index ba32d82fc6..1202fca39e 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj @@ -51,7 +51,7 @@ </ItemGroup> <Import Project="..\.paket\paket.targets" /> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ExtCore"> <HintPath>..\packages\ExtCore\lib\net45\ExtCore.dll</HintPath> @@ -62,7 +62,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Paket>True</Paket> @@ -82,7 +82,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="FSharp.Core"> <HintPath>..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath> @@ -93,7 +93,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader"> <HintPath>..\packages\Microsoft.DiaSymReader\lib\net20\Microsoft.DiaSymReader.dll</HintPath> @@ -104,7 +104,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Microsoft.DiaSymReader.PortablePdb"> <HintPath>..\packages\Microsoft.DiaSymReader.PortablePdb\lib\net45\Microsoft.DiaSymReader.PortablePdb.dll</HintPath> @@ -115,7 +115,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="Newtonsoft.Json"> <HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath> @@ -126,7 +126,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Collections.Immutable"> <HintPath>..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath> @@ -137,7 +137,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.Reflection.Metadata"> <HintPath>..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath> @@ -148,7 +148,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ComponentModel.Composition"> <Paket>True</Paket> @@ -157,10 +157,10 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> <ItemGroup> <Reference Include="System.ValueTuple"> - <HintPath>..\packages\System.ValueTuple\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\packages\System.ValueTuple\lib\net47\System.ValueTuple.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> diff --git a/main/msbuild/MonoDevelop.AfterCommon.props b/main/msbuild/MonoDevelop.AfterCommon.props index fb1f2418a9..46a2de35d8 100644 --- a/main/msbuild/MonoDevelop.AfterCommon.props +++ b/main/msbuild/MonoDevelop.AfterCommon.props @@ -6,7 +6,7 @@ <PropertyGroup> <!-- target framework for the core and addins --> - <MDFrameworkVersion>v4.6.1</MDFrameworkVersion> + <MDFrameworkVersion>v4.7.1</MDFrameworkVersion> </PropertyGroup> <!-- diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index 024285e567..54ca6a889b 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -110,7 +110,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.VisualStudio.CodingConventions"> diff --git a/main/src/addins/CSharpBinding/packages.config b/main/src/addins/CSharpBinding/packages.config index 61fc68c2c0..f0c788e020 100644 --- a/main/src/addins/CSharpBinding/packages.config +++ b/main/src/addins/CSharpBinding/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj index c727dff3c7..1507981e0d 100644 --- a/main/src/addins/MacPlatform/MacPlatform.csproj +++ b/main/src/addins/MacPlatform/MacPlatform.csproj @@ -29,7 +29,7 @@ </Reference> <Reference Include="Mono.Cairo" /> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MacPlatform/packages.config b/main/src/addins/MacPlatform/packages.config index 61fc68c2c0..f0c788e020 100644 --- a/main/src/addins/MacPlatform/packages.config +++ b/main/src/addins/MacPlatform/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index a92213182d..faae211929 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -45,7 +45,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Debugger/packages.config b/main/src/addins/MonoDevelop.Debugger/packages.config index 61fc68c2c0..f0c788e020 100644 --- a/main/src/addins/MonoDevelop.Debugger/packages.config +++ b/main/src/addins/MonoDevelop.Debugger/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj index 1a25a4bcfd..3db08f5653 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj @@ -90,7 +90,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index d4b702d4c6..7adad96e16 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -64,7 +64,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Composition.TypedParts"> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index 5528ec1ff1..b5722409bd 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -97,7 +97,7 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/packages.config b/main/src/addins/MonoDevelop.SourceEditor2/packages.config index 61fc68c2c0..f0c788e020 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/packages.config +++ b/main/src/addins/MonoDevelop.SourceEditor2/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj index cff33bc86c..71f54a1bb6 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj @@ -30,7 +30,7 @@ </Reference> <Reference Include="System.Xml" /> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config index c079bede60..e97c693122 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="NUnit.Engine" version="3.0.1" targetFramework="net45" /> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj index e23363ba62..313e369fc1 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj @@ -26,7 +26,7 @@ <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config index a357dfc666..78668f5172 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config @@ -2,5 +2,5 @@ <packages> <package id="NUnit" version="2.6.4" targetFramework="net40" /> <package id="NUnit.Runners" version="2.6.4" targetFramework="net40" /> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj index 5cf98c8537..b6a89afbe5 100644 --- a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj +++ b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj @@ -19,7 +19,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Mono.Posix" /> diff --git a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/packages.config b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/packages.config index 61fc68c2c0..f0c788e020 100644 --- a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/packages.config +++ b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/Xml/MonoDevelop.Xml.csproj b/main/src/addins/Xml/MonoDevelop.Xml.csproj index 6b9df37cdd..457d3d4f0d 100644 --- a/main/src/addins/Xml/MonoDevelop.Xml.csproj +++ b/main/src/addins/Xml/MonoDevelop.Xml.csproj @@ -32,7 +32,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj index 361153d7cd..3bf79b2540 100644 --- a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj +++ b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj @@ -49,7 +49,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/Xml/Tests/packages.config b/main/src/addins/Xml/Tests/packages.config index 61fc68c2c0..f0c788e020 100644 --- a/main/src/addins/Xml/Tests/packages.config +++ b/main/src/addins/Xml/Tests/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/addins/Xml/packages.config b/main/src/addins/Xml/packages.config index 61fc68c2c0..6e418c6a68 100644 --- a/main/src/addins/Xml/packages.config +++ b/main/src/addins/Xml/packages.config @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index 0c4aabb3b9..0e7e578289 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -88,6 +88,7 @@ <Reference Include="System.Configuration" /> <Reference Include="System.Core" /> <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation"/> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Web" /> <Reference Include="System.ServiceModel" /> @@ -154,9 +155,6 @@ <Reference Include="System.Reflection.Metadata"> <HintPath>..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath> </Reference> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation"> - <HintPath>..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath> - </Reference> <Reference Include="System.Security.Cryptography.Algorithms"> <HintPath>..\..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath> </Reference> @@ -179,7 +177,7 @@ <HintPath>..\..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> </Reference> <Reference Include="System.Xml.ReaderWriter"> <HintPath>..\..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath> @@ -212,6 +210,16 @@ <Reference Include="System.Memory"> <HintPath>..\..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath> </Reference> + <Reference Include="Microsoft.VisualStudio.ImageCatalog"> + <HintPath>..\..\..\packages\Microsoft.VisualStudio.ImageCatalog.15.0.26606\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath> + </Reference> + <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime"> + <HintPath>..\..\..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.25408\lib\net20\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll</HintPath> + </Reference> + <Reference Include="System.Net.Http"> + <HintPath>..\..\..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath> + </Reference> + <Reference Include="mscorlib" /> </ItemGroup> <ItemGroup> <Compile Include="MonoDevelop.Core\StringParserService.cs" /> @@ -800,4 +808,5 @@ </Target> <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> + <Import Project="..\..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" /> </Project> diff --git a/main/src/core/MonoDevelop.Core/packages.config b/main/src/core/MonoDevelop.Core/packages.config index ba684dc287..9aae82cc3a 100644 --- a/main/src/core/MonoDevelop.Core/packages.config +++ b/main/src/core/MonoDevelop.Core/packages.config @@ -24,6 +24,8 @@ <package id="Microsoft.VisualStudio.CodingConventions" version="1.1.20180503.2" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Composition" version="15.6.36" targetFramework="net461" />
<package id="Microsoft.VisualStudio.CoreUtility" version="15.8.519" targetFramework="net45" />
+ <package id="Microsoft.VisualStudio.ImageCatalog" version="15.0.26606" targetFramework="net461" /> + <package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.25408" targetFramework="net461" /> <package id="Microsoft.VisualStudio.Language" version="15.8.519" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Language.Intellisense" version="15.8.519" targetFramework="net45" />
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="15.8.519" targetFramework="net45" />
@@ -34,6 +36,7 @@ <package id="Microsoft.VisualStudio.Text.UI" version="15.8.519" targetFramework="net45" />
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="15.8.519" targetFramework="net45" />
<package id="Microsoft.VisualStudio.Threading" version="15.6.46" targetFramework="net461" />
+ <package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.6.46" targetFramework="net461" /> <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net461" />
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
<package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net45" />
@@ -77,7 +80,7 @@ <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Parallel" version="4.3.0" targetFramework="net461" />
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
- <package id="System.Net.Http" version="4.1.0" targetFramework="net461" />
+ <package id="System.Net.Http" version="4.3.3" targetFramework="net461" /> <package id="System.Net.Primitives" version="4.0.11" targetFramework="net461" />
<package id="System.Net.Sockets" version="4.1.0" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
@@ -108,7 +111,7 @@ <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
<package id="System.Threading.Timer" version="4.0.1" targetFramework="net461" />
- <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
+ <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index b9b2f38afd..f3d5c5fa38 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -118,7 +118,7 @@ <HintPath>..\..\..\packages\YamlDotNet.Signed.4.0.1-pre291\lib\net35\YamlDotNet.dll</HintPath> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> <!-- when building with xbuild on Unix, $(MSBuildToolsPath) is like `$prefix/lib/mono/xbuild/*/bin` diff --git a/main/src/core/MonoDevelop.Ide/packages.config b/main/src/core/MonoDevelop.Ide/packages.config index 04e83f4c9b..fc25c8680b 100644 --- a/main/src/core/MonoDevelop.Ide/packages.config +++ b/main/src/core/MonoDevelop.Ide/packages.config @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <packages> <package id="Microsoft.TemplateEngine.Abstractions" version="1.0.0-beta3-20171117-314" targetFramework="net461" /> <package id="Microsoft.TemplateEngine.Core" version="1.0.0-beta3-20171117-314" targetFramework="net461" /> @@ -12,6 +12,6 @@ <package id="System.Composition" version="1.0.31" targetFramework="net45" /> <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" /> <package id="System.Threading.Tasks.DataFlow" version="4.7.0" targetFramework="net45" /> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> <package id="YamlDotNet.Signed" version="4.0.1-pre291" targetFramework="net45" /> -</packages>
\ No newline at end of file +</packages> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj index 757cc7b0e2..7d70965cc2 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\MonoDevelop.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -41,7 +41,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/packages.config b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/packages.config index 57bc9eb211..f0c788e020 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/packages.config +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net40" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> diff --git a/main/src/core/MonoDevelop.Startup/app.config b/main/src/core/MonoDevelop.Startup/app.config index 261c65d493..d2dc5cdd0a 100644 --- a/main/src/core/MonoDevelop.Startup/app.config +++ b/main/src/core/MonoDevelop.Startup/app.config @@ -24,7 +24,7 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Net.Http.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> @@ -44,7 +44,7 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.0.1.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.0.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" /> @@ -56,7 +56,7 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.1.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> @@ -68,11 +68,11 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.2.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> diff --git a/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj b/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj index bc91ca3b2f..1da722aa38 100644 --- a/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj +++ b/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj @@ -24,7 +24,7 @@ <Private>False</Private> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> <HintPath>..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj index bde17b535d..44c3850557 100644 --- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj +++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj @@ -60,7 +60,7 @@ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="System.ValueTuple"> - <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/packages.config b/main/tests/MonoDevelop.CSharpBinding.Tests/packages.config index 61fc68c2c0..33e0e3b1b1 100644 --- a/main/tests/MonoDevelop.CSharpBinding.Tests/packages.config +++ b/main/tests/MonoDevelop.CSharpBinding.Tests/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net47" /> +</packages> diff --git a/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core.Tests.csproj b/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core.Tests.csproj index 8ae9df5e89..5e55f2ec07 100644 --- a/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core.Tests.csproj +++ b/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core.Tests.csproj @@ -50,7 +50,7 @@ <HintPath>..\..\packages\Mono.Cecil.0.10.0-beta7\lib\net40\Mono.Cecil.Rocks.dll</HintPath> </Reference> <Reference Include="System.ValueTuple"> - <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> + <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> </Reference> <Reference Include="mscorlib" /> </ItemGroup> diff --git a/main/tests/MonoDevelop.Core.Tests/packages.config b/main/tests/MonoDevelop.Core.Tests/packages.config index 8b7eba7de7..87528e39e8 100644 --- a/main/tests/MonoDevelop.Core.Tests/packages.config +++ b/main/tests/MonoDevelop.Core.Tests/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Mono.Cecil" version="0.10.0-beta7" targetFramework="net461" /> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> -</packages>
\ No newline at end of file + <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> +</packages> |