Merge remote-tracking branch 'IntelliTect/main' into dev.PageIndicator

IntelliTect · Dec 4, 2024 · 2d95ac3 · 2d95ac3
2 parents c23fe65 + 23ff1d6
commit 2d95ac3
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/Build-Test-And-Deploy.yml b/.github/workflows/Build-Test-And-Deploy.yml
@@ -3,7 +3,7 @@ name: Build, Test, and Deploy EssentialCSharp.Web
 on:
   push:
     branches: ["main"]
-  pull_request_target:
+  pull_request:
     branches: ["main"]
   workflow_dispatch:
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -3,7 +3,7 @@ name: "CodeQL"
 on:
   push:
     branches: [ "main" ]
-  pull_request_target:
+  pull_request:
     branches: [ "main" ]
   schedule:
     - cron: '21 15 * * 5'

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,10 +7,9 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AccessToNugetFeed>true</AccessToNugetFeed>
 
     <!-- https://aka.ms/vs-build-acceleration -->
     <AccelerateBuildsInVisualStudio>True</AccelerateBuildsInVisualStudio>
     <UserSecretsId>18e91e0d-ea2d-490f-b77e-ec008f9d09ec</UserSecretsId>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,15 +2,23 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    <ToolingPackagesVersion>1.1.1.4406</ToolingPackagesVersion>
+    <ToolingPackagesVersion>1.1.1.4415</ToolingPackagesVersion>
+    <AccessToNugetFeed>true</AccessToNugetFeed>
+    <RestoreSources>
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
+    <RestoreSources Condition="$(AccessToNugetFeed)">
+      $(RestoreSources);
+      https://pkgs.dev.azure.com/intelliTect/_packaging/EssentialCSharp/nuget/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
   <ItemGroup Condition="$(AccessToNugetFeed)">
     <PackageVersion Include="ContentFeedNuget" Version="$(ToolingPackagesVersion)" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="EssentialCSharp.Shared.Models" Version="$(ToolingPackagesVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
-    <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.2.0" />
+    <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.3.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="HtmlAgilityPack" Version="1.11.70" />
     <PackageVersion Include="IntelliTect.Multitool" Version="1.5.2" />

diff --git a/EssentialCSharp.Web/wwwroot/css/styles.css b/EssentialCSharp.Web/wwwroot/css/styles.css
@@ -317,6 +317,7 @@ a:hover {
   top: calc(100vh - 9rem);
   top: calc(100dvh - 9rem);
   display: flex;
+  z-index: 99999; 
   justify-content: space-between;
   position: -webkit-sticky; /* Safari */
   position: sticky;

diff --git a/EssentialCSharp.Web/wwwroot/lib/vue-window-size/composition-api/package.json b/EssentialCSharp.Web/wwwroot/lib/vue-window-size/composition-api/package.json
@@ -17,7 +17,7 @@
     "@vue/compiler-dom": "^3.2.45",
     "@vue/runtime-core": "^3.2.45",
     "@vue/test-utils": "^2.2.7",
-    "happy-dom": "^8.1.4",
+    "happy-dom": "^15.10.1",
     "tsup": "^6.5.0",
     "typescript": "^4.9.4",
     "vite": "^4.0.4",

diff --git a/EssentialCSharp.Web/wwwroot/lib/vue-window-size/mixin/package.json b/EssentialCSharp.Web/wwwroot/lib/vue-window-size/mixin/package.json
@@ -16,7 +16,7 @@
     "@vue/compiler-dom": "^3.2.45",
     "@vue/runtime-core": "^3.2.45",
     "@vue/test-utils": "^2.2.7",
-    "happy-dom": "^8.1.4",
+    "happy-dom": "^15.10.1",
     "tsup": "^6.5.0",
     "typescript": "^4.9.4",
     "vite": "^4.0.4",

diff --git a/EssentialCSharp.Web/wwwroot/lib/vue-window-size/package.json b/EssentialCSharp.Web/wwwroot/lib/vue-window-size/package.json
@@ -45,7 +45,7 @@
     "@types/node": "^18.11.18",
     "@vitest/coverage-c8": "^0.27.1",
     "@vue/compiler-dom": "^3.2.45",
-    "happy-dom": "^8.1.4",
+    "happy-dom": "^15.10.1",
     "husky": "^8.0.3",
     "lint-staged": "^13.1.0",
     "nx": "^15.5.1",

diff --git a/EssentialCSharp.Web/wwwroot/lib/vue-window-size/plugin/package.json b/EssentialCSharp.Web/wwwroot/lib/vue-window-size/plugin/package.json
@@ -16,7 +16,7 @@
     "@vue/compiler-dom": "^3.2.45",
     "@vue/runtime-core": "^3.2.45",
     "@vue/test-utils": "^2.2.7",
-    "happy-dom": "^8.1.4",
+    "happy-dom": "^15.10.1",
     "tsup": "^6.5.0",
     "typescript": "^4.9.4",
     "vite": "^4.0.4",