Skip to content

Commit 511fd13

Browse files
jaybarden1jaybarden1
authored
Merge pull request #8 from astar-development/features/add-local-changes
Features/add local changes
2 parents e47d2fb + 0421b75 commit 511fd13

File tree

74 files changed

+1249
-345
lines changed

Some content is hidden

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

74 files changed

+1249
-345
lines changed

‎.editorconfig‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ csharp_style_conditional_delegate_call = true:warning
104104

105105
# Modifier preferences
106106
csharp_prefer_static_local_function = true:warning
107-
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
107+
csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async
108108
csharp_style_prefer_readonly_struct = true:warning
109109
csharp_style_prefer_readonly_struct_member = true:suggestion
110110

@@ -212,30 +212,30 @@ dotnet_naming_rule.static_field_should_be_pascal_case.style = pascal_case
212212

213213
dotnet_naming_symbols.interface.applicable_kinds = interface
214214
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
215-
dotnet_naming_symbols.interface.required_modifiers =
215+
dotnet_naming_symbols.interface.required_modifiers =
216216

217217
dotnet_naming_symbols.static_field.applicable_kinds = field
218218
dotnet_naming_symbols.static_field.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
219219
dotnet_naming_symbols.static_field.required_modifiers = static
220220

221221
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
222222
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
223-
dotnet_naming_symbols.types.required_modifiers =
223+
dotnet_naming_symbols.types.required_modifiers =
224224

225225
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
226226
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
227-
dotnet_naming_symbols.non_field_members.required_modifiers =
227+
dotnet_naming_symbols.non_field_members.required_modifiers =
228228

229229
# Naming styles
230230

231-
dotnet_naming_style.pascal_case.required_prefix =
232-
dotnet_naming_style.pascal_case.required_suffix =
233-
dotnet_naming_style.pascal_case.word_separator =
231+
dotnet_naming_style.pascal_case.required_prefix =
232+
dotnet_naming_style.pascal_case.required_suffix =
233+
dotnet_naming_style.pascal_case.word_separator =
234234
dotnet_naming_style.pascal_case.capitalization = pascal_case
235235

236236
dotnet_naming_style.begins_with_i.required_prefix = I
237-
dotnet_naming_style.begins_with_i.required_suffix =
238-
dotnet_naming_style.begins_with_i.word_separator =
237+
dotnet_naming_style.begins_with_i.required_suffix =
238+
dotnet_naming_style.begins_with_i.word_separator =
239239
dotnet_naming_style.begins_with_i.capitalization = pascal_case
240240

241241
[*.{cs,vb}]
@@ -273,4 +273,4 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
273273
dotnet_style_qualification_for_field = false:silent
274274
dotnet_style_qualification_for_property = false:error
275275
dotnet_style_qualification_for_method = false:error
276-
dotnet_style_qualification_for_event = false:error
276+
dotnet_style_qualification_for_event = false:error

‎.github/workflows/dotnet.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,56 @@ jobs:
1212
name: Build and analyze
1313
runs-on: windows-latest
1414
steps:
15-
- name: Set up JDK
16-
uses: actions/[email protected]
17-
with:
18-
java-version: 17
19-
distribution: 'zulu'
20-
21-
- name: Checkout
22-
uses: actions/[email protected]
23-
with:
24-
fetch-depth: 0
15+
- name: Set up JDK
16+
uses: actions/[email protected]
17+
with:
18+
java-version: 17
19+
distribution: 'zulu'
2520

26-
- name: Cache SonarCloud packages
27-
uses: actions/[email protected]
28-
with:
29-
path: ~\sonar\cache
30-
key: ${{ runner.os }}-sonar
31-
restore-keys: ${{ runner.os }}-sonar
21+
- name: Checkout
22+
uses: actions/[email protected]
23+
with:
24+
fetch-depth: 0
3225

33-
- name: Cache SonarCloud scanner
34-
id: cache-sonar-scanner
35-
uses: actions/[email protected]
36-
with:
37-
path: .\.sonar\scanner
38-
key: ${{ runner.os }}-sonar-scanner
39-
restore-keys: ${{ runner.os }}-sonar-scanner
40-
41-
- name: Install SonarCloud scanner
42-
if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
43-
shell: powershell
44-
run: |
45-
New-Item -Path .\.sonar\scanner -ItemType Directory
46-
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
47-
48-
- name: Build and analyze
49-
env:
50-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
52-
shell: powershell
53-
run: |
54-
dotnet tool install --global dotnet-coverage
55-
.\.sonar\scanner\dotnet-sonarscanner begin /k:"astar-development_astar-dev-logging-extensions" /o:"astar-development" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
56-
dotnet build --configuration Release
57-
dotnet-coverage collect 'dotnet test --filter "FullyQualifiedName!~Acceptance.Tests"' -f xml -o 'coverage.xml'
58-
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
26+
- name: Cache SonarCloud packages
27+
uses: actions/[email protected]
28+
with:
29+
path: ~\sonar\cache
30+
key: ${{ runner.os }}-sonar
31+
restore-keys: ${{ runner.os }}-sonar
5932

