fix: Merge branch 'master' into fix/bump-snyk-python-plugin

Makefile

@@ -79,7 +79,7 @@ clean-prepack: clean-package-files
 	@rm -f prepack
 
 .PHONY: clean-ts
-clean-ts: 
+clean-ts:
 	@npm run clean
 	@rm -f -r $(BINARY_RELEASES_FOLDER_TS_CLI)
 
@@ -183,7 +183,7 @@ $(BINARY_WRAPPER_DIR)/src/generated/sha256sums.txt:
 build-binary-wrapper: pre-build-binary-wrapper $(BINARY_WRAPPER_DIR)/src/generated/version $(BINARY_WRAPPER_DIR)/src/generated/sha256sums.txt
 	@echo "-- Building Typescript Binary Wrapper ($(BINARY_WRAPPER_DIR)/dist/)"
 	@cd $(BINARY_WRAPPER_DIR); npm run build
-	
+
 .PHONY: clean-binary-wrapper
 clean-binary-wrapper:
 	@rm -f $(BINARY_WRAPPER_DIR)/config.default.json
@@ -273,3 +273,18 @@ format:
 ls-protocol-metadata: $(BINARY_RELEASES_FOLDER_TS_CLI)/version
 	@echo "-- Generating protocol metadata"
 	@pushd $(EXTENSIBLE_CLI_DIR) && $(MAKE) generate-ls-protocol-metadata bindir=$(WORKING_DIR)/$(BINARY_OUTPUT_FOLDER) && popd
+
+.PHONY: run
+run: build require-args
+	$(wildcard $(WORKING_DIR)/$(BINARY_OUTPUT_FOLDER)/snyk-*) $(ARGS)
+
+.PHONY: run-ts
+run-ts: require-args
+	@npm install
+	npm run dev "$(ARGS)"
+
+.PHONY: require-args
+require-args:
+ifndef ARGS
+	$(error cannot run: ARGS is undefined)
+endif

package.json

@@ -43,7 +43,8 @@
     "test:unit": "jest --runInBand --testPathPattern '/test(/jest)?/unit/'",
     "test:acceptance": "jest --runInBand --testPathPattern '/test(/jest)?/acceptance/'",
     "test:tap": "tap -Rspec --timeout=300 test/tap/*.test.* ",
-    "test:smoke": "./scripts/run-smoke-tests-locally.sh"
+    "test:smoke": "./scripts/run-smoke-tests-locally.sh",
+    "dev": "ts-node ./src/cli/index.ts"
   },
   "keywords": [
     "security",
@@ -121,7 +122,7 @@
     "snyk-module": "3.1.0",
     "snyk-mvn-plugin": "3.1.0",
     "snyk-nodejs-lockfile-parser": "1.52.10",
-    "snyk-nuget-plugin": "2.3.3",
+    "snyk-nuget-plugin": "2.4.0",
     "snyk-php-plugin": "1.9.2",
     "snyk-policy": "^1.25.0",
     "snyk-python-plugin": "2.0.8",

test/acceptance/workspaces/nuget-app-8-custom-output-path/.gitignore

@@ -0,0 +1,4 @@
+bin/
+obj/**
+obj/**/
+!*.assets.json

test/acceptance/workspaces/nuget-app-8-custom-output-path/Directory.Build.props

@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
+    <ProjectRelativePath>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</ProjectRelativePath>
+    <BaseOutputPath>$(RepoRoot)dist/$(ProjectRelativePath)</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)</OutputPath>
+    <BaseIntermediateOutputPath>$(RepoRoot)random-output/company/$(ProjectRelativePath)/obj</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+</Project>
+

test/acceptance/workspaces/nuget-app-8-custom-output-path/Program.cs

@@ -0,0 +1,7 @@
+// See https://aka.ms/new-console-template for more information
+
+using System;
+
+Console.WriteLine("Hello, World!");
+
+var client = new System.Net.Http.HttpClient();

test/acceptance/workspaces/nuget-app-8-custom-output-path/program.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
+  </ItemGroup>
+</Project>