Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to PackageReferences instead of paket #1285

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 23 additions & 29 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"commands": [
"paket"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "5.0.2",
"commands": [
"reportgenerator"
]
},
"fantomas": {
"version": "6.3.1",
"commands": [
"fantomas"
]
},
"fsharp-analyzers": {
"version": "0.25.0",
"commands": [
"fsharp-analyzers"
]
}
}
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-reportgenerator-globaltool": {
"version": "5.0.2",
"commands": [
"reportgenerator"
]
},
"fantomas": {
"version": "6.3.1",
"commands": [
"fantomas"
]
},
"fsharp-analyzers": {
"version": "0.25.0",
"commands": [
"fsharp-analyzers"
]
}
}
}
31 changes: 17 additions & 14 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{
"name": "F# (.NET 7.0)",
"dockerFile": "Dockerfile",
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"FSharp.useSdkScripts":true,
"FSharp.workspacePath": "FsAutoComplete.sln"
},
"onCreateCommand": "dotnet tool restore && dotnet restore",
"extensions": [
"Ionide.Ionide-fsharp",
"Ionide.Ionide-Paket",
"ms-vscode.csharp"
]
}
"name": "F# (.NET 7.0)",
"dockerFile": "Dockerfile",
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"FSharp.useSdkScripts": true,
"FSharp.workspacePath": "FsAutoComplete.sln"
},
"extensions": [
"Ionide.Ionide-fsharp",
"ms-vscode.csharp"
]
}
},
"onCreateCommand": "dotnet restore"
}
Comment on lines +2 to +18
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this because it referenced paket, but also because the json schema linting warnings said that the old format was incorrect.

43 changes: 0 additions & 43 deletions .github/workflows/bump-fcs.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ test/FsAutoComplete.Tests.Lsp/TestResults/
.tool-versions
BenchmarkDotNet.Artifacts/

*.sarif
*.sarif
560 changes: 0 additions & 560 deletions .paket/Paket.Restore.targets

This file was deleted.

38 changes: 0 additions & 38 deletions .paket/paket.targets

This file was deleted.

11 changes: 6 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"FSharp.excludeProjectDirectories": [
".git",
"paket-files",
"packages",
"test/FsAutoComplete.IntegrationTests"
"test/FsAutoComplete.IntegrationTests",
],
//otherwise take a lot of time to load proj inside
//the test directories
Expand Down Expand Up @@ -164,5 +162,8 @@
"whitespaces",
"xrtt",
"xunit"
]
}
],
"[msbuild]": {
"editor.formatOnSave": false
}
}
Comment on lines +166 to +169
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my extensions have been formatting project files - no more!

5 changes: 2 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
<Title>FsAutoComplete</Title>
<Product>FsAutoComplete</Product>
<PackageLicenseExpression Condition=" '$(PackAsTool)' != 'true' ">Apache-2.0</PackageLicenseExpression>
<NoWarn>$(NoWarn);3186,0042</NoWarn><!-- circumvent an error with the fake dependencymanager for
paket: https://github.com/dotnet/fsharp/issues/8678 -->
<NoWarn>$(NoWarn);3186,0042</NoWarn><!-- circumvent an error with the fake dependencymanager for paket: https://github.com/dotnet/fsharp/issues/8678 -->
<NoWarn>$(NoWarn);NU1902</NoWarn><!-- NU1902 - package vulnerability detected -->
<WarnOn>$(WarnOn);1182</WarnOn> <!-- Unused variables,https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/compiler-options#opt-in-warnings -->
<NoWarn>$(NoWarn);FS0044</NoWarn> <!-- Ignore deprecations -->
<NoWarn>$(NoWarn);FS0044</NoWarn><!-- Ignore deprecations -->
<WarnOn>$(WarnOn);3390</WarnOn><!-- Malformed XML doc comments -->
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
Expand Down
44 changes: 44 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
<PackageVersion Include="CliWrap" Version="3.6.6" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageVersion Include="Destructurama.FSharp" Version="2.0.0" />
<PackageVersion Include="Expecto.Diff" Version="10.2.1" />
<PackageVersion Include="Expecto" Version="10.2.1 " />
<PackageVersion Include="Fantomas.Client" Version="0.9.0" />
<PackageVersion Include="FSharp.Analyzers.SDK" Version="0.25.0" />
<PackageVersion Include="FSharp.Analyzers.Build" Version="0.2.0"/>
<PackageVersion Include="FSharp.Compiler.Service" Version="43.8.200" />
<PackageVersion Include="FSharp.Core" Version="8.0.200" />
<PackageVersion Include="FSharp.Data.Adaptive" Version="1.2.15" />
<PackageVersion Include="FSharp.UMX" Version="1.1.0" />
<PackageVersion Include="FSharpx.Async" Version="1.14.1" />
<PackageVersion Include="FsToolkit.ErrorHandling.IcedTasks" Version="4.15.2" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
<PackageVersion Include="IcedTasks" Version="0.11.5" />
<PackageVersion Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
<PackageVersion Include="Ionide.Analyzers" Version="0.10.0" />
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
<PackageVersion Include="Ionide.LanguageServerProtocol" Version="0.5.0" />
<PackageVersion Include="Ionide.ProjInfo.ProjectSystem" Version="0.64.0" />
<PackageVersion Include="LinkDotNet.Stringbuilder" Version="1.20.0" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.9.2" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry" Version="1.8.1" />
<PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageVersion Include="Serilog" Version="3.1.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.Reactive" Version="5.0.0" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions FsAutoComplete.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{1BE8AF57-B314-4C92-82A9-64CD9B7A4990}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsAutoComplete", "src\FsAutoComplete\FsAutoComplete.fsproj", "{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsAutoComplete.Core", "src\FsAutoComplete.Core\FsAutoComplete.Core.fsproj", "{4E4786F3-4566-44E1-8787-91790007F0F6}"
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ Requirements:
* .NET SDK, see [global.json](global.json) for the exact version.
Minimum: >= 6.0, Recommended: >= 7.0

1. Restore dotnet tools to install local Paket `dotnet tool restore`
2. Build FSAC with `dotnet build`
1. Build FSAC with `dotnet build`

* To build release fsautocomplete binaries in `~/bin` directory, use the `LocalRelease` target
* To build, run all tests and create packages, use the `All` target
Expand Down
4 changes: 3 additions & 1 deletion benchmarks/benchmarks.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
<ItemGroup>
<ProjectReference Include="..\src\FsAutoComplete\FsAutoComplete.fsproj" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" />
</ItemGroup>
</Project>
5 changes: 0 additions & 5 deletions benchmarks/paket.references

This file was deleted.

18 changes: 18 additions & 0 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<packageSource key="nuget">
<package pattern="*" />
</packageSource>
<!-- <packageSource key="dotnet8">
<package pattern="FSharp.Core" />
<package pattern="FSharp.Compiler.Service" />
</packageSource> -->
Comment on lines +13 to +16
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on nightly, we can just uncomment this mapping and update/outdated/etc commands will just work for these two packages. we can run dotnet list package --outdated and see what the updateable versions are

</packageSourceMapping>
</configuration>
64 changes: 0 additions & 64 deletions paket.dependencies

This file was deleted.

Loading
Loading