-
Notifications
You must be signed in to change notification settings - Fork 789
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
closes #55 commit 677a7e799fd5350fd166411004a734f56e9c4e4b Author: latkin <[email protected]> Date: Tue Jan 20 11:34:49 2015 -0800 Update DEVGUIDE and TESTGUIDE to include compiler unit test suite commit 90f33737381c0932a478746fc566532da862f3c3 Author: latkin <[email protected]> Date: Tue Jan 20 11:20:56 2015 -0800 Simplifying ExtendedIfGrammar tests commit 78b8ff4e325dc37a6d4ca0777b05a2abe85f961c Author: latkin <[email protected]> Date: Tue Jan 20 11:20:10 2015 -0800 Adding compilerunit to RunTests.cmd usage commit ba861296fe847faa217ab76ec1cb76aef7bc4d02 Merge: 28da5c0 42e0766 Author: latkin <[email protected]> Date: Tue Jan 20 11:05:01 2015 -0800 Merge branch 'pr/extended_if_grammar' of https://github.com/mrange/visualfsharp into mrange-pr/extended_if_grammar Conflicts: tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/ExtendedIfGrammar.fs commit 28da5c0800a28cc2044a8d3bb4a22751803433aa Author: latkin <[email protected]> Date: Mon Jan 19 18:38:11 2015 -0800 Removing generated .fs/.fsi files from repo commit 47b61d5460f4c84c1b985d50ce96d944c8791efa Author: latkin <[email protected]> Date: Mon Jan 19 18:36:15 2015 -0800 Use dedicated fsharp-compiler-unittests-build.proj so portable/net20 build of library unit tests is not broken commit 95e1af8c8bac8b4bc6312a171e675392bff67626 Merge: c5e6699 5f8880c Author: latkin <[email protected]> Date: Mon Jan 19 18:14:12 2015 -0800 Merge branch 'pr/extended_if_grammar' of https://github.com/mrange/visualfsharp into mrange-pr/extended_if_grammar commit 5f8880c Author: mrange <[email protected]> Date: Sun Jan 18 14:50:47 2015 +0100 Implements extended if grammar Origin: https://fslang.uservoice.com/forums/245727-f-language/suggestions/6079342-allow-extended-if-grammar This commit adds the possibility to write condtional compilation expressions like this: #if SILVERLIGHT || NETFX #endif or a bit more advanced: #if (SILVERLIGHT || NETFX) && COMPILED || !DEBUG #endif This commit doesn't add #elif which is an orthogonal problem.
- Loading branch information
Showing
24 changed files
with
834 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. --> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" | ||
| ToolsVersion="4.0"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework Condition="'$(TargetFramework)'==''">net40</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectFiles Include="fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj"/> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="root.traversal.targets"/> | ||
|
|
||
| <!-- Insert any customizations for targets here --> | ||
|
|
||
| </Project> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. --> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <FSharpSourcesRoot>..\..</FSharpSourcesRoot> | ||
| <ProjectGuid>{a8d9641a-9170-4cf4-8fe0-6db8c134e1b5}</ProjectGuid> | ||
| </PropertyGroup> | ||
| <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <AllowCrossTargeting>true</AllowCrossTargeting> | ||
| <ReferenceVsAssemblies>true</ReferenceVsAssemblies> | ||
| <OutputType>Library</OutputType> | ||
| <AssemblyName>FSharp.Compiler.Unittests</AssemblyName> | ||
| <TargetFrameworkVersion Condition=" '$(TargetFramework)' == 'net20' ">v3.5</TargetFrameworkVersion> | ||
| <Name>SystematicUnitTests</Name> | ||
| <!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy --> | ||
| <Optimize>false</Optimize> | ||
| <Tailcalls>false</Tailcalls> | ||
| <TargetProfile Condition=" '$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259' ">netcore</TargetProfile> | ||
| <!-- workaround for msbuild narrowing the assembly search paths when building portable libs --> | ||
| <AssemblySearchPaths Condition="$(TargetFramework.Contains('portable'))"> | ||
| {CandidateAssemblyFiles}; | ||
| {TargetFrameworkDirectory}; | ||
| {Registry:Software\Microsoft\.NETFramework,v4.5,AssemblyFoldersEx}; | ||
| </AssemblySearchPaths> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <DefineConstants Condition=" '$(TargetFramework)' == 'sl5' ">$(DefineConstants);SILVERLIGHT</DefineConstants> | ||
| <DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>3</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>3</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 --> | ||
| <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'"> | ||
| <SpecificVersion>true</SpecificVersion> | ||
| </Reference> | ||
| <Reference Include="NUnitFramework" Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="!$(TargetFramework.Contains('portable'))"> | ||
| <Reference Include="mscorlib" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Numerics" Condition="'$(TargetFramework)' == 'net40'" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Net" Condition="'$(TargetFramework)' == 'sl5' " /> | ||
| <Reference Include="System.Observable" Condition="'$(TargetFramework)' == 'sl3-wp' " /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="NUnitFrameworkShims.fs" Condition="'$(TargetFramework)' == 'sl3-wp'" /> | ||
| <Compile Include="HashIfExpression.fs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj"> | ||
| <Name>FSharp.Compiler</Name> | ||
| <Project>{2e4d67b4-522d-4cf7-97e4-ba940f0b18f3}</Project> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj"> | ||
| <Name>FSharp.Core</Name> | ||
| <Project>{ded3bbd7-53f4-428a-8c9f-27968e768605}</Project> | ||
| <Private>True</Private> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" /> | ||
| </Project> |
Oops, something went wrong.