Skip to content

Commit

Permalink
Svelte + General updates #1480
Browse files Browse the repository at this point in the history
  • Loading branch information
niemyjski authored Feb 8, 2024
2 parents d026d62 + e5f07b5 commit 4868719
Show file tree
Hide file tree
Showing 286 changed files with 15,950 additions and 15,720 deletions.
12 changes: 8 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ csharp_indent_labels = one_less_than_current
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion

# avoid this. unless absolutely necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion
dotnet_style_qualification_for_field = false:error
dotnet_style_qualification_for_property = false:error
dotnet_style_qualification_for_method = false:error
dotnet_style_qualification_for_event = false:error

# Types: use keywords instead of BCL types, and permit var only when the type is clear
csharp_style_var_for_built_in_types = false:suggestion
Expand Down Expand Up @@ -154,6 +154,10 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# Custom
csharp_style_namespace_declarations = file_scoped:error
dotnet_diagnostic.IDE0005.severity = error # Using directive is unnecessary.

# C++ Files
[*.{cpp,h,in}]
curly_bracket_next_line = true
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/build-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ on:
push:
tags:
- "v*"
env:
TERM: xterm
DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_NOLOGO: true
MSBUILDTERMINALLOGGER: auto

jobs:
build:
Expand All @@ -13,11 +19,11 @@ jobs:
runs-on: buildjet-2vcpu-ubuntu-2204-arm
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.*
#dotnet-quality: preview
Expand All @@ -33,17 +39,17 @@ jobs:
echo "VERSION=$version" >> $GITHUB_ENV
echo "### Version: $version" >> $GITHUB_STEP_SUMMARY
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: linux/arm64
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ env:
DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_NOLOGO: true
MSBUILDTERMINALLOGGER: auto
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

jobs:
Expand All @@ -19,7 +20,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -29,7 +30,7 @@ jobs:
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.*
#dotnet-quality: preview
Expand All @@ -50,12 +51,12 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.*
#dotnet-quality: preview
Expand All @@ -64,7 +65,7 @@ jobs:
working-directory: docker
run: docker compose up -d elasticsearch &

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: nuget-${{ runner.os }}-${{ hashFiles('**/packages.lock.json') }}
Expand Down Expand Up @@ -116,27 +117,27 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.*
#dotnet-quality: preview

- name: Cache node_modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
key: node-modules-${{ hashFiles('package-lock.json') }}

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Install Npm Packages
run: npm ci
Expand All @@ -161,13 +162,13 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Docker Buildx
if: "${{ env.DOCKER_USERNAME != '' }}"
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64

Expand Down Expand Up @@ -199,15 +200,15 @@ jobs:
- name: Login to GitHub Container Registry
if: "${{ env.DOCKER_USERNAME != '' }}"
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Login to DockerHub
if: "${{ env.DOCKER_USERNAME != '' }}"
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ env.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down Expand Up @@ -260,7 +261,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/elasticsearch-docker-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v') != true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.*
#dotnet-quality: preview
Expand All @@ -32,14 +32,14 @@ jobs:
echo "VERSION=$version" >> $GITHUB_ENV
echo "### Version: $version" >> $GITHUB_STEP_SUMMARY
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64,linux/arm64
- name: Build custom Elasticsearch 7.x docker image
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/elasticsearch-docker-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v') != true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.*
#dotnet-quality: preview
Expand All @@ -32,14 +32,14 @@ jobs:
echo "VERSION=$version" >> $GITHUB_ENV
echo "### Version: $version" >> $GITHUB_STEP_SUMMARY
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64,linux/arm64
- name: Build custom Elasticsearch 8.x docker image
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"]

# completely self-contained 7.x

FROM exceptionless/elasticsearch:7.17.16 AS exceptionless7
FROM exceptionless/elasticsearch:7.17.18 AS exceptionless7

WORKDIR /app
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
Expand Down
2 changes: 1 addition & 1 deletion build/docker/elasticsearch/7.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://www.docker.elastic.co/
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.16
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.18

RUN elasticsearch-plugin install -b mapper-size
RUN elasticsearch-plugin install -b repository-azure
Expand Down
2 changes: 1 addition & 1 deletion build/docker/elasticsearch/8.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://www.docker.elastic.co/
FROM docker.elastic.co/elasticsearch/elasticsearch:8.11.3
FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.1

RUN elasticsearch-plugin install -b mapper-size
RUN elasticsearch-plugin install -b repository-azure
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.7x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
elasticsearch:
image: exceptionless/elasticsearch:7.17.16
image: exceptionless/elasticsearch:7.17.18
environment:
discovery.type: single-node
xpack.security.enabled: "false"
Expand All @@ -16,7 +16,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:7.17.16
image: docker.elastic.co/kibana/kibana:7.17.18
ports:
- 5601:5601

Expand Down
8 changes: 4 additions & 4 deletions docker/docker-compose.apm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
setup:
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.3
image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1
volumes:
- certs:/usr/share/elasticsearch/config/certs
user: "0"
Expand Down Expand Up @@ -53,7 +53,7 @@ services:
depends_on:
setup:
condition: service_healthy
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.3
image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1
volumes:
- certs:/usr/share/elasticsearch/config/certs
- esdata:/usr/share/elasticsearch/data
Expand Down Expand Up @@ -98,7 +98,7 @@ services:
depends_on:
elasticsearch:
condition: service_healthy
image: docker.elastic.co/kibana/kibana:8.11.3
image: docker.elastic.co/kibana/kibana:8.12.1
volumes:
- certs:/usr/share/kibana/config/certs
ports:
Expand All @@ -124,7 +124,7 @@ services:
depends_on:
elasticsearch:
condition: service_healthy
image: docker.elastic.co/apm/apm-server:8.11.3
image: docker.elastic.co/apm/apm-server:8.12.1
volumes:
- certs:/usr/share/apm-server/certs
ports:
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- appdata:/app/storage

elasticsearch:
image: exceptionless/elasticsearch:8.11.3
image: exceptionless/elasticsearch:8.12.1
environment:
discovery.type: single-node
xpack.security.enabled: "false"
Expand All @@ -64,7 +64,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.11.3
image: docker.elastic.co/kibana/kibana:8.12.1
ports:
- 5601:5601

Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
elasticsearch:
image: exceptionless/elasticsearch:8.11.3
image: exceptionless/elasticsearch:8.12.1
environment:
node.name: elasticsearch
cluster.name: exceptionless
Expand All @@ -18,7 +18,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.11.3
image: docker.elastic.co/kibana/kibana:8.12.1
environment:
xpack.security.enabled: "false"
ports:
Expand Down
4 changes: 2 additions & 2 deletions src/Exceptionless.Core/Exceptionless.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<EmbeddedResource Include="Mail\Templates\user-password-reset.html" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
<PackageReference Include="Foundatio.JsonNet" Version="$(FoundatioVersion)" />
Expand All @@ -30,7 +30,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Stripe.net" Version="43.11.0" />
<PackageReference Include="Stripe.net" Version="43.13.0" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
<PackageReference Include="UAParser" Version="3.1.47" />

Expand Down
Loading

0 comments on commit 4868719

Please sign in to comment.