Skip to content

Commit dd4d05e

Browse files
niemyjskiniemyjski
committed
Merge branch 'main' into aspire9
2 parents 10ed60c + b3a2286 commit dd4d05e

File tree

138 files changed

+3375
-2131
lines changed

Some content is hidden

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

138 files changed

+3375
-2131
lines changed

‎k8s/exceptionless/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: exceptionless
33
version: '0.3.0'
4-
appVersion: '6.0'
4+
appVersion: '8.0'
55
home: https://github.com/exceptionless/Exceptionless
66
description: "The definition of the word exceptionless is: to be without exception. Our product provides real-time error, feature, and log reporting for your ASP.NET, Web API, WebForms, WPF, Console, and MVC apps. It organizes the gathered information into simple actionable data that will help your app become exceptionless."
7-
icon: https://be.exceptionless.io/img/exceptionless-32.png
7+
icon: https://be.exceptionless.io/img/exceptionless-32.png

‎src/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1717
<ReferenceFoundatioSource>false</ReferenceFoundatioSource>
1818
<ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
19-
<FoundatioVersion>11.0.6-alpha.0.18</FoundatioVersion>
2019
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
2120
</PropertyGroup>
2221

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
</ItemGroup>
2222
<ItemGroup>
2323
<PackageReference Include="AutoMapper" Version="13.0.1" />
24-
<PackageReference Include="FluentValidation" Version="11.10.0" />
25-
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
26-
<PackageReference Include="Foundatio.JsonNet" Version="$(FoundatioVersion)" />
24+
<PackageReference Include="FluentValidation" Version="11.11.0" />
25+
<PackageReference Include="Foundatio.Extensions.Hosting" Version="11.0.6" />
26+
<PackageReference Include="Foundatio.JsonNet" Version="11.0.6" />
2727
<PackageReference Include="MiniValidation" Version="0.9.1" />
2828
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
2929
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
3030
<PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
3131
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
3232
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
3333
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
34-
<PackageReference Include="Stripe.net" Version="47.0.0" />
34+
<PackageReference Include="Stripe.net" Version="47.1.0" />
3535
<PackageReference Include="System.DirectoryServices" Version="9.0.0" />
3636
<PackageReference Include="UAParser" Version="3.1.47" />
37-
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.12" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
37+
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.13" 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

‎src/Exceptionless.Core/Repositories/Base/RepositoryBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected override Task ValidateAndThrowAsync(T document)
3232
return _validator.ValidateAndThrowAsync(document);
3333
}
3434

35-
protected override Task PublishChangeTypeMessageAsync(ChangeType changeType, T document, IDictionary<string, object>? data = null, TimeSpan? delay = null)
35+
protected override Task PublishChangeTypeMessageAsync(ChangeType changeType, T? document, IDictionary<string, object>? data = null, TimeSpan? delay = null)
3636
{
3737
if (!NotificationsEnabled)
3838
return Task.CompletedTask;

‎src/Exceptionless.Core/Repositories/TokenRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public Task<long> RemoveAllByUserIdAsync(string userId, CommandOptionsDescriptor
5151
return RemoveAllAsync(q => q.ElasticFilter(Query<Token>.Term(t => t.UserId, userId)), options);
5252
}
5353

54-
protected override Task PublishChangeTypeMessageAsync(ChangeType changeType, Token document, IDictionary<string, object>? data = null, TimeSpan? delay = null)
54+
protected override Task PublishChangeTypeMessageAsync(ChangeType changeType, Token? document, IDictionary<string, object>? data = null, TimeSpan? delay = null)
5555
{
5656
var items = new Foundatio.Utility.DataDictionary(data ?? new Dictionary<string, object>()) {
5757
{ ExtendedEntityChanged.KnownKeys.IsAuthenticationToken, TokenType.Authentication == document?.Type },

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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="11.0.5" />
6-
<PackageReference Include="Foundatio.AWS" Version="11.0.5" />
7-
<PackageReference Include="Foundatio.AzureStorage" Version="11.0.5" />
8-
<PackageReference Include="Foundatio.Minio" Version="11.0.5" />
9-
<PackageReference Include="Foundatio.RabbitMQ" Version="11.0.5" />
10-
<PackageReference Include="Foundatio.Redis" Version="11.0.5" />
5+
<PackageReference Include="Foundatio.Aliyun" Version="11.0.6" />
6+
<PackageReference Include="Foundatio.AWS" Version="11.0.6" />
7+
<PackageReference Include="Foundatio.AzureStorage" Version="11.0.6" />
8+
<PackageReference Include="Foundatio.Minio" Version="11.0.6" />
9+
<PackageReference Include="Foundatio.RabbitMQ" Version="11.0.6" />
10+
<PackageReference Include="Foundatio.Redis" Version="11.0.6" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
1313
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.10.0-beta.1" />
1717
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
1818
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
2020
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.9.0-beta.1" />
2121
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
2222
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />

‎src/Exceptionless.Web/ClientApp.angular/components/billing/change-plan-dialog.tpl.html

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -184,21 +184,14 @@ <h4>{{::'Credit Card' | translate}}</h4>
184184
<button type="button" role="button" class="btn btn-default" ng-click="vm.cancel()">
185185
{{::'Cancel' | translate}}
186186
</button>
187-
<span ng-if="vm.isCancellingPlan()">
188-
<button type="submit" role="button" class="btn btn-primary" ng-click="vm.showIntercom()">
189-
{{::'Contact Us' | translate}}
190-
</button>
191-
</span>
192-
<span ng-if="!vm.isCancellingPlan()">
193-
<button
194-
type="submit"
195-
role="button"
196-
class="btn btn-primary"
197-
promise-button="vm.save(vm.changePlanForm.$valid)"
198-
promise-button-busy-text="{{::'Changing Plan' | translate}}"
199-
>
200-
{{::'Change Plan' | translate}}
201-
</button>
202-
</span>
187+
<button
188+
type="submit"
189+
role="button"
190+
class="btn btn-primary"
191+
promise-button="vm.save(vm.changePlanForm.$valid)"
192+
promise-button-busy-text="{{::'Changing Plan' | translate}}"
193+
>
194+
{{::'Change Plan' | translate}}
195+
</button>
203196
</div>
204197
</form>

‎src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/replace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
patterns: [
66
{
77
match: "version",
8-
replacement: process.env.UI_VERSION || "2.0.0-dev",
8+
replacement: process.env.VERSION || "8.0.0-dev",
99
},
1010
],
1111
},

‎src/Exceptionless.Web/ClientApp.angular/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)