Skip to content

Commit 9993d81

Browse files
author
dotnet-automerge-bot
authored
Merge pull request #6539 from Microsoft/merges/master-to-dev16.1
Merge master to dev16.1
2 parents 1cacfaf + 5cf2d97 commit 9993d81

27 files changed

Lines changed: 37 additions & 56 deletions

‎fcs/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323

2424
<!-- SDK targets override -->
2525
<PropertyGroup>
26-
<ProtoOutputPath>$(ArtifactsBinDir)\FSharp.Build\Proto\net46</ProtoOutputPath>
26+
<ProtoOutputPath>$(ArtifactsBinDir)\FSharp.Build\Proto\net472</ProtoOutputPath>
2727
</PropertyGroup>
2828
</Project>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
<Reference Include="System.Runtime" />
3030
<Reference Include="System.IO" />
3131
<PackageReference Include="FSharp.Core" Version="4.6.2" />
32-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
33-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
34-
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3532
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
3633
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3734
</ItemGroup>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
<Reference Include="System.Runtime" />
2929
<Reference Include="System.IO" />
3030
<PackageReference Include="FSharp.Core" Version="4.6.2" />
31-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
32-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
33-
<PackageReference Include="FSharp.Core" Version="4.1.18" />
3431
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3532
</ItemGroup>
3633
</Project>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@
639639
</ItemGroup>
640640
<ItemGroup>
641641
<PackageReference Include="FSharp.Core" Version="4.6.2" />
642-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
643642
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
644643
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
645644
</ItemGroup>

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
</ItemGroup>
1414
<ItemGroup>
1515
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
17-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
1816
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1917
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
2018
</ItemGroup>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<ItemGroup>
1616
<Reference Include="System.Runtime.Remoting" />
1717
<PackageReference Include="FSharp.Core" Version="4.6.2" />
18-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
19-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
2018
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2119
</ItemGroup>
2220
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

‎fcs/samples/FsiExe/FsiExe.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<Reference Include="System.Runtime.Remoting" />
1818
<Reference Include="System.Windows.Forms" />
1919
<PackageReference Include="FSharp.Core" Version="4.6.2" />
20-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
21-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
2220
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2321
</ItemGroup>
2422
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

‎fcs/samples/InteractiveService/InteractiveService.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
</ItemGroup>
1414
<ItemGroup>
1515
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
17-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
1816
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1917
</ItemGroup>
2018
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

‎fcs/samples/Tokenizer/Tokenizer.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
</ItemGroup>
1414
<ItemGroup>
1515
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
17-
<PackageReference Include="FSharp.Core" Version="4.1.19" />
1816
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1917
</ItemGroup>
2018
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

‎fcs/samples/UntypedTree/UntypedTree.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
</ItemGroup>
1414
<ItemGroup>
1515
<PackageReference Include="FSharp.Core" Version="4.6.2" />
16-
<PackageReference Include="FSharp.Core" Version="4.5.2" />
17-
<PackageReference Include="FSharp.Core" Version="4.1.29" />
1816
<ProjectReference Include="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1917
</ItemGroup>
2018
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

0 commit comments

Comments
 (0)