Skip to content

Commit b9fa64f

Browse files
niemyjskiniemyjski
committed
Merge branch 'main' into feature/aspire
2 parents 50a3ba1 + 56a9ff5 commit b9fa64f

File tree

169 files changed

+3083
-1237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+3083
-1237
lines changed

‎.github/workflows/build.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,10 @@ jobs:
121121
with:
122122
fetch-depth: 0
123123

124-
- name: Setup .NET Core
125-
uses: actions/setup-dotnet@v4
126-
with:
127-
dotnet-version: 8.0.*
128-
#dotnet-quality: preview
129-
130124
- name: Cache node_modules
131125
uses: actions/cache@v4
132126
with:
133-
path: |
134-
node_modules
127+
path: node_modules
135128
key: node-modules-${{ hashFiles('package-lock.json') }}
136129

137130
- name: Setup Node.js environment

‎src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Product>Exceptionless</Product>
66
<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
77
<MinVerTagPrefix>v</MinVerTagPrefix>
8-
<Copyright>Copyright (c) 2023 Exceptionless. All rights reserved.</Copyright>
8+
<Copyright>Copyright (c) 2024 Exceptionless. All rights reserved.</Copyright>
99
<RepositoryUrl>https://github.com/exceptionless/exceptionless</RepositoryUrl>
1010
<Authors>Exceptionless</Authors>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -15,7 +15,7 @@
1515
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1616
<ReferenceFoundatioSource>false</ReferenceFoundatioSource>
1717
<ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
18-
<FoundatioVersion>10.7.0</FoundatioVersion>
18+
<FoundatioVersion>10.7.1</FoundatioVersion>
1919
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
2020
</PropertyGroup>
2121

‎src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
2626
<PackageReference Include="Foundatio.JsonNet" Version="$(FoundatioVersion)" />
2727
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
28-
<PackageReference Include="Handlebars.Net" Version="2.1.4" />
28+
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
2929
<PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
3030
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
31-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
31+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
3232
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
33-
<PackageReference Include="Stripe.net" Version="43.17.0" />
33+
<PackageReference Include="Stripe.net" Version="43.22.0" />
3434
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
3535
<PackageReference Include="UAParser" Version="3.1.47" />
3636

37-
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.7" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
37+
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.8" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
3838
<ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
3939
</ItemGroup>
4040
</Project>

‎src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
<ItemGroup>
33
<PackageReference Include="Geocoding.Google" Version="4.0.1" />
44
<PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
5-
<PackageReference Include="Foundatio.Aliyun" Version="10.7.0" />
6-
<PackageReference Include="Foundatio.AWS" Version="10.7.0" />
7-
<PackageReference Include="Foundatio.AzureStorage" Version="10.7.0" />
8-
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
9-
<PackageReference Include="Foundatio.Minio" Version="10.7.0" />
10-
<PackageReference Include="Foundatio.RabbitMQ" Version="10.7.0" />
11-
<PackageReference Include="Foundatio.Redis" Version="10.7.0" />
5+
<PackageReference Include="Foundatio.Aliyun" Version="10.7.1" />
6+
<PackageReference Include="Foundatio.AWS" Version="10.7.1" />
7+
<PackageReference Include="Foundatio.AzureStorage" Version="10.7.1" />
8+
<PackageReference Include="Foundatio.Minio" Version="10.7.1" />
9+
<PackageReference Include="Foundatio.RabbitMQ" Version="10.7.1" />
10+
<PackageReference Include="Foundatio.Redis" Version="10.7.1" />
1211
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
1312
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1413
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
1514
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
1716
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
1817
<PackageReference Include="MailKit" Version="4.4.0" />
1918
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
2019
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
2120
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
2221
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
2322
<PackageReference Include="Serilog.Sinks.ExceptionLess" Version="4.0.0" />
24-
<PackageReference Include="StackExchange.Redis" Version="2.7.27" />
23+
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
2524
<PackageReference Include="YamlDotNet" Version="15.1.2" />
2625
</ItemGroup>
2726
<ItemGroup>

‎src/Exceptionless.Job/Exceptionless.Job.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
</ItemGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.3" />
8-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
7+
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.4" />
8+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
99
<PackageReference Include="App.Metrics.AspNetCore" Version="4.3.0" />
1010
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
1111
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
1212
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
1313

14-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
14+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.0" />
16+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
17+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
20+
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
2121
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/Exceptionless.Web/ClientApp.angular/app/app.tpl.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
></a>
3131
</span>
3232
<span class="visible-xs">
33-
&copy; 2023 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
33+
&copy; 2024 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
3434
<a
3535
href="https://exceptionless.com/privacy/"
3636
target="_blank"
@@ -43,7 +43,7 @@
4343
>
4444
</span>
4545
<span class="hidden-xs">
46-
&copy; 2023 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
46+
&copy; 2024 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
4747
<a href="https://exceptionless.com/news/" target="_blank" class="m-l-sm text-muted">News</a>
4848
<a href="https://exceptionless.com/privacy/" target="_blank" class="m-l-sm text-muted">Privacy Policy</a>
4949
<a href="https://exceptionless.com/terms/" target="_blank" class="m-l-sm text-muted">Terms of Use</a>

‎src/Exceptionless.Web/ClientApp.angular/app/auth/signup-controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148

149149
this.$onInit = function $onInit() {
150150
vm._source = "app.auth.Signup";
151-
vm._canSignup = !!ENABLE_ACCOUNT_CREATION;
151+
vm._canSignup = !!ENABLE_ACCOUNT_CREATION || !!$stateParams.token;
152152
vm.authenticate = authenticate;
153153
vm.isExternalLoginEnabled = isExternalLoginEnabled;
154154
vm.signup = signup;

‎src/Exceptionless.Web/ClientApp/.vscode/extensions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"recommendations": [
33
"svelte.svelte-vscode",
44
"bradlc.vscode-tailwindcss",
5-
"digitalbrainstem.javascript-ejs-support",
65
"dbaeumer.vscode-eslint",
76
"esbenp.prettier-vscode",
87
"selemondev.vscode-shadcn-svelte",

‎src/Exceptionless.Web/ClientApp/.vscode/settings.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"debug.allowBreakpointsEverywhere": true,
33
"cSpell.words": [
44
"clsx",
5+
"cmdk",
56
"colour",
7+
"echarts",
8+
"formsnap",
69
"haserror",
710
"iconify",
811
"keyof",
@@ -16,6 +19,8 @@
1619
"satellizer",
1720
"sessionend",
1821
"shadcn",
22+
"sonner",
23+
"superforms",
1924
"tailwindcss",
2025
"tanstack"
2126
],
@@ -43,5 +48,10 @@
4348
"tailwindCSS.includeLanguages": {
4449
"svelte": "html"
4550
},
46-
"typescript.tsdk": "node_modules\\typescript\\lib"
51+
"typescript.tsdk": "node_modules\\typescript\\lib",
52+
"workbench.editor.customLabels.patterns": {
53+
"**/routes/**/+page.svelte": "${dirname(1)}/${dirname}",
54+
"**/routes/**/+layout.svelte": "${dirname}/+layout.svelte",
55+
"**/lib/**/index.ts": "${dirname}/index.ts"
56+
}
4757
}

0 commit comments

Comments
 (0)