Skip to content

Commit 1df27cb

Browse files
committed
revert change from vfsharp
1 parent 80f4ce2 commit 1df27cb

File tree

28 files changed

+27
-45
lines changed

28 files changed

+27
-45
lines changed

packages.config

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,6 @@
2727
<package id="BenchmarkDotNet" version="0.9.8"/>
2828
<package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
2929
<package id="Newtonsoft.Json" version="9.0.1"/>
30-
<<<<<<< HEAD
31-
=======
32-
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
33-
<package id="Microsoft.FSharp.TupleSample" version="1.0.0-alpha-161121"/>
34-
<package id="Microsoft.VSSDK.BuildTools" version="15.1.192" />
35-
36-
<!-- Testing Span -->
37-
<package id="System.Memory" version="4.5.0-rc1" />
38-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0-rc1" />
39-
<package id="NETStandard.Library.NETFramework" version="2.0.0-preview2-25405-01" />
40-
41-
<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute -->
42-
<!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools -->
43-
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net46" />
44-
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26201" targetFramework="net46" />
45-
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
46-
47-
>>>>>>> 59156db2d0a744233d1baffee7088ca2d9f959c7
4830
<!-- FSharp.Compiler.Tools is only used to get a working FSI.EXE to execute some scripts during the build -->
4931
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
5032
<package id="FSharp.Compiler.Tools" version="4.1.27"/>

tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Reference Include="System.Core" />
4444
<Reference Include="System.Numerics" />
4545
<Reference Include="FSharp.Core">
46-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
46+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4747
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>

tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Reference Include="System.Core" />
4444
<Reference Include="System.Numerics" />
4545
<Reference Include="FSharp.Core">
46-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
46+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4747
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>

tests/projects/Sample_VS2012_FSharp_Portable_Library/Sample_VS2012_FSharp_Portable_Library.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<Reference Include="FSharp.Core">
3737
<Name>FSharp.Core</Name>
3838
<AssemblyName>FSharp.Core.dll</AssemblyName>
39-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
39+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4040
</Reference>
4141
</ItemGroup>
4242
<ItemGroup>

tests/projects/Sample_VS2012_FSharp_Portable_Library_upgraded_2013/Sample_VS2012_FSharp_Portable_Library_upgraded_2013.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="FSharp.Core">
38-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
38+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
</ItemGroup>

tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net40/Sample_VS2013_FSharp_Portable_Library_Legacy_net40.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Reference Include="FSharp.Core">
3838
<Name>FSharp.Core</Name>
3939
<AssemblyName>FSharp.Core.dll</AssemblyName>
40-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net45/Sample_VS2013_FSharp_Portable_Library_Legacy_net45.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Reference Include="FSharp.Core">
3838
<Name>FSharp.Core</Name>
3939
<AssemblyName>FSharp.Core.dll</AssemblyName>
40-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net451/Sample_VS2013_FSharp_Portable_Library_Legacy_net451.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Reference Include="FSharp.Core">
3838
<Name>FSharp.Core</Name>
3939
<AssemblyName>FSharp.Core.dll</AssemblyName>
40-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

tests/projects/Sample_VS2013_FSharp_Portable_Library_net45/Sample_VS2013_FSharp_Portable_Library_net45.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Reference Include="FSharp.Core">
3939
<Name>FSharp.Core</Name>
4040
<AssemblyName>FSharp.Core.dll</AssemblyName>
41-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
41+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
4242
</Reference>
4343
</ItemGroup>
4444
<ItemGroup>

tests/projects/Sample_VS2013_FSharp_Portable_Library_net451/Sample_VS2013_FSharp_Portable_Library_net451.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Reference Include="FSharp.Core">
3939
<Name>FSharp.Core</Name>
4040
<AssemblyName>FSharp.Core.dll</AssemblyName>
41-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
41+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
4242
</Reference>
4343
</ItemGroup>
4444
<ItemGroup>

0 commit comments

Comments
 (0)