Skip to content
This repository was archived by the owner on Jul 11, 2018. It is now read-only.

Commit c5fcae7

Browse files
tbroust-trepiatbroust-trepia
committed
Splits F# projects into another solution
1 parent 8297125 commit c5fcae7

File tree

4 files changed

+83
-16
lines changed

4 files changed

+83
-16
lines changed

‎CommandLine.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{D9
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{751E6303-1623-4418-B298-4FF97DA5C86E}"
1515
EndProject
16-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CommandLine.FSharp", "src\CommandLine.FSharp\CommandLine.FSharp.fsproj", "{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}"
17-
EndProject
18-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CommandLine.FSharp.Tests", "src\CommandLine.FSharp.Tests\CommandLine.FSharp.Tests.fsproj", "{54235AC4-60F1-4A3F-B218-3896B794043D}"
19-
EndProject
2016
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C37353EF-032B-484B-B0BD-ABDED8589732}"
2117
ProjectSection(SolutionItems) = preProject
2218
.nuget\packages.config = .nuget\packages.config
@@ -36,14 +32,6 @@ Global
3632
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
3733
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
3834
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{54235AC4-60F1-4A3F-B218-3896B794043D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{54235AC4-60F1-4A3F-B218-3896B794043D}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{54235AC4-60F1-4A3F-B218-3896B794043D}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{54235AC4-60F1-4A3F-B218-3896B794043D}.Release|Any CPU.Build.0 = Release|Any CPU
4735
EndGlobalSection
4836
GlobalSection(SolutionProperties) = preSolution
4937
HideSolutionNode = FALSE

‎CommandLine_FSharp.sln‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Tests", "src\CommandLine.Tests\CommandLine.Tests.csproj", "{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{D9C1F005-94A7-4A2A-81F3-9C053D5A6AEC}"
9+
ProjectSection(SolutionItems) = preProject
10+
doc\LICENSE = doc\LICENSE
11+
README.md = README.md
12+
EndProjectSection
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{751E6303-1623-4418-B298-4FF97DA5C86E}"
15+
EndProject
16+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CommandLine.FSharp", "src\CommandLine.FSharp\CommandLine.FSharp.fsproj", "{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}"
17+
EndProject
18+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CommandLine.FSharp.Tests", "src\CommandLine.FSharp.Tests\CommandLine.FSharp.Tests.fsproj", "{54235AC4-60F1-4A3F-B218-3896B794043D}"
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C37353EF-032B-484B-B0BD-ABDED8589732}"
21+
ProjectSection(SolutionItems) = preProject
22+
.nuget\packages.config = .nuget\packages.config
23+
EndProjectSection
24+
EndProject
25+
Global
26+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
27+
Debug|Any CPU = Debug|Any CPU
28+
Release|Any CPU = Release|Any CPU
29+
EndGlobalSection
30+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
31+
{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{DFB97974-E2CC-42E6-BEB6-B6403FCB8B63}.Release|Any CPU.Build.0 = Release|Any CPU
43+
{54235AC4-60F1-4A3F-B218-3896B794043D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44+
{54235AC4-60F1-4A3F-B218-3896B794043D}.Debug|Any CPU.Build.0 = Debug|Any CPU
45+
{54235AC4-60F1-4A3F-B218-3896B794043D}.Release|Any CPU.ActiveCfg = Release|Any CPU
46+
{54235AC4-60F1-4A3F-B218-3896B794043D}.Release|Any CPU.Build.0 = Release|Any CPU
47+
EndGlobalSection
48+
GlobalSection(SolutionProperties) = preSolution
49+
HideSolutionNode = FALSE
50+
EndGlobalSection
51+
GlobalSection(MonoDevelopProperties) = preSolution
52+
StartupItem = src\CommandLine\CommandLine.csproj
53+
EndGlobalSection
54+
EndGlobal

‎src/CommandLine.FSharp.Tests/CommandLine.FSharp.Tests.fsproj‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<Name>CommandLine.FSharp.Tests</Name>
1414
<ProductVersion>12.0.0</ProductVersion>
15+
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -34,7 +35,7 @@
3435
</PropertyGroup>
3536
<ItemGroup>
3637
<Reference Include="mscorlib" />
37-
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
38+
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
3839
<Reference Include="System" />
3940
<Reference Include="System.Core" />
4041
<Reference Include="System.Numerics" />
@@ -51,7 +52,18 @@
5152
<PropertyGroup>
5253
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
5354
</PropertyGroup>
54-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
55+
<Choose>
56+
<When Condition="'$(VisualStudioVersion)' == '11.0'">
57+
<PropertyGroup>
58+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
59+
</PropertyGroup>
60+
</When>
61+
<Otherwise>
62+
<PropertyGroup>
63+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
64+
</PropertyGroup>
65+
</Otherwise>
66+
</Choose>
5567
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5668
Other similar extension points exist, see Microsoft.Common.targets.
5769
<Target Name="BeforeBuild">

‎src/CommandLine.FSharp/CommandLine.FSharp.fsproj‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<Name>CommandLine.FSharp</Name>
1414
<ProductVersion>12.0.0</ProductVersion>
15+
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -38,7 +39,7 @@
3839
</PropertyGroup>
3940
<ItemGroup>
4041
<Reference Include="mscorlib" />
41-
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
42+
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
4243
<Reference Include="System" />
4344
<Reference Include="System.Core" />
4445
<Reference Include="System.Numerics" />
@@ -56,7 +57,19 @@
5657
<PropertyGroup>
5758
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
5859
</PropertyGroup>
59-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
60+
<Choose>
61+
<When Condition="'$(VisualStudioVersion)' == '11.0'">
62+
<PropertyGroup>
63+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
64+
</PropertyGroup>
65+
</When>
66+
<Otherwise>
67+
<PropertyGroup>
68+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
69+
</PropertyGroup>
70+
</Otherwise>
71+
</Choose>
72+
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
6073
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6174
Other similar extension points exist, see Microsoft.Common.targets.
6275
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)