diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fcc7e9f6..b39c3477 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,14 +26,9 @@ jobs:
with:
languages: csharp
- - name: Setup NuGet.exe for use with actions
- uses: NuGet/setup-nuget@v1.0.2
- with:
- nuget-version: latest
-
- name: Build OSS Gadget
run: |
- nuget restore OSSGadget.sln -ConfigFile NuGet.Config
+ dotnet restore OSSGadget.sln
dotnet build -c Release
working-directory: ./src
diff --git a/Pipelines/core-pipeline.yml b/Pipelines/core-pipeline.yml
index 6d809b77..456e959a 100644
--- a/Pipelines/core-pipeline.yml
+++ b/Pipelines/core-pipeline.yml
@@ -37,13 +37,11 @@ stages:
displayName: Install Nuget Tool
inputs:
versionSpec: '5.4.x'
- - task: NuGetCommand@2
- displayName: NuGet Restore
+ - task: DotNetCoreCLI@2
+ displayName: Dotnet Restore
inputs:
command: 'restore'
- restoreSolution: 'src/OSSGadget.sln'
- feedsToUse: 'config'
- nugetConfigPath: 'src/NuGet.Config'
+ projects: 'src/oss-tests/oss-tests.csproj'
verbosityRestore: 'Normal'
- task: DotNetCoreCLI@2
displayName: Dotnet Test
diff --git a/Pipelines/recursiveextractor-pipeline.yml b/Pipelines/recursiveextractor-pipeline.yml
index b586e9b5..0908bc34 100644
--- a/Pipelines/recursiveextractor-pipeline.yml
+++ b/Pipelines/recursiveextractor-pipeline.yml
@@ -35,13 +35,11 @@ stages:
displayName: Install Nuget Tool
inputs:
versionSpec: '5.4.x'
- - task: NuGetCommand@2
- displayName: NuGet Restore
+ - task: DotNetCoreCLI@2
+ displayName: Dotnet Restore
inputs:
command: 'restore'
- restoreSolution: 'src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj'
- feedsToUse: 'config'
- nugetConfigPath: 'src/NuGet.Config'
+ projects: 'src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj'
verbosityRestore: 'Normal'
- task: DotNetCoreCLI@2
displayName: Dotnet Test
diff --git a/src/NuGet.Config b/src/NuGet.Config
deleted file mode 100644
index 65f07aa8..00000000
--- a/src/NuGet.Config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj b/src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj
index 166ace8c..5630d87a 100644
--- a/src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj
+++ b/src/RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj
@@ -10,8 +10,18 @@
-
-
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/src/RecursiveExtractor/RecursiveExtractor.csproj b/src/RecursiveExtractor/RecursiveExtractor.csproj
index 130b397e..5705a028 100644
--- a/src/RecursiveExtractor/RecursiveExtractor.csproj
+++ b/src/RecursiveExtractor/RecursiveExtractor.csproj
@@ -25,7 +25,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/oss-tests/oss-tests.csproj b/src/oss-tests/oss-tests.csproj
index 31e226fa..c1d54ca6 100644
--- a/src/oss-tests/oss-tests.csproj
+++ b/src/oss-tests/oss-tests.csproj
@@ -9,10 +9,10 @@
-
-
-
-
+
+
+
+