Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"features": {
"ghcr.io/devcontainers/features/dotnet:2.5.0": {
"version": "2.5.0",
"resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0fc16547ed4db6d7ff2a9f5981d2b93eb314e568affb9958029ad794f1f9a093",
"integrity": "sha256:0fc16547ed4db6d7ff2a9f5981d2b93eb314e568affb9958029ad794f1f9a093"
}
}
}
7 changes: 6 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{

"name": "Exceptionless.Net",
"image": "mcr.microsoft.com/vscode/devcontainers/dotnetcore:latest",
"image": "mcr.microsoft.com/devcontainers/dotnet:2.2.2-10.0-noble",
"features": {
"ghcr.io/devcontainers/features/dotnet:2.5.0": {
"version": "10.0"
}
},
"extensions": [
"ms-dotnettools.csharp",
"streetsidesoftware.code-spell-checker",
Expand Down
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,24 @@ updates:
semver-major-days: 7
semver-minor-days: 7
semver-patch-days: 7

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
cooldown:
default-days: 7

- package-ecosystem: devcontainers
directory: "/"
schedule:
interval: weekly
cooldown:
default-days: 7

- package-ecosystem: dotnet-sdk
directory: "/"
schedule:
interval: daily
cooldown:
default-days: 1
9 changes: 6 additions & 3 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ on: [push, pull_request]
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
permissions:
contents: read
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 0
persist-credentials: false
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json
- name: Build Reason
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
- name: Build Version
shell: bash
run: |
dotnet tool install --global minver-cli --version 6.0.0
dotnet tool install --global minver-cli --version 7.0.0
version=$(minver --tag-prefix v)
echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
- name: Build
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ on: [push, pull_request]
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
permissions:
contents: read
jobs:
build:
runs-on: macOS-latest
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 0
persist-credentials: false
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json
- name: Build Reason
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
- name: Build Version
shell: bash
run: |
dotnet tool install --global minver-cli --version 6.0.0
dotnet tool install --global minver-cli --version 7.0.0
version=$(minver --tag-prefix v)
echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
- name: Build
Expand Down
27 changes: 14 additions & 13 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,28 @@ on: [push, pull_request]
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
permissions:
contents: read
packages: write
jobs:
build:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 0
persist-credentials: false
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json
- name: Build Reason
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
- name: Build Version
shell: bash
run: |
dotnet tool install --global minver-cli --version 6.0.0
dotnet tool install --global minver-cli --version 7.0.0
version=$(minver --tag-prefix v)
echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
- name: Build
Expand All @@ -30,27 +34,24 @@ jobs:
- name: Package
if: github.event_name != 'pull_request'
run: dotnet pack --configuration Release --no-build Exceptionless.Net.Windows.slnx
- name: Install GitHub Package Tool
if: github.event_name != 'pull_request'
run: dotnet tool install gpr -g
- name: Publish CI Packages
shell: bash
if: github.event_name != 'pull_request'
run: |
for package in $(find -name "*.nupkg" | grep "minver" -v); do
while IFS= read -r -d '' package; do
echo "${0##*/}": Pushing $package...

# GitHub
gpr push $package -k ${{ secrets.GITHUB_TOKEN }} || true
dotnet nuget push "$package" --source https://nuget.pkg.github.com/Exceptionless/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate || true
Comment thread
niemyjski marked this conversation as resolved.

# Feedz (remove once GitHub supports anonymous access)
dotnet nuget push $package --source https://f.feedz.io/exceptionless/exceptionless/nuget --api-key ${{ secrets.FEEDZ_KEY }} --skip-duplicate
done
dotnet nuget push "$package" --source https://f.feedz.io/exceptionless/exceptionless/nuget --api-key ${{ secrets.FEEDZ_KEY }} --skip-duplicate
done < <(find . -name '*.nupkg' ! -path '*minver*' -print0)
- name: Publish Release Packages
shell: bash
if: startsWith(github.ref, 'refs/tags/v')
run: |
for package in $(find -name "*.nupkg" | grep "minver" -v); do
while IFS= read -r -d '' package; do
echo "${0##*/}": Pushing $package...
dotnet nuget push $package --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
done
dotnet nuget push "$package" --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
done < <(find . -name '*.nupkg' ! -path '*minver*' -print0)
2 changes: 1 addition & 1 deletion build/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.300" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.400" PrivateAssets="All"/>
<PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" />
<PackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100",
"version": "10.0.400",
"rollForward": "latestMinor"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.9" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.11" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="3.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="3.0.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="3.3.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<AWSProjectType>Lambda</AWSProjectType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.4.7" />
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="10.1.1" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.101.1" />
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="10.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Platforms\Exceptionless.AspNetCore\Exceptionless.AspNetCore.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Exceptionless/Exceptionless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'" Label="Package References">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.11" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Reflection.Metadata" Version="8.0.1" />
<PackageReference Include="System.Reflection.Metadata" Version="10.0.11" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
</ItemGroup>

Expand Down
39 changes: 2 additions & 37 deletions src/Exceptionless/Models/Collections/SettingsDictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,25 +158,6 @@ protected override void OnChanged(ChangedEventArgs<KeyValuePair<string, string>>
LogLevel value;
_minLogLevels.TryRemove(logger, out value);
}
}

foreach (var eventType in _eventTypes) {
if (eventType.Key == null || !_typeSourceEnabled.TryGetValue(eventType.Key, out var sourceDictionary))
continue;

if (!args.Item.Key.StartsWith(eventType.Value))
continue;

var sourceKeysToRemove = new List<string>();
foreach (string key in sourceDictionary.Keys) {
if (key.IsPatternMatch(args.Item.Key.Substring(eventType.Value.Length)))
sourceKeysToRemove.Add(key);
}

foreach (var logger in sourceKeysToRemove) {
bool value;
sourceDictionary.TryRemove(logger, out value);
}
}

base.OnChanged(args);
Expand All @@ -202,17 +183,10 @@ public LogLevel GetMinLogLevel(string source) {
return minLogLevel;
}

private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, bool>> _typeSourceEnabled = new ConcurrentDictionary<string, ConcurrentDictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);

