diff --git a/msbuild/Base128/justfile b/msbuild/Base128/justfile index 81cd23d..e089a81 100644 --- a/msbuild/Base128/justfile +++ b/msbuild/Base128/justfile @@ -2,9 +2,9 @@ git_repo := "https://github.com/Wojmik/Base128.git" git_ref := "Version_1.2.2" dll_name := "Base128.dll" lib_name := "Base128" -out_dir := invocation_directory() / "build" dotnet_framework := "netstandard2.1" csproj_relative_path := "Base128" / "Base128.csproj" +out_dir := invocation_directory() / "build" working_dir := `mktemp -d` repo_dir := working_dir / "repo" @@ -21,7 +21,7 @@ clean: clone: git clone --single-branch --branch {{git_ref}} {{git_repo}} {{repo_dir}} -build: +build: clone dotnet build {{csproj_path}} --configuration Release -o {{dotnet_artifact_dir}} --framework {{dotnet_framework}} assemble_upm: clone build && clean @@ -29,4 +29,4 @@ assemble_upm: clone build && clean cp {{dotnet_artifact_dir / dll_name}} {{upm_contents_dir}} cp package.json {{upm_contents_dir}} mkdir -p {{out_dir}} - tar -cvf {{out_dir / lib_name}}.tgz -C {{upm_contents_dir}} . + npm pack --pack-destination {{out_dir}} {{upm_contents_dir}} diff --git a/msbuild/SimpleBase/justfile b/msbuild/SimpleBase/justfile index e37b575..991ef57 100644 --- a/msbuild/SimpleBase/justfile +++ b/msbuild/SimpleBase/justfile @@ -21,7 +21,7 @@ clean: clone: git clone --single-branch --branch {{git_ref}} {{git_repo}} {{repo_dir}} -build: +build: clone dotnet build {{csproj_path}} --configuration Release -o {{dotnet_artifact_dir}} --framework {{dotnet_framework}} assemble_upm: clone build && clean @@ -29,4 +29,4 @@ assemble_upm: clone build && clean cp {{dotnet_artifact_dir / dll_name}} {{upm_contents_dir}} cp package.json {{upm_contents_dir}} mkdir -p {{out_dir}} - tar -cvf {{out_dir / lib_name}}.tgz -C {{upm_contents_dir}} . + npm pack --pack-destination {{out_dir}} {{upm_contents_dir}} diff --git a/nix/devShells.nix b/nix/devShells.nix index e4fc6ba..8a0179d 100644 --- a/nix/devShells.nix +++ b/nix/devShells.nix @@ -14,6 +14,7 @@ in dotnet just nixpkgs-fmt + nodejs_23 roslyn-ls ]) ++ pkgs.lib.optional pkgs.stdenv.isDarwin [ pkgs.libiconv