60-
- name: Pack NuGet package
61-
if: github.ref == 'refs/heads/main'
62-
run: dotnet pack .\src\AStar.Dev.Logging.Extensions\AStar.Dev.Logging.Extensions.csproj
33+
- name: Cache SonarCloud scanner
34+
id: cache-sonar-scanner
35+
uses: actions/[email protected]
36+
with:
37+
path: .\.sonar\scanner
38+
key: ${{ runner.os }}-sonar-scanner
39+
restore-keys: ${{ runner.os }}-sonar-scanner
40+
41+
- name: Install SonarCloud scanner
42+
if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
43+
shell: powershell
44+
run: |
45+
New-Item -Path .\.sonar\scanner -ItemType Directory
46+
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
47+
48+
- name: Build and analyze
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
52+
shell: powershell
53+
run: |
54+
dotnet tool install --global dotnet-coverage
55+
.\.sonar\scanner\dotnet-sonarscanner begin /k:"astar-development_astar-dev-utilities" /o:"astar-development" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
56+
dotnet build --configuration Release
57+
dotnet-coverage collect 'dotnet test --filter "FullyQualifiedName!~Acceptance.Tests"' -f xml -o 'coverage.xml'
58+
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
59+
60+
- name: Pack NuGet package
61+
if: github.ref == 'refs/heads/main'
62+
run: dotnet pack .\src\AStar.Dev.Utilities\AStar.Dev.Utilities.csproj
63+
64+
- name: Push to NuGet
65+
if: github.ref == 'refs/heads/main'
66+
run: dotnet nuget push "**\AStar.Dev.Utilities.*.nupkg" --api-key ${{secrets.nuget_api_key}} --skip-duplicate --source https://api.nuget.org/v3/index.json
6367

64-
- name: Push to NuGet
65-
if: github.ref == 'refs/heads/main'
66-
run: dotnet nuget push "**\AStar.Dev.Logging.Extensions.*.nupkg" --api-key ${{secrets.nuget_api_key}} --skip-duplicate --source https://api.nuget.org/v3/index.json
67-

‎.idea/.idea.AStar.Dev.Logging.Extensions/.idea/.gitignore‎

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

‎.idea/.idea.AStar.Dev.Logging.Extensions/.idea/.name‎

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

‎.idea/.idea.AStar.Dev.Logging.Extensions/.idea/indexLayout.xml‎

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

‎.idea/.idea.AStar.Dev.Logging.Extensions/.idea/vcs.xml‎

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

