Skip to content
This repository has been archived by the owner on Oct 31, 2021. It is now read-only.

Commit

Permalink
Merge pull request #16 from letrec/master
Browse files Browse the repository at this point in the history
Changed TargetFrameworkVersion to v4.0
  • Loading branch information
funnelweb committed Dec 8, 2012
2 parents 7ff74f7 + eea42d5 commit da35bb7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
Expand Up @@ -15,7 +15,7 @@
<ProjectGuid>{6fc3b299-23cb-4098-998d-06c014431807}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>FSharp.PowerPack.Compatibility</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TreatWarningsAsErrors>
</TreatWarningsAsErrors>
<DocumentationFile>FSharp.PowerPack.Compatibility.xml</DocumentationFile>
Expand Down
Expand Up @@ -18,7 +18,7 @@
<OutputType>Library</OutputType>
<RootNamespace>FSharp.PowerPack.Unittests</RootNamespace>
<AssemblyName>FSharp.PowerPack.Unittests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StrongName>false</StrongName>
<!--->ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB}</ProjectTypeGuids-->
Expand Down Expand Up @@ -85,6 +85,7 @@
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core"/>
<Reference Include="System.Numerics" Condition="'$(TargetFrameworkVersion)' == 'v4.0'" />
<Reference Condition="'$(TargetFramework)' == ''" Include="System.Data" />
<Reference Condition="'$(TargetFramework)' == ''" Include="System.Data.Linq" />
<Reference Condition="'$(TargetFramework)' == ''" Include="System.Drawing" />
Expand Down
3 changes: 2 additions & 1 deletion src/FSharp.PowerPack/FSharp.PowerPack.fsproj
Expand Up @@ -15,7 +15,7 @@
<ProjectGuid>{649FA588-F02E-457C-9FCF-87E46407481F}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>FSharp.PowerPack</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TreatWarningsAsErrors>
</TreatWarningsAsErrors>
<DocumentationFile>FSharp.PowerPack.xml</DocumentationFile>
Expand Down Expand Up @@ -108,6 +108,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Numerics" Condition="'$(TargetFrameworkVersion)' == 'v4.0'" />
<Reference Condition="'$(TargetFramework)' == 'Silverlight'" Include="System.Net" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
Expand Down

0 comments on commit da35bb7

Please sign in to comment.