Skip to content

Commit 3ada7a4

Browse files
tcx4c70razzmatazz
tcx4c70
authored and
razzmatazz
committed
refactor: Change to CPM
Signed-off-by: Adam Tao <[email protected]>
1 parent decbf3c commit 3ada7a4

File tree

5 files changed

+83
-19
lines changed

5 files changed

+83
-19
lines changed

‎Directory.Build.props

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<Title>csharp-ls</Title>
5+
<Product>csharp-ls</Product>
6+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
7+
<ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>
12+
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="All" />
13+
</ItemGroup>
14+
15+
</Project>

‎Directory.Build.targets

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<ItemGroup Condition=" '$(EnableCentralPackageVersions)' != 'false' ">
3+
<!--
4+
Workaround the issue where FSharp SDK adds implicit PackageReference items but doesn't mark them as such
5+
https://github.com/NuGet/Home/issues/11949
6+
-->
7+
<PackageReference Update="FSharp.Core"
8+
Condition="'$(MSBuildProjectExtension)' == '.fsproj' And '$(DisableImplicitFSharpCoreReference)' != 'true' And '$(UpdateImplicitFSharpCoreReference)' != 'false'"
9+
IsImplicitlyDefined="true" />
10+
</ItemGroup>
11+
</Project>

‎Directory.Packages.props

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<RoslynPackageVersion>4.7.0</RoslynPackageVersion>
10+
<MSBuildPackageVersion>17.7.2</MSBuildPackageVersion>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageVersion Include="Argu" Version="6.1.1" />
15+
<PackageVersion Include="Castle.Core" Version="5.1.1" />
16+
<PackageVersion Include="coverlet.collector" Version="3.0.3" />
17+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
18+
<PackageVersion Include="Expecto" Version="9.0.4" />
19+
<PackageVersion Include="FSharpPlus" Version="1.4.1" />
20+
<PackageVersion Include="ICSharpCode.Decompiler" Version="8.1.1.7464" />
21+
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
22+
<PackageVersion Include="Ionide.LanguageServerProtocol" Version="0.4.23" />
23+
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
24+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
25+
<PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
26+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(RoslynPackageVersion)" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynPackageVersion)" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynPackageVersion)" />
29+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynPackageVersion)" />
30+
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(RoslynPackageVersion)" />
31+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynPackageVersion)" />
32+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(RoslynPackageVersion)" />
33+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
34+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
35+
<PackageVersion Include="NUnit" Version="3.13.2" />
36+
<PackageVersion Include="NUnit3TestAdapter" Version="4.0.0" />
37+
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
38+
</ItemGroup>
39+
</Project>

‎src/CSharpLanguageServer/CSharpLanguageServer.fsproj

+14-15
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,25 @@
5252
</ItemGroup>
5353

5454
<ItemGroup>
55-
<PackageReference Include="Argu" Version="6.1.1" />
56-
<PackageReference Include="Castle.Core" Version="5.1.1" />
57-
<PackageReference Include="ICSharpCode.Decompiler" Version="8.1.1.7464" />
58-
<PackageReference Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" PrivateAssets="All" />
59-
<PackageReference Include="Ionide.LanguageServerProtocol" Version="0.4.23" />
60-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
61-
<PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
62-
<PackageReference Include="Microsoft.Build" Version="17.7.2" ExcludeAssets="runtime" />
63-
<PackageReference Include="Microsoft.Build.Framework" Version="17.7.2" ExcludeAssets="runtime" />
64-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.7.0">
55+
<PackageReference Include="Argu" />
56+
<PackageReference Include="Castle.Core" />
57+
<PackageReference Include="ICSharpCode.Decompiler" />
58+
<PackageReference Include="Ionide.LanguageServerProtocol" />
59+
<PackageReference Include="Newtonsoft.Json" />
60+
<PackageReference Include="Microsoft.Build.Locator" />
61+
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
62+
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
63+
<PackageReference Include="Microsoft.CodeAnalysis">
6564
<NoWarn>NU1604</NoWarn>
6665
<NoWarn>NU1701</NoWarn>
6766
</PackageReference>
68-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0">
67+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp">
6968
<NoWarn>NU1604</NoWarn>
7069
<NoWarn>NU1701</NoWarn>
7170
</PackageReference>
72-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0" />
73-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
74-
<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.7.0" />
75-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0" />
71+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
72+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
73+
<PackageReference Include="Microsoft.CodeAnalysis.Features" />
74+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
7675
</ItemGroup>
7776
</Project>

‎tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
15-
<PackageReference Include="NUnit" Version="3.13.2" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
17-
<PackageReference Include="coverlet.collector" Version="3.0.3" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
15+
<PackageReference Include="NUnit" />
16+
<PackageReference Include="NUnit3TestAdapter" />
17+
<PackageReference Include="coverlet.collector" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)