Skip to content

Commit 2d95ac3

Browse files
Merge remote-tracking branch 'IntelliTect/main' into dev.PageIndicator
2 parents c23fe65 + 23ff1d6 commit 2d95ac3

File tree

9 files changed

+18
-10
lines changed

9 files changed

+18
-10
lines changed

.github/workflows/Build-Test-And-Deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build, Test, and Deploy EssentialCSharp.Web
33
on:
44
push:
55
branches: ["main"]
6-
pull_request_target:
6+
pull_request:
77
branches: ["main"]
88
workflow_dispatch:
99

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "CodeQL"
33
on:
44
push:
55
branches: [ "main" ]
6-
pull_request_target:
6+
pull_request:
77
branches: [ "main" ]
88
schedule:
99
- cron: '21 15 * * 5'

Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
10-
<AccessToNugetFeed>true</AccessToNugetFeed>
1110

1211
<!-- https://aka.ms/vs-build-acceleration -->
1312
<AccelerateBuildsInVisualStudio>True</AccelerateBuildsInVisualStudio>
1413
<UserSecretsId>18e91e0d-ea2d-490f-b77e-ec008f9d09ec</UserSecretsId>
1514
</PropertyGroup>
16-
</Project>
15+
</Project>

Directory.Packages.props

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
5-
<ToolingPackagesVersion>1.1.1.4406</ToolingPackagesVersion>
5+
<ToolingPackagesVersion>1.1.1.4415</ToolingPackagesVersion>
6+
<AccessToNugetFeed>true</AccessToNugetFeed>
7+
<RestoreSources>
8+
https://api.nuget.org/v3/index.json;
9+
</RestoreSources>
10+
<RestoreSources Condition="$(AccessToNugetFeed)">
11+
$(RestoreSources);
12+
https://pkgs.dev.azure.com/intelliTect/_packaging/EssentialCSharp/nuget/v3/index.json;
13+
</RestoreSources>
614
</PropertyGroup>
715
<ItemGroup Condition="$(AccessToNugetFeed)">
816
<PackageVersion Include="ContentFeedNuget" Version="$(ToolingPackagesVersion)" />
917
</ItemGroup>
1018
<ItemGroup>
1119
<PackageVersion Include="EssentialCSharp.Shared.Models" Version="$(ToolingPackagesVersion)" />
1220
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
13-
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.2.0" />
21+
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.3.0" />
1422
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
1523
<PackageVersion Include="HtmlAgilityPack" Version="1.11.70" />
1624
<PackageVersion Include="IntelliTect.Multitool" Version="1.5.2" />

EssentialCSharp.Web/wwwroot/css/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ a:hover {
317317
top: calc(100vh - 9rem);
318318
top: calc(100dvh - 9rem);
319319
display: flex;
320+
z-index: 99999;
320321
justify-content: space-between;
321322
position: -webkit-sticky; /* Safari */
322323
position: sticky;

EssentialCSharp.Web/wwwroot/lib/vue-window-size/composition-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@vue/compiler-dom": "^3.2.45",
1818
"@vue/runtime-core": "^3.2.45",
1919
"@vue/test-utils": "^2.2.7",
20-
"happy-dom": "^8.1.4",
20+
"happy-dom": "^15.10.1",
2121
"tsup": "^6.5.0",
2222
"typescript": "^4.9.4",
2323
"vite": "^4.0.4",

EssentialCSharp.Web/wwwroot/lib/vue-window-size/mixin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@vue/compiler-dom": "^3.2.45",
1717
"@vue/runtime-core": "^3.2.45",
1818
"@vue/test-utils": "^2.2.7",
19-
"happy-dom": "^8.1.4",
19+
"happy-dom": "^15.10.1",
2020
"tsup": "^6.5.0",
2121
"typescript": "^4.9.4",
2222
"vite": "^4.0.4",

EssentialCSharp.Web/wwwroot/lib/vue-window-size/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@types/node": "^18.11.18",
4646
"@vitest/coverage-c8": "^0.27.1",
4747
"@vue/compiler-dom": "^3.2.45",
48-
"happy-dom": "^8.1.4",
48+
"happy-dom": "^15.10.1",
4949
"husky": "^8.0.3",
5050
"lint-staged": "^13.1.0",
5151
"nx": "^15.5.1",

EssentialCSharp.Web/wwwroot/lib/vue-window-size/plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@vue/compiler-dom": "^3.2.45",
1717
"@vue/runtime-core": "^3.2.45",
1818
"@vue/test-utils": "^2.2.7",
19-
"happy-dom": "^8.1.4",
19+
"happy-dom": "^15.10.1",
2020
"tsup": "^6.5.0",
2121
"typescript": "^4.9.4",
2222
"vite": "^4.0.4",

0 commit comments

Comments
 (0)