Merge remote-tracking branch 'origin/master' into kusto-functions-sup…

…port
ErikEJ · Oct 13, 2024 · 81a7683 · 81a7683
2 parents 3942728 + 567598b
commit 81a7683
Show file tree

Hide file tree

Showing 17 changed files with 104 additions and 1,450 deletions.
diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml
@@ -69,7 +69,7 @@ jobs:
         mkdir vsix
         7z x src/GUI/lib/efreveng80.exe.zip -oefreveng80 -y
         dir /a:-d /s /b "efreveng80" | find /c ":\" > filecount.txt
-        findstr "158" filecount.txt
+        findstr "157" filecount.txt
 
     - name: Extract and verify efreveng90.exe.zip file count
       shell: cmd
@@ -92,21 +92,21 @@ jobs:
         findstr "79" filecount.txt
 
     - name: Move build output
-      if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && github.event_name == 'push'  
+      if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && (github.event_name == 'push' ||  github.event_name == 'workflow_dispatch')
       run: |
         mv src/GUI/EFCorePowerTools/bin/Release/EFCorePowerTools.vsix EFCorePowerTools-${{ env.VERSION }}.vsix
         mv src/GUI/PowerToolsExtensionPack/bin/Release/PowerToolsExtensionPack.vsix PowerToolsExtensionPack-${{ env.VERSION }}.vsix
 
     - name: Publish artifacts
-      if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && github.event_name == 'push'
+      if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && (github.event_name == 'push' ||  github.event_name == 'workflow_dispatch')
       uses: actions/upload-artifact@v4
       with:
         name: Artifacts
         path: |
           *.vsix
 
     - name: Publish to Open VSIX Gallery
-      if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && github.event_name == 'push'
+      if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && (github.event_name == 'push' ||  github.event_name == 'workflow_dispatch')
       run: |
         $ErrorActionPreference='Stop'
         (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex

diff --git a/src/Core/NUnitTestCore/CliObjectListTest.cs b/src/Core/NUnitTestCore/CliObjectListTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -98,6 +98,22 @@ public void CanAddStartsWithFilterAndExplicitInclude()
             ClassicAssert.AreEqual(3, result.Count);
         }
 
+        [Test]
+        public void MultipleExclusionWildcardExcludes()
+        {
+            var config = GetConfig();
+
+            config.Tables.Add(new Table { ExclusionWildcard = "*Users*" });
+            config.Tables.Add(new Table { ExclusionWildcard = "*Accounts*" });
+            config.Views.Add(new View { ExclusionWildcard = "*Users*" });
+
+            var result = CliConfigMapper.BuildObjectList(config);
+
+            ClassicAssert.NotNull(result);
+
+            ClassicAssert.AreEqual(3, result.Count);
+        }
+
         [Test]
         public void CanAddEndsWithFilter()
         {

diff --git a/src/Core/NUnitTestCore/Dacpac/ProblemGetTableValuedFunctions.dacpac b/src/Core/NUnitTestCore/Dacpac/ProblemGetTableValuedFunctions.dacpac