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

Migrate from Paket to NuGet CPM #211

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
42 changes: 15 additions & 27 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "6.0.0",
"commands": [
"fake"
]
},
"octonav": {
"version": "0.0.1",
"commands": [
"octonav"
]
},
"fantomas": {
"version": "6.1.2",
"commands": [
"fantomas"
]
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "6.0.0",
"commands": [
"fake"
]
},
"fantomas": {
"version": "6.1.2",
"commands": [
"fantomas"
]
}
}
}
}
10 changes: 0 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,6 @@ end_of_line = crlf
[*.{ps1, psm1}]
end_of_line = crlf

# Paket files
[paket.*]
trim_trailing_whitespace = true
indent_size = 2

[*.paket.references]
trim_trailing_whitespace = true
indent_size = 2


# YAML Files
[*.{yml,yaml}]
indent_size = 2
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ _Pvt_Extensions
# Repo-specific files

.dotnetsdk
/paket-files/
/test/testrun/
/test/testrun_ws/
msbuild.binlog
Expand Down
557 changes: 0 additions & 557 deletions .paket/Paket.Restore.targets

This file was deleted.

1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"FSharp.excludeProjectDirectories": [
".git",
"paket-files",
"test/testrun",
"test/testrun_ws",
"test/testrun_ws_fcs",
Expand Down
7 changes: 7 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<!-- All projects need repro builds + versioning -->
<ItemGroup Label="Build-data packages">
<PackageReference Include="DotNet.ReproducibleBuilds" IncludeAssets="build;buildMultiTargeting" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" IncludeAssets="build;buildMultiTargeting"/>
</ItemGroup>
</Project>
39 changes: 39 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
<DisableImplicitLibraryPacksFolder>true</DisableImplicitLibraryPacksFolder>
<MicrosoftBuildPackageVersion>17.3.2</MicrosoftBuildPackageVersion>
<FakeVersion>6.1.1</FakeVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="FSharp.Core" Version="8.0.400" />
<PackageVersion Include="FSharp.Compiler.Service" Version="43.8.400" />
<PackageVersion Include="Argu" Version="6.1.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="FSharp.Control.Reactive" Version="5.0.5" />
<PackageVersion Include="SemanticVersioning" Version="2.0.2" />

<!-- MSBuild dependency - important: this should always be ExcludeAssets="runtime", and it should be kept low based
on the SDK versions we want to support. See https://aka.ms/dotnet/matrixofpaine for version details. -->
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" />

<!-- Test packages -->
<PackageVersion Include="Expecto" Version="10.2.1" />
<PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
<PackageVersion Include="Expecto.Diff" Version="10.2.1" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="MedallionShell" Version="1.6.2" />

<!-- CI/Build-related packages -->
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
<PackageVersion Include="Fake.Core.Target" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.DotNet.Cli" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.Core.UserInput" Version="$(FakeVersion)" />
</ItemGroup>
</Project>
10 changes: 8 additions & 2 deletions build/build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,11 @@
<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>

<ItemGroup>
<PackageReference Include="Fake.Core.Target" />
<PackageReference Include="Fake.DotNet.Cli" />
<PackageReference Include="Fake.Core.UserInput" />

</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions build/paket.references

This file was deleted.

10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "6.0.400",
"rollForward": "latestMajor",
"allowPrerelease": true
}
"sdk": {
"version": "6.0.400",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}
15 changes: 0 additions & 15 deletions install_mono_from_microsoft_deb_packages.sh

This file was deleted.

12 changes: 12 additions & 0 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
52 changes: 0 additions & 52 deletions paket.dependencies

This file was deleted.

Loading
Loading