From ea2610b14457f4cccb63ee27e6fecb7dc152c757 Mon Sep 17 00:00:00 2001
From: Nir Bar <nir.bar@panel-sw.co.il>
Date: Thu, 30 Nov 2023 11:31:28 +0200
Subject: [PATCH] Fix CodeQL github workflow

---
 .github/workflows/codeql-analysis.yml | 5 ++---
 TidyBuild.custom.props                | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1d229c19..5e6793a0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
         nuget restore
 
     - name: Build without analysis
-      run: msbuild dirs.proj -restore -p:NugetDir="" -p:FullVersion=${{ env.FULL_VERSION }} "-p:SolutionDir=${{ github.workspace }}\"
+      run: msbuild dirs.proj -restore
 
     - name: Clean PanelSwWixExtension (keep extranal code build)
       run: |
@@ -46,8 +46,7 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Build & scan
-      run: |
-        msbuild dirs.proj -restore -p:NugetDir="" -p:FullVersion=${{ env.FULL_VERSION }} "-p:SolutionDir=${{ github.workspace }}\" -p:DisableNuget=true
+      run: msbuild dirs.proj -restore -p:DisableNuget=true
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/TidyBuild.custom.props b/TidyBuild.custom.props
index b83dca54..3dd3a426 100644
--- a/TidyBuild.custom.props
+++ b/TidyBuild.custom.props
@@ -23,7 +23,6 @@
     <WindowsKitSharedDir Condition="'$(WindowsKitSharedDir)'=='' And Exists('C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\shared\')">C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\shared\</WindowsKitSharedDir>
     <WindowsKitSharedDir Condition="'$(WindowsKitSharedDir)'=='' And Exists('C:\Program Files (x86)\Windows Kits\10\Include\10.0.17134.0\shared\')">C:\Program Files (x86)\Windows Kits\10\Include\10.0.17134.0\shared\</WindowsKitSharedDir>
     <DismApiDir Condition="'$(DismApiDir)'==''">C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\SDKs\DismApi\</DismApiDir>
-    <NugetDir Condition="'$(NugetDir)'==''">$(MSBuildThisFileDirectory)..\..\Tools\</NugetDir>
 
     <DefineConstants Condition="'$(MSBuildProjectExtension)' != '.csproj'">JetVersion=$(FullVersion);JetProductName=$(ProductName);JetManufacturer=$(Manufacturer);$(DefineConstants)</DefineConstants>