‎AStar.Dev.Logging.Extensions.sln‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2148A5BF-30D5-460A-BE18-C19426C87428}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unit", "unit", "{5956040C-7B01-422A-BA94-58CB8F1951C6}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Logging.Extensions.Unit.Tests", "tests\unit\AStar.Dev.Logging.Extensions.Unit.Tests\AStar.Dev.Logging.Extensions.Unit.Tests.csproj", "{61823C1A-5AA5-4C23-944A-F1029941086C}"
11-
EndProject
128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BB29ADA9-37FE-434B-BF05-2E195E7C83A2}"
139
EndProject
1410
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Logging.Extensions", "src\AStar.Dev.Logging.Extensions\AStar.Dev.Logging.Extensions.csproj", "{9F2D808F-D24F-4031-9C2D-7744B32E15FC}"
1511
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Logging.Extensions.Tests.Unit", "tests\AStar.Dev.Logging.Extensions.Tests.Unit\AStar.Dev.Logging.Extensions.Tests.Unit.csproj", "{B6EE17A9-0491-466B-8240-A304617A9DB3}"
13+
EndProject
1614
Global
1715
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1816
Debug|Any CPU = Debug|Any CPU
@@ -22,18 +20,17 @@ Global
2220
HideSolutionNode = FALSE
2321
EndGlobalSection
2422
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{61823C1A-5AA5-4C23-944A-F1029941086C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{61823C1A-5AA5-4C23-944A-F1029941086C}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{61823C1A-5AA5-4C23-944A-F1029941086C}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{61823C1A-5AA5-4C23-944A-F1029941086C}.Release|Any CPU.Build.0 = Release|Any CPU
2923
{9F2D808F-D24F-4031-9C2D-7744B32E15FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3024
{9F2D808F-D24F-4031-9C2D-7744B32E15FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
3125
{9F2D808F-D24F-4031-9C2D-7744B32E15FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
3226
{9F2D808F-D24F-4031-9C2D-7744B32E15FC}.Release|Any CPU.Build.0 = Release|Any CPU
27+
{B6EE17A9-0491-466B-8240-A304617A9DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{B6EE17A9-0491-466B-8240-A304617A9DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{B6EE17A9-0491-466B-8240-A304617A9DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{B6EE17A9-0491-466B-8240-A304617A9DB3}.Release|Any CPU.Build.0 = Release|Any CPU
3331
EndGlobalSection
3432
GlobalSection(NestedProjects) = preSolution
35-
{5956040C-7B01-422A-BA94-58CB8F1951C6} = {2148A5BF-30D5-460A-BE18-C19426C87428}
36-
{61823C1A-5AA5-4C23-944A-F1029941086C} = {5956040C-7B01-422A-BA94-58CB8F1951C6}
3733
{9F2D808F-D24F-4031-9C2D-7744B32E15FC} = {BB29ADA9-37FE-434B-BF05-2E195E7C83A2}
34+
{B6EE17A9-0491-466B-8240-A304617A9DB3} = {2148A5BF-30D5-460A-BE18-C19426C87428}
3835
EndGlobalSection
3936
EndGlobal

‎src/AStar.Dev.Logging.Extensions/AStar.Dev.Logging.Extensions.csproj‎

Lines changed: 61 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,72 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
9+
<AnalysisLevel>latest-recommended</AnalysisLevel>
10+
</PropertyGroup>
911

1012

11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12-
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
13-
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
15+
</PropertyGroup>
1416

15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
16-
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
17-
</PropertyGroup>
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
19+
</PropertyGroup>
1820

19-
<PropertyGroup>
20-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
21-
<IsPackable>true</IsPackable>
22-
<Title>AStar.Dev.Logging.Extensions</Title>
23-
<Company>AStar Development</Company>
24-
<Copyright>AStar Development, 2024</Copyright>
25-
<PackageReadmeFile>README.md</PackageReadmeFile>
26-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
27-
<IncludeSymbols>True</IncludeSymbols>
28-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
29-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
30-
<RepositoryUrl>https://github.com/astar-development/astar-dev-logging-extensions.git</RepositoryUrl>
31-
<RepositoryType>git</RepositoryType>
32-
<PackageProjectUrl>https://github.com/astar-development/astar-dev-logging-extensions</PackageProjectUrl>
33-
<Description>A collection of logging utilities.</Description>
34-
<Version>0.4.0</Version>
35-
<Authors>AStar Development, Jason Barden</Authors>
36-
<DocumentationFile>$(AssemblyName).xml</DocumentationFile>
37-
<PackageIcon>AStar.png</PackageIcon>
38-
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
39-
<PackageReleaseNotes>version 0.4.0, no changes - version increased as part of the migration to the new AStar NuGet / GitHub organisations.</PackageReleaseNotes>
40-
</PropertyGroup>
21+
<PropertyGroup>
22+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
23+
<IsPackable>true</IsPackable>
24+
<Title>AStar.Dev.Logging.Extensions</Title>
25+
<Company>AStar Development</Company>
26+
<Copyright>AStar Development, 2024</Copyright>
27+
<PackageReadmeFile>README.md</PackageReadmeFile>
28+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
29+
<IncludeSymbols>True</IncludeSymbols>
30+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
31+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
32+
<RepositoryUrl>https://github.com/astar-development/astar-dev-logging-extensions.git</RepositoryUrl>
33+
<RepositoryType>git</RepositoryType>
34+
<PackageProjectUrl>https://github.com/astar-development/astar-dev-logging-extensions</PackageProjectUrl>
35+
<Description>A collection of logging utilities.</Description>
36+
<Version>0.4.1</Version>
37+
<Authors>AStar Development, Jason Barden</Authors>
38+
<DocumentationFile>$(AssemblyName).xml</DocumentationFile>
39+
<PackageIcon>AStar.png</PackageIcon>
40+
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
41+
<PackageReleaseNotes>version 0.4.1, no changes - Adds tests to the underlying source code.</PackageReleaseNotes>
42+
</PropertyGroup>
4143

42-
<ItemGroup>
43-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
44-
<PackageReference Include="AStar.Dev.Utilities" Version="1.5.1" />
45-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
46-
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
47-
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
48-
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
49-
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
50-
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
51-
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
52-
</ItemGroup>
44+
<ItemGroup>
45+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0"/>
46+
<PackageReference Include="AStar.Dev.Utilities" Version="1.6.0"/>
47+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3"/>
48+
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0"/>
49+
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
50+
<PackageReference Include="Serilog.Expressions" Version="5.0.0"/>
51+
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0"/>
52+
<PackageReference Include="Serilog.Exceptions" Version="8.4.0"/>
53+
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0"/>
54+
</ItemGroup>
5355

54-
<ItemGroup>
55-
<None Include="..\..\AStar.png">
56-
<Pack>True</Pack>
57-
<PackagePath>\</PackagePath>
58-
</None>
59-
<None Include="..\..\LICENSE">
60-
<Pack>True</Pack>
61-
<PackagePath>\</PackagePath>
62-
</None>
63-
<None Include="..\..\README.md">
64-
<Pack>True</Pack>
65-
<PackagePath>\</PackagePath>
66-
</None>
67-
</ItemGroup>
56+
<ItemGroup>
57+
<None Include="..\..\AStar.png">
58+
<Pack>True</Pack>
59+
<PackagePath>\</PackagePath>
60+
</None>
61+
<None Include="..\..\LICENSE">
62+
<Pack>True</Pack>
63+
<PackagePath>\</PackagePath>
64+
</None>
65+
<None Include="..\..\README.md">
66+
<Pack>True</Pack>
67+
<PackagePath>\</PackagePath>
68+
</None>
69+
</ItemGroup>
6870

6971
</Project>
7072

0 commit comments

Comments
 (0)