public bool GetTypeAndSourceEnabled(string type, string source) {
if (type == null)
return true;

if (source != null && _typeSourceEnabled.TryGetValue(type, out var sourceDictionary)) {
if (sourceDictionary.TryGetValue(source, out bool sourceEnabled))
return sourceEnabled;
}

return GetTypeAndSourceSetting(type, source, "true").ToBoolean(true);
}

Expand All @@ -222,16 +196,7 @@ private string GetTypeAndSourceSetting(string type, string source, string defaul
if (type == null)
return defaultValue;

string sourcePrefix;
if (!_typeSourceEnabled.TryGetValue(type, out var sourceDictionary)) {
sourceDictionary = new ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
_typeSourceEnabled.TryAdd(type, sourceDictionary);
sourcePrefix = "@@" + type + ":";

_eventTypes.TryAdd(type, sourcePrefix);
} else {
sourcePrefix = _eventTypes[type];
}
string sourcePrefix = _eventTypes.GetOrAdd(type, eventType => "@@" + eventType + ":");

// check for exact source match
if (TryGetValue(sourcePrefix + source, out string settingValue))
Expand Down Expand Up @@ -271,4 +236,4 @@ public static class KnownKeys {
public const string LogLevelPrefix = "@@log:";
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
</ItemGroup>

<ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.19" />
</ItemGroup>

<ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
</ItemGroup>

<ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
</ItemGroup>

<ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.19" />
</ItemGroup>

<ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Label="Package References">
<PackageReference Include="log4net" Version="3.3.1" />
<PackageReference Include="log4net" Version="3.4.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' " Label="Build">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
</PropertyGroup>

<ItemGroup Label="Package References">
<PackageReference Include="MessagePack" Version="3.1.7" />
<PackageReference Include="MessagePack" Version="3.1.8" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Platforms/Exceptionless.NLog/Exceptionless.NLog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Label="Package References">
<PackageReference Include="NLog" Version="6.1.3" />
<PackageReference Include="NLog" Version="6.2.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' " Label="Build">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="xunit.v3.mtp-off" Version="4.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit.v3.assert" Version="3.2.2" />
<PackageReference Include="xunit.v3.assert" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
Expand Down
Loading