diff options
Diffstat (limited to 'main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj')
-rw-r--r-- | main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj | 76 |
1 files changed, 28 insertions, 48 deletions
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 9806de5362..3acc8832ac 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\Microsoft.Net.Compilers\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers\build\Microsoft.Net.Compilers.props')" Label="Paket" /> <Import Project="..\..\..\MonoDevelop.props" /> <Import Project="$(ReferencesGtk)" /> <PropertyGroup> @@ -15,15 +14,15 @@ <TestRunnerArgs>run-md-tests</TestRunnerArgs> <OutputPath>..\..\..\build\tests</OutputPath> <RARResolveFromOutputDirectory>true</RARResolveFromOutputDirectory> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <ConsolePause>true</ConsolePause> <StartAction>Program</StartAction> <StartProgram>$(MSBuildProjectDirectory)\..\..\..\build\bin\mdtool</StartProgram> <StartArguments>run-md-tests $(MSBuildProjectDirectory)\bin\Debug\MonoDevelop.FSharp.Tests.dll</StartArguments> + <StartArguments>run-md-tests $(MSBuildProjectDirectory)\..\..\..\build\tests\MonoDevelop.FSharp.Tests.dll</StartArguments> + <EnablePrivateAssetsLocalCopyWorkaround>false</EnablePrivateAssetsLocalCopyWorkaround> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> @@ -71,6 +70,7 @@ </Reference> <Reference Include="FSharp.Compiler.Interactive.Settings"> <HintPath>..\MonoDevelop.FSharpi.Service\lib\FSharp.Compiler.Interactive.Settings.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <Import Project="$(CustomBeforeMicrosoftCommonTargets)" /> @@ -178,7 +178,7 @@ </MonoDevelop> </ProjectExtensions> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="ExtCore"> <HintPath>..\packages\ExtCore\lib\net45\ExtCore.dll</HintPath> @@ -189,15 +189,15 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Paket>True</Paket> </Reference> - <Reference Include="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <Reference Include="System.IO"> <Paket>True</Paket> </Reference> - <Reference Include="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <Reference Include="System.Runtime"> <Paket>True</Paket> </Reference> <Reference Include="FSharp.Compiler.Service"> @@ -209,7 +209,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="FSharp.Core"> <HintPath>..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath> @@ -220,29 +220,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> - <ItemGroup> - <Reference Include="Microsoft.DiaSymReader"> - <HintPath>..\packages\Microsoft.DiaSymReader\lib\net20\Microsoft.DiaSymReader.dll</HintPath> - <Private>True</Private> - <Paket>True</Paket> - </Reference> - </ItemGroup> - </When> - </Choose> - <Choose> - <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> - <Private>True</Private> - <Paket>True</Paket> - </Reference> - </ItemGroup> - </When> - </Choose> - <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="Mono.Cecil"> <HintPath>..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll</HintPath> @@ -268,7 +246,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="Newtonsoft.Json"> <HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath> @@ -279,10 +257,10 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="System.Collections.Immutable"> - <HintPath>..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath> + <HintPath>..\packages\System.Collections.Immutable\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> @@ -290,10 +268,10 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\packages\System.Reflection.Metadata\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> @@ -301,16 +279,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> - <ItemGroup> - <Reference Include="System.ComponentModel.Composition"> - <Paket>True</Paket> - </Reference> - </ItemGroup> - </When> - </Choose> - <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.2'"> <ItemGroup> <Reference Include="System.ValueTuple"> <HintPath>..\packages\System.ValueTuple\lib\net47\System.ValueTuple.dll</HintPath> @@ -320,5 +289,16 @@ </ItemGroup> </When> </Choose> + <ItemGroup> + <IncludeCopyLocal Include="System.Reactive.dll" /> + <IncludeCopyLocal Include="Newtonsoft.Json.dll" /> + <IncludeCopyLocal Include="ExtCore.dll" /> + <IncludeCopyLocal Include="Fantomas.dll" /> + <IncludeCopyLocal Include="FSharp.Compiler.CodeDom.dll" /> + <IncludeCopyLocal Include="FSharp.Compiler.Service.dll" /> + <IncludeCopyLocal Include="FSharp.Core.dll" /> + <IncludeCopyLocal Include="MonoDevelop.FSharp.Shared.dll" /> + <IncludeCopyLocal Include="FSharp.Compiler.Interactive.Settings.dll" /> + </ItemGroup> <Import Project="..\packages\StrongNamer\build\StrongNamer.targets" Condition="Exists('..\packages\StrongNamer\build\StrongNamer.targets')" Label="Paket" /> </Project>
\ No newline at end of file |