Skip to content

Commit cc02ca6

Browse files
baronfelbaronfel
committed
fix fsprojs to remove duplications after rebase
1 parent 188387e commit cc02ca6

File tree

11 files changed

+6
-42
lines changed

11 files changed

+6
-42
lines changed

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
@@ -25,8 +24,8 @@
2524
<ItemGroup>
2625
<Reference Include="System.Runtime" />
2726
<Reference Include="System.IO" />
28-
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
29-
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
3027
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
28+
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
29+
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3130
</ItemGroup>
3231
</Project>

‎fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
</PropertyGroup>
@@ -20,9 +19,6 @@
2019
<Link>ProjectCrackerOptions.fs</Link>
2120
</Compile>
2221
<Compile Include="ProjectCracker.fs" />
23-
<Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\net461" />
24-
<Content Include="$(ArtifactsBinDir)\fcs\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net461" />
25-
<Content Include="$(ArtifactsBinDir)\fcs\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net461" />
2622
<Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\$(FcsTargetNetFxFramework)" />
2723
<Content Include="$(ArtifactsBinDir)\fcs\$(Configuration)\$(FcsTargetNetFxFramework)\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\$(FcsTargetNetFxFramework)" />
2824
<Content Include="$(ArtifactsBinDir)\fcs\$(Configuration)\$(FcsTargetNetFxFramework)\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\$(FcsTargetNetFxFramework)" />

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
</PropertyGroup>
66
<Import Project="..\netfx.props" />
77
<PropertyGroup>
8-
<OutputType>Exe</OutputType>
9-
<TargetFrameworks>net461</TargetFrameworks>
108
<OutputType>Exe</OutputType>
119
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
1210
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -21,6 +19,8 @@
2119
<Compile Include="Program.fs" />
2220
<None Include="App.config" />
2321
<None Include="FSharp.Compiler.Service.ProjectCracker.targets" />
22+
</ItemGroup>
23+
<ItemGroup>
2424
<Reference Include="System.Runtime" />
2525
<Reference Include="System.IO" />
2626
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp2.0</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<DefaultFSharpPackageVersion>4.1.19</DefaultFSharpPackageVersion>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Import Project="..\netfx.props" />
66
<Import Project="..\..\src\buildtools\buildtools.targets" />
77
<PropertyGroup>
8-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
98
<TargetFrameworks>$(FcsTargetNetFxFramework);netstandard2.0</TargetFrameworks>
109
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1110
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>

‎fcs/samples/EditorService/EditorService.fsproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp2.0</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<OutputType>Exe</OutputType>
@@ -11,16 +10,13 @@
1110
<Compile Include="Program.fs" />
1211
<None Include="App.config" />
1312
</ItemGroup>
13+
1414
<ItemGroup>
15-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
17-
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
18-
</ItemGroup>
19-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
2015
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
2116
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2217
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
2318
</ItemGroup>
19+
2420
<ItemGroup Condition="'$(TargetFramework)' == '$(FcsTargetNetFxFramework)'">
2521
<Reference Include="System.Runtime" />
2622
<Reference Include="System.IO" />

‎fcs/samples/FscExe/FscExe.fsproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<OutputType>Exe</OutputType>
@@ -14,10 +13,6 @@
1413
</ItemGroup>
1514
<ItemGroup>
1615
<Reference Include="System.Runtime.Remoting" />
17-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
18-
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
19-
</ItemGroup>
20-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
2116
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
2217
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2318
</ItemGroup>

‎fcs/samples/FsiExe/FsiExe.fsproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<OutputType>Exe</OutputType>
@@ -16,10 +15,6 @@
1615
<ItemGroup>
1716
<Reference Include="System.Runtime.Remoting" />
1817
<Reference Include="System.Windows.Forms" />
19-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
20-
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
21-
</ItemGroup>
22-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
2318
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
2419
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2520
</ItemGroup>

‎fcs/samples/InteractiveService/InteractiveService.fsproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<OutputType>Exe</OutputType>
@@ -12,10 +11,6 @@
1211
<None Include="App.config" />
1312
</ItemGroup>
1413
<ItemGroup>
15-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
1914
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
2015
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2116
</ItemGroup>

‎fcs/samples/Tokenizer/Tokenizer.fsproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<OutputType>Exe</OutputType>
@@ -12,10 +11,6 @@
1211
<None Include="App.config" />
1312
</ItemGroup>
1413
<ItemGroup>
15-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
1914
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
2015
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2116
</ItemGroup>

‎fcs/samples/UntypedTree/UntypedTree.fsproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<TargetFrameworks>$(FcsTargetNetFxFramework)</TargetFrameworks>
65
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
76
<OutputType>Exe</OutputType>
@@ -12,10 +11,6 @@
1211
<None Include="App.config" />
1312
</ItemGroup>
1413
<ItemGroup>
15-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
1914
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
2015
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2116
</ItemGroup>

0 commit comments

Comments
 (0)