patrick/PulumiConfig
1
0
Fork 0
mirror of https://github.com/Smaug123/PulumiConfig synced 2025-10-11 03:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to net8 (#24)

Browse Source
This commit is contained in:
Patrick Stevens
2024-01-28 23:56:18 +00:00
committed by GitHub
parent a2c79d0df0
commit 6d6c107f67
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.config/dotnet-tools.json
View File

@@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"fantomas": { "fantomas": {
"version": "5.2.0-alpha-010", "version": "6.3.0-alpha-005",
"commands": [ "commands": [
"fantomas" "fantomas"
] ]

3
.editorconfig
View File

@@ -2,6 +2,7 @@ root=true
[*] [*]
charset=utf-8 charset=utf-8
end_of_line=crlf
trim_trailing_whitespace=true trim_trailing_whitespace=true
insert_final_newline=true insert_final_newline=true
indent_style=space indent_style=space
@@ -23,7 +24,7 @@ fsharp_space_before_class_constructor=true
fsharp_space_before_member=true fsharp_space_before_member=true
fsharp_space_before_colon=true fsharp_space_before_colon=true
fsharp_space_before_semicolon=true fsharp_space_before_semicolon=true
fsharp_multiline_block_brackets_on_same_column=true fsharp_multiline_bracket_style=aligned
fsharp_newline_between_type_definition_and_members=true fsharp_newline_between_type_definition_and_members=true
fsharp_align_function_signature_to_indentation=true fsharp_align_function_signature_to_indentation=true
fsharp_alternative_long_member_definitions=true fsharp_alternative_long_member_definitions=true

1
.fantomasignore Normal file
View File

@@ -0,0 +1 @@
.direnv/

2
PulumiWebServer.Test/PulumiWebServer.Test.fsproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

4
PulumiWebServer.Test/Utils.fs
View File

@@ -5,9 +5,7 @@ open System.IO
[<RequireQualifiedAccess>] [<RequireQualifiedAccess>]
module Utils = module Utils =
type Dummy = type Dummy = class end
class
end
let rec findFileAbove (fileName : string) (di : DirectoryInfo) = let rec findFileAbove (fileName : string) (di : DirectoryInfo) =
if isNull di then if isNull di then

6
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1703438236, "lastModified": 1703637592,
"narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@@ -16,8 +16,8 @@
projectFile = "./PulumiWebServer/PulumiWebServer.fsproj"; projectFile = "./PulumiWebServer/PulumiWebServer.fsproj";
testProjectFile = "./PulumiWebServer.Test/PulumiWebServer.Test.fsproj"; testProjectFile = "./PulumiWebServer.Test/PulumiWebServer.Test.fsproj";
pname = "PulumiWebServer"; pname = "PulumiWebServer";
dotnet-sdk = pkgs.dotnet-sdk_7; dotnet-sdk = pkgs.dotnet-sdk_8;
dotnet-runtime = pkgs.dotnetCorePackages.runtime_7_0; dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
version = "0.0.1"; version = "0.0.1";
dotnetTool = toolName: toolVersion: sha256: dotnetTool = toolName: toolVersion: sha256:
pkgs.stdenvNoCC.mkDerivation rec { pkgs.stdenvNoCC.mkDerivation rec {
@@ -40,7 +40,7 @@
}; };
in { in {
packages = { packages = {
fantomas = dotnetTool "fantomas" "5.2.0-alpha-010" "sha256-CuoROZBBhaK0IFjbKNLvzgX4GXwuIybqIvCtuqROBMk="; fantomas = dotnetTool "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version "sha256-Jmo7s8JMdQ8SxvNvPnryfE7n24mIgKi5cbgNwcQw3yU=";
fetchDeps = let fetchDeps = let
flags = []; flags = [];
runtimeIds = map (system: pkgs.dotnetCorePackages.systemToDotnetRid system) dotnet-sdk.meta.platforms; runtimeIds = map (system: pkgs.dotnetCorePackages.systemToDotnetRid system) dotnet-sdk.meta.platforms;
@@ -71,7 +71,7 @@
}; };
}; };
devShells = let devShells = let
requirements = [pkgs.dotnet-sdk_7 pkgs.git pkgs.alejandra pkgs.nodePackages.markdown-link-check pkgs.jq]; requirements = [pkgs.dotnet-sdk_8 pkgs.git pkgs.alejandra pkgs.nodePackages.markdown-link-check pkgs.jq];
in { in {
default = pkgs.mkShell { default = pkgs.mkShell {
buildInputs = buildInputs =

4
hooks/pre-push
View File

@@ -3,9 +3,9 @@
import subprocess import subprocess
def check_fantomas(): def check_fantomas():
result = subprocess.run(["dotnet", "tool", "run", "fantomas", "--check", "-r", "."]) result = subprocess.run(["dotnet", "tool", "run", "fantomas", "--check", "."])
if result.returncode != 0: if result.returncode != 0:
raise Exception(f"Formatting incomplete (return code: {result.returncode}). Consider running `dotnet tool run fantomas -r .`") raise Exception(f"Formatting incomplete (return code: {result.returncode}). Consider running `dotnet tool run fantomas .`")
def main(): def main():