Skip to content
Merged
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
8 changes: 1 addition & 7 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"commands": [
"paket"
]
},
"fantomas": {
"version": "6.0.1",
"commands": [
Expand All @@ -21,4 +15,4 @@
]
}
}
}
}
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,10 @@ coverage.*.xml
.paket/.store
.paket/paket

# Content docs
# Content specific
Content/Library/docs/
Content/Console/docs/
Content/Library/.paket/paket
Content/Console/.paket/paket
Content/**/package.lock.json

# fsdocs generated
tmp/
Expand Down
560 changes: 0 additions & 560 deletions .paket/Paket.Restore.targets

This file was deleted.

8 changes: 1 addition & 7 deletions Content/Console/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
"reportgenerator"
]
},
"paket": {
"version": "8.0.3",
"commands": [
"paket"
]
},
"fsharp-analyzers": {
"version": " 0.10.1",
"commands": [
Expand All @@ -27,4 +21,4 @@
]
}
}
}
}
560 changes: 0 additions & 560 deletions Content/Console/.paket/Paket.Restore.targets

This file was deleted.

34 changes: 34 additions & 0 deletions Content/Console/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
<Project>
<PropertyGroup>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<PropertyGroup>
<FakeVersion>6.1.3</FakeVersion>
</PropertyGroup>
<ItemGroup>

<PackageVersion Include="FSharp.Core" Version="8.0.403" />
<PackageVersion Include="Expecto" Version="10.2.2" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Packaging.Targets" Version="0.1.208" PrivateAssets="All" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All" />
<PackageVersion Include="altcover" Version="8.2.825" />

<PackageVersion Include="Fake.IO.FileSystem" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.Core.Target" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.Core.ReleaseNotes" Version="$(FakeVersion)" />
<PackageVersion Include="FAKE.Core.Environment" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.DotNet.Cli" Version="$(FakeVersion)" />
<PackageVersion Include="FAKE.Core.Process" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.Tools.Git" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.Api.GitHub" Version="$(FakeVersion)" />
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="$(FakeVersion)" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.441" />
<PackageVersion Include="Argu" Version="6.0" />
</ItemGroup>
</Project>
23 changes: 23 additions & 0 deletions Content/Console/NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!-- `clear` ensures no additional sources are inherited from another config file. -->
<packageSources>
<clear />
<!-- `key` can be any identifier for your source. -->
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<!-- <add key="contoso.com" value="https://contoso.com/packages/" /> -->
</packageSources>

<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/package-source-mapping -->
<!-- Define mappings by adding package patterns beneath the target source. -->
<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<!-- <packageSource key="contoso.com">
<package pattern="Contoso.*" />
<package pattern="NuGet.Common" />
</packageSource> -->
</packageSourceMapping>
</configuration>
3 changes: 0 additions & 3 deletions Content/Console/build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,6 @@ let clean _ =
)
|> Shell.cleanDirs

[ "paket-files/paket.restore.cached" ]
|> Seq.iter Shell.rm

let dotnetRestore _ =
[ sln ]
|> Seq.map (fun dir ->
Expand Down
37 changes: 26 additions & 11 deletions Content/Console/build/build.fsproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="Changelog.fs" />
<Compile Include="build.fs" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="Changelog.fs" />
<Compile Include="build.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Fake.IO.FileSystem" />
<PackageReference Include="Fake.Core.Target" />
<PackageReference Include="Fake.Core.ReleaseNotes" />
<PackageReference Include="FAKE.Core.Environment" />
<PackageReference Include="Fake.DotNet.Cli" />
<PackageReference Include="FAKE.Core.Process" />
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
<PackageReference Include="Fake.Tools.Git" />
<PackageReference Include="Fake.Api.GitHub" />
<PackageReference Include="Fake.BuildServer.GitHubActions" />
<PackageReference Include="MSBuild.StructuredLogger" />
<PackageReference Include="Argu" />
</ItemGroup>

</Project>
15 changes: 0 additions & 15 deletions Content/Console/build/paket.references

This file was deleted.

38 changes: 0 additions & 38 deletions Content/Console/paket.dependencies

This file was deleted.

Loading
Loading