Skip to content

Add tuple tests to portable47 #1702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 6 commits into from
Nov 4, 2016
Merged

Add tuple tests to portable47 #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a4afaf
Add tuple tests to profile47 fsharp core unit tests
KevinRansom Nov 3, 2016
d135f0f
Merge https://github.com/Microsoft/visualfsharp into addtupleteststop…
KevinRansom Nov 3, 2016
e8da030
remove duplicated line
KevinRansom Nov 3, 2016
bf80d4e
Use publish to deploy lkg
KevinRansom Nov 4, 2016
d69fd03
Revert "Use publish to deploy lkg"
KevinRansom Nov 4, 2016
5232f8f
Remove dup lines
KevinRansom Nov 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
<Reference Include="System.ValueTuple" Condition="'$(TargetFramework)' != 'portable47'">
<Reference Include="System.ValueTuple">
<HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
<HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
Copy link
Contributor

@dsyme dsyme Nov 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why all these different versions? Why not just one version?

<HintPath Condition=" '$(TargetFramework)' != 'coreclr' and '$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="TupleSample" Condition="'$(TargetFramework)' != 'portable47'">
<Reference Include="TupleSample">
<HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">FSharp.Core\SampleTuples\4.0.0-rc3-24212-01\TupleSample.dll</HintPath>
<HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">FSharp.Core\SampleTuples\4.4.0-beta-24631-01\TupleSample.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -93,29 +94,29 @@
</ItemGroup>
<ItemGroup>
<Compile Include="LibraryTestFx.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition="'$(TargetFramework)' != 'portable47'" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
Copy link
Contributor

@dsyme dsyme Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate line?

Copy link
Contributor Author

@KevinRansom KevinRansom Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep

<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule2.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array2Module.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array3Module.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array4Module.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition="'$(TargetFramework)' != 'portable47'" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
Copy link
Contributor

@dsyme dsyme Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate line?

<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ComparisonIdentityModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\HashIdentityModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule2.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteListFunctions.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListType.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition="'$(TargetFramework)' != 'portable47'" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapType.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SetModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SetType.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqModule2.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteSeqFunctions.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition="'$(TargetFramework)' != 'portable47'" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition="'$(TargetFramework)' != 'portable47'" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition=" '$(TargetFramework)' != 'portable47' " />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
<Compile Include="FSharp.Core\PrimTypes.fs" />
<Compile Include="FSharp.Core\ComparersRegression.fs" />
Expand All @@ -138,7 +139,7 @@
<Compile Include="FSharp.Core\Microsoft.FSharp.Reflection\FSharpReflection.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Quotations\FSharpQuotations.fs" />
<Compile Include="TypeForwarding.fs" />
<Compile Include="StructTuples.fs" Condition="'$(TargetFramework)' != 'portable47'" />
<Compile Include="StructTuples.fs" />
<Compile Include="SurfaceArea.$(TargetFramework).fs" />
<Compile Include="Program.fs" Condition="'$(TargetFramework)' == 'coreclr'" />
<CustomCopyLocal Include="FSharp.Core.Unittests.dll.config">
Expand Down
Binary file modified ...fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.4.0-beta-24631-01/TupleSample.dll
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
<RootNamespace>TupleSample</RootNamespace>
<AssemblyName>TupleSample</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectGuid>{224C7102-CD32-4B92-AEA7-9147F8E70E44}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<DebugType>pdbonly</DebugType>
Expand All @@ -24,7 +25,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System.ValueTuple">
<HintPath>..\..\..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
<HintPath>..\..\..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down