Skip to content

Commit 0a29fbf

Browse files
baronfelbaronfel
committed
fix some project and package references that were mangled in the rebase
1 parent 4d6aebe commit 0a29fbf

5 files changed

Lines changed: 1 addition & 54 deletions

File tree

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

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,8 @@
2525
<ItemGroup>
2626
<Reference Include="System.Runtime" />
2727
<Reference Include="System.IO" />
28-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
2928
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
30-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
31-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
32-
<Private>false</Private>
33-
</Reference>
34-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
35-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Engine.dll</HintPath>
36-
<Private>false</Private>
37-
</Reference>
38-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
39-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.dll</HintPath>
40-
<Private>false</Private>
41-
</Reference>
42-
<Reference Include="Microsoft.Build.Utilities.v12.0">
43-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Utilities.v12.0.dll</HintPath>
44-
<Private>false</Private>
45-
</Reference>
46-
<Reference Include="Microsoft.Build.Tasks.v12.0">
47-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
48-
<Private>false</Private>
49-
</Reference>
50-
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
5129
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
52-
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
30+
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
5631
</ItemGroup>
5732
</Project>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ItemGroup>
3131
<Reference Include="System.Runtime" />
3232
<Reference Include="System.IO" />
33-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
3433
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
3534
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3635
</ItemGroup>

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
1515
<OtherFlags>$(OtherFlags) --staticlink:FSharp.Core</OtherFlags>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17-
<IsPackable>false</IsPackable>
1817
</PropertyGroup>
1918
<ItemGroup>
2019
<Compile Include="ProjectCrackerOptions.fs" />
@@ -24,27 +23,6 @@
2423
<None Include="FSharp.Compiler.Service.ProjectCracker.targets" />
2524
<Reference Include="System.Runtime" />
2625
<Reference Include="System.IO" />
27-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
28-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
29-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
30-
<Private>false</Private>
31-
</Reference>
32-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
33-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Engine.dll</HintPath>
34-
<Private>false</Private>
35-
</Reference>
36-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
37-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.dll</HintPath>
38-
<Private>false</Private>
39-
</Reference>
40-
<Reference Include="Microsoft.Build.Utilities.v12.0">
41-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Utilities.v12.0.dll</HintPath>
42-
<Private>false</Private>
43-
</Reference>
44-
<Reference Include="Microsoft.Build.Tasks.v12.0">
45-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
46-
<Private>false</Private>
47-
</Reference>
4826
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
4927
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
5028
</ItemGroup>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
</CopyAndSubstituteText>
8484
</ItemGroup>
8585
<ItemGroup>
86-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
8786
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
8887
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
8988
<PackageReference Include="NUnit" Version="3.9.0" />
@@ -108,9 +107,6 @@
108107
<Reference Include="System.Xaml" />
109108
<Reference Include="WindowsBase" />
110109
<Reference Include="UIAutomationTypes" />
111-
<!-- disabled until all project files are converted to .NET SDK -->
112-
<!-- <ProjectReference Include="$(FSharpSourcesRoot)\..\tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj" /> -->
113-
<ProjectReference Include="$(FSharpSourcesRoot)\..\fcs\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj" />
114110
<ProjectReference Include="CSharp_Analysis\CSharp_Analysis.csproj" />
115111
<ProjectReference Include="..\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj" />
116112
</ItemGroup>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,6 @@
657657
</Compile>
658658
</ItemGroup>
659659
<ItemGroup>
660-
<PackageReference Include="FSharp.Core" Version="4.6.2" />
661660
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
662661
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
663662
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />

0 commit comments

Comments
 (0)