Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/fsharp/fsharp
Browse files Browse the repository at this point in the history
  • Loading branch information
fsgit committed Jun 6, 2014
2 parents 2e4e86e + a5e5d57 commit 1ba625f
Show file tree
Hide file tree
Showing 9 changed files with 187 additions and 0 deletions.
@@ -0,0 +1,4 @@
namespace Sample_VS2013_FSharp_Portable_Library_net451

type Class1() =
member this.X = "F#"
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>1b9989ff-645a-4cbd-ba59-db5c201a6607</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Sample_VS2013_FSharp_Portable_Library_net451</RootNamespace>
<AssemblyName>Sample_VS2013_FSharp_Portable_Library_net451</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<TargetProfile>netcore</TargetProfile>
<TargetFSharpCoreVersion>3.3.1.259</TargetFSharpCoreVersion>
<Name>Sample_VS2013_FSharp_Portable_Library_net451</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Sample_VS2013_FSharp_Portable_Library_net451.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\Sample_VS2013_FSharp_Portable_Library_net451.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="PortableLibrary1.fs" />
<None Include="Script.fsx" />
</ItemGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.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>
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Sample_VS2013_FSharp_Portable_Library_net451", "Sample_VS2013_FSharp_Portable_Library_net451.fsproj", "{1B9989FF-645A-4CBD-BA59-DB5C201A6607}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,6 @@
// Learn more about F# at http://fsharp.net. See the 'F# Tutorial' project
// for more guidance on F# programming.

#load "PortableLibrary1.fs"
open Sample_VS2013_FSharp_Portable_Library_net451

@@ -0,0 +1,4 @@
namespace Sample_VS2013_FSharp_Portable_Library_net451

type Class1() =
member this.X = "F#"
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>1b9989ff-645a-4cbd-ba59-db5c201a6607</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Sample_VS2013_FSharp_Portable_Library_net451</RootNamespace>
<AssemblyName>Sample_VS2013_FSharp_Portable_Library_net451</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
<TargetProfile>netcore</TargetProfile>
<TargetFSharpCoreVersion>3.3.1.78</TargetFSharpCoreVersion>
<Name>Sample_VS2013_FSharp_Portable_Library_net451</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\Sample_VS2013_FSharp_Portable_Library_net451.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\Sample_VS2013_FSharp_Portable_Library_net451.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="PortableLibrary1.fs" />
<None Include="Script.fsx" />
</ItemGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.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>
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Sample_VS2013_FSharp_Portable_Library_net451", "Sample_VS2013_FSharp_Portable_Library_net451.fsproj", "{1B9989FF-645A-4CBD-BA59-DB5C201A6607}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B9989FF-645A-4CBD-BA59-DB5C201A6607}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,6 @@
// Learn more about F# at http://fsharp.net. See the 'F# Tutorial' project
// for more guidance on F# programming.

#load "PortableLibrary1.fs"
open Sample_VS2013_FSharp_Portable_Library_net451

5 changes: 5 additions & 0 deletions tests/projects/build.sh
Expand Up @@ -19,6 +19,11 @@
(cd Sample_VS2013_FSharp_Portable_Library_net451 && xbuild) &&
(cd Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013 && xbuild) &&
(cd Sample_VS2012_FSharp_Portable_Library_upgraded_2013 && xbuild) &&
(cd Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78 && xbuild) &&
echo "all projects built successfully"


# Profile 259 not yet available on CI server Mono installation:
# (cd Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile259 && xbuild)


0 comments on commit 1ba625f

Please sign in to comment.