|
54 | 54 | <!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++--> |
55 | 55 |
|
56 | 56 | <ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" > |
57 | | - <ProjectsWithNet40Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/> |
58 | | - <ProjectsWithNet40Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/> |
| 57 | + <ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/> |
| 58 | + <ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/> |
59 | 59 | </ItemGroup> |
60 | 60 |
|
61 | 61 | <ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'"> |
62 | | - <ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/> |
63 | | - <ProjectsWithCoreClrInclude="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/> |
| 62 | + <ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/> |
| 63 | + <ProjectsWithCoreClrInclude="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/> |
64 | 64 | </ItemGroup> |
65 | 65 |
|
66 | 66 | <ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" > |
67 | | - <ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj"/> |
| 67 | + <ProjectsWithNet40Include="tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj"/> |
68 | 68 | </ItemGroup> |
69 | 69 |
|
70 | 70 | <ItemGroupCondition="'$(TEST_NET40_FSHARP_SUITE)'=='1'" > |
|
73 | 73 |
|
74 | 74 | <ItemGroupCondition="'$(TEST_CORECLR_FSHARP_SUITE)'=='1'" > |
75 | 75 | <ProjectsWithCoreClrInclude="tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj" /> |
| 76 | + <ProjectsWithCoreClrInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" /> |
| 77 | + |
| 78 | + <ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" /> |
76 | 79 | </ItemGroup> |
77 | 80 |
|
78 | 81 | <ItemGroupCondition="'$(TEST_NET40_FSHARPQA_SUITE)'=='1' OR '$(TEST_NET40_FSHARP_SUITE)'=='1'" > |
79 | 82 | <ProjectsWithNet40Include="tests/fsharpqa/testenv/src/ILComparer/ILComparer.fsproj" /> |
80 | 83 | <ProjectsWithNet40Include="tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj" /> |
| 84 | + <ProjectsWithNet40Include="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" /> |
| 85 | + |
| 86 | + <ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" /> |
81 | 87 | </ItemGroup> |
82 | 88 |
|
83 | 89 | <ItemGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'" > |
84 | 90 | <ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/> |
85 | 91 | </ItemGroup> |
86 | 92 |
|
| 93 | + <PropertyGroup> |
| 94 | + <CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps> |
| 95 | + </PropertyGroup> |
| 96 | + |
87 | 97 | <!-- +++++++++++++++++++++++ Targets +++++++++++++++++++++++++++++++--> |
88 | 98 |
|
89 | 99 | <TargetName="Build"> |
90 | | - <MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
91 | | - <MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
92 | | - <MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);" /> |
93 | | - <MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
| 100 | + <MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
| 101 | + <MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
| 102 | + <MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);$(CustomProps)" /> |
| 103 | + <MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
94 | 104 | </Target> |
95 | 105 |
|
96 | 106 | <TargetName="Rebuild"> |
97 | | - <MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
98 | | - <MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" /> |
99 | | - <MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
100 | | - <MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);" /> |
101 | | - <MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
| 107 | + <MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
| 108 | + <MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true;$(CustomProps)" /> |
| 109 | + <MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
| 110 | + <MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);$(CustomProps)" /> |
| 111 | + <MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
102 | 112 | </Target> |
103 | 113 |
|
104 | 114 | <TargetName="Clean"> |
105 | | - <MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
106 | | - <MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" /> |
107 | | - <MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
108 | | - <MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);" /> |
109 | | - <MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" /> |
| 115 | + <MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
| 116 | + <MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true;$(CustomProps)" /> |
| 117 | + <MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
| 118 | + <MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);$(CustomProps)" /> |
| 119 | + <MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" /> |
110 | 120 | </Target> |
| 121 | + |
| 122 | + <TargetName="Restore"> |
| 123 | + <MSBuildProjects="@(ProjectsToRestore)"Targets="Restore" /> |
| 124 | + </Target> |
| 125 | + |
111 | 126 | </Project> |