Permalink
Browse files

Update to new Visual F# project system and v1.9.5.4 of F#

  • Loading branch information...
1 parent 48370db commit 1dd447ff6f597d01e91ed9af23d85ac932004c61 Harry Pierson committed Aug 14, 2008
View
@@ -1,4 +1,5 @@
-*.dll
-*.pdb
-*.exe
-*.suo
+old/*
+*.SCC
+*.suo
+*/*/bin/*
+*/*/obj/*
@@ -1,68 +0,0 @@
-"General"
-{
-"ProjectIdGuid" = "{B07E7515-ABC3-4491-8EC0-BA4C8E6A6C3C}"
-}
-"Configurations"
-{
- "Debug|Win32"
- {
- "ProjectType" = "DLL"
- "OptLevel" = "Off"
- "StrongNamingLevel" = "None"
- "OutputPath" = ""
- "SearchPath" = "-R \"..\\..\\External\\xunit.dll\" -R \"..\\..\\External\\FsTest.dll\" -R \"D:\\HPierson.Files\\Projects\\Quinault\\Cashel\\Cashel\\cashel.dll\""
- "StrongNameFile" = ""
- "OutputBase" = ""
- "CustomCommandLine" = ""
- "CustomCompiler" = ""
- "DebugCheck" = "TRUE"
- "CustomCompilationCheck" = "FALSE"
- "DebugStartMode" = "0"
- "StartApp" = "D:\\HPierson.Files\\Projects\\Quinault\\External\\xunit.console.exe"
- "StartAppPath" = ""
- "CustomStartupArguments" = "cashel.tests.dll /wait "
- }
- "Release|Win32"
- {
- "ProjectType" = "DLL"
- "OptLevel" = "3"
- "StrongNamingLevel" = "None"
- "OutputPath" = ""
- "SearchPath" = "-I \"..\\..\\External\" -R \"xunit.dll\" -R \"FsUtil.dll\""
- "StrongNameFile" = ""
- "OutputBase" = ""
- "CustomCommandLine" = ""
- "CustomCompiler" = ""
- "DebugCheck" = "FALSE"
- "CustomCompilationCheck" = "FALSE"
- "DebugStartMode" = "0"
- "StartApp" = ""
- "StartAppPath" = ""
- "CustomStartupArguments" = ""
- }
-}
-"Files"
-{
- "parser.tests.fs"
- {
- "ProjRelPath" = "T"
- }
- "primitives.test.fs"
- {
- "ProjRelPath" = "T"
- }
- "peg.test.fs"
- {
- "ProjRelPath" = "T"
- }
- "peg2.test.fs"
- {
- "ProjRelPath" = "T"
- }
-}
-"ProjStartupServices"
-{
-}
-"Globals"
-{
-}
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{25d2af80-078e-46a1-8ebb-01a905dbad48}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>Cashel.Tests</RootNamespace>
+ <AssemblyName>Cashel.Tests</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <Name>Cashel.Tests</Name>
+ </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>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <StartAction>Program</StartAction>
+ <StartProgram>D:\HPierson.Files\Projects\Quinault\External\xunit.console.exe</StartProgram>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <StartArguments>..\Cashel\Cashel.Tests\bin\Debug\Cashel.Tests.dll /wait</StartArguments>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="FsTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+ <Name>FsTest</Name>
+ <AssemblyName>FsTest.dll</AssemblyName>
+ <HintPath>..\..\External\FsTest.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="xunit, Version=1.0.2.1283, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+ <Name>xunit</Name>
+ <AssemblyName>xunit.dll</AssemblyName>
+ <HintPath>..\..\External\xunit.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="peg2_test.fs" />
+ <Compile Include="parser_test.fs" />
+ <Compile Include="peg_test.fs" />
+ <Compile Include="primitives_test.fs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Cashel\Cashel.fsproj">
+ <Name>Cashel</Name>
+ <Project>{6b89dd99-f2d4-4c0b-9a9a-12ae0028edd1}</Project>
+ <Private>True</Private>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildExtensionsPath)\FSharp\1.0\Microsoft.FSharp.Targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -50,7 +50,7 @@ let test_combine_both_fail () =
[<Fact>]
let test_monad_zero () =
- let p = parse { if false then return 't' }
+ let p = parser { if false then return 't' }
p "test" |> should equal None
Oops, something went wrong. Retry.

0 comments on commit 1dd447f

Please sign in to comment.