Skip to content

Commit 9889319

Browse files
Release v1.1.0 (#26)
#26 Added the new project, which is an optional nuget package, allows JSON serialization and deserialization of IMEI type based on native Microsoft's System.Text.Json library. - Added ImeiType.SystemTextJson project; - Updated .NET, .NET tools, CI/CD dependencies; - Changed solution structure from horizontal layering to vertical slicing; - Updated README documentation. Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Nikita Neverov <neverovnikita.bmt@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent aece0bd commit 9889319

File tree

70 files changed

+3625
-1425
lines changed

Some content is hidden

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

70 files changed

+3625
-1425
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-stryker": {
6-
"version": "4.4.1",
6+
"version": "4.6.0",
77
"commands": [
88
"dotnet-stryker"
99
],
1010
"rollForward": false
1111
},
1212
"gitversion.tool": {
13-
"version": "6.1.0",
13+
"version": "6.3.0",
1414
"commands": [
1515
"dotnet-gitversion"
1616
],

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ indent_size = 2
138138
[{*.yaml,*.yml}]
139139
indent_size = 2
140140

141+
[Directory.Packages.props]
142+
indent_size = 2
143+
141144
[{*.bash,*.bats,*.dash,*.ksh,*.mksh,*.sh,.bash_aliases,.bash_logout,.bash_profile,.bashrc,.profile}]
142145
indent_size = 2
143146

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
###############################################################################
44
* text=auto
55

6+
# Ensure shell scripts use LF line endings (linux only accepts LF)
7+
*.sh eol=lf
8+
*.ps1 eol=lf
9+
610
###############################################################################
711
# Set default behavior for command prompt diff.
812
#

.github/workflows/ci-analyze.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
run: git checkout HEAD^2
2828

2929
- name: 🫙 Initialize CodeQL
30-
uses: github/codeql-action/init@v3.28.9
30+
uses: github/codeql-action/init@v3.29.2
3131
with:
3232
languages: csharp
3333

3434
- name: 🛠️ Autobuild
35-
uses: github/codeql-action/autobuild@v3.28.9
35+
uses: github/codeql-action/autobuild@v3.29.2
3636

3737
- name: 🩻 Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@v3.28.9
38+
uses: github/codeql-action/analyze@vv3.29.2
3939

4040
dotnet-format:
4141
name: .NET Analyzers
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/checkout@v4.2.2
4949

5050
- name: ⚙ Setup .NET (for dotnet format)
51-
uses: actions/setup-dotnet@v4.3.0
51+
uses: actions/setup-dotnet@v4.3.1
5252
with:
5353
dotnet-version: 9.0.x
5454

.github/workflows/ci-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ jobs:
2626
fetch-depth: 0
2727

2828
- name: ⚙ Setup .NET
29-
uses: actions/setup-dotnet@v4.3.0
29+
uses: actions/setup-dotnet@v4.3.1
3030
with:
3131
dotnet-version: |
3232
9.0.x
33+
8.0.x
34+
7.0.x
3335
6.0.x
3436
cache: true
3537
cache-dependency-path: '**/packages.lock.json'
@@ -57,7 +59,7 @@ jobs:
5759
run: |
5860
chmod +x scripts/clean.sh || true
5961
./scripts/clean.sh || true
60-
dotnet build -c Release -v detailed
62+
dotnet build -c Release -v normal
6163
6264
- name: 🧪 Run Tests
6365
run: |
@@ -75,15 +77,15 @@ jobs:
7577
--include-source
7678
7779
- name: 📤 Upload Packages Artifacts
78-
uses: actions/upload-artifact@v4.6.0
80+
uses: actions/upload-artifact@v4.6.2
7981
with:
8082
name: packages-${{ github.sha }}
8183
path: artifacts/package/release/*
8284
if-no-files-found: error
8385
retention-days: 90
8486

8587
- name: 📤 Upload Coverage Artifacts
86-
uses: actions/upload-artifact@v4.6.0
88+
uses: actions/upload-artifact@v4.6.2
8789
with:
8890
name: coverage-report-${{ github.sha }}
8991
path: ${{ github.workspace }}/coverage*

.github/workflows/ci-coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
continue-on-error: true
1313

1414
steps:
15-
- name: 📥 Download Coverage Artifact
16-
uses: actions/download-artifact@v4
15+
- name: 📥 Download Coverage Artifacts
16+
uses: actions/download-artifact@v4.3.0
1717
with:
1818
name: coverage-report-${{ github.sha }}
1919
path: ${{ github.workspace }}/
2020

2121
- name: 🧾 Upload coverage
22-
uses: codecov/codecov-action@v5.2.0
22+
uses: codecov/codecov-action@v5.4.3
2323
with:
2424
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci-main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ jobs:
5656

5757
analyze-packages:
5858
name: 🔬 Code Analyze
59-
# if it is not local debugging by the 'nektos/act' tool
59+
# if it is not local debugging by the 'nektos/act' tool:
6060
if: ${{ (github.event.act == 'false' || github.event.act == '') }}
6161
uses: ./.github/workflows/ci-analyze.yml
6262
secrets: inherit
6363

6464
upload-coverage:
6565
name: 🧾 Code Coverage
6666
needs: build-packages
67-
# if it is not local debugging by the 'nektos/act' tool
67+
# if it is not local debugging by the 'nektos/act' tool:
6868
if: ${{ (github.event.act == 'false' || github.event.act == '') }}
6969
uses: ./.github/workflows/ci-coverage.yml
7070
secrets: inherit

.github/workflows/ci-release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
- name: ⚙ Checkout Check Tag Action
3434
uses: actions/checkout@v4.2.2
3535
with:
36-
sparse-checkout: .github/actions/check-tag-action
37-
sparse-checkout-cone-mode: false
36+
fetch-depth: 0
3837
fetch-tags: true
3938

4039
- name: 🔝 Check Tag Version
@@ -54,12 +53,12 @@ jobs:
5453

5554
steps:
5655
- name: ⚙ Setup .NET (for nuget)
57-
uses: actions/setup-dotnet@v4.3.0
56+
uses: actions/setup-dotnet@v4.3.1
5857
with:
5958
dotnet-version: 9.0.x
6059

6160
- name: 📥 Download Packages
62-
uses: actions/download-artifact@v4.1.8
61+
uses: actions/download-artifact@v4.3.0
6362
with:
6463
name: packages-${{ github.sha }}
6564
path: ${{ env.RELEASE_DIR }}
@@ -80,14 +79,14 @@ jobs:
8079

8180
steps:
8281
- name: 📥 Download Packages
83-
uses: actions/download-artifact@v4.1.8
82+
uses: actions/download-artifact@v4.3.0
8483
with:
8584
name: packages-${{ github.sha }}
8685
path: ${{ env.RELEASE_DIR }}
8786

8887
- name: 📯 Create GitHub Release
8988
id: create_release
90-
uses: softprops/action-gh-release@v2
89+
uses: softprops/action-gh-release@v2.3.2
9190
with:
9291
name: 'Release ${{ needs.verify-tag.outputs.version }}'
9392
generate_release_notes: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ bld/
5252
[Ll]og/
5353
[Ll]ogs/
5454
[Mm][Ss][Bb]uild*/
55+
.AssemblyAttributes
5556

5657
# IDEs
5758
.vs/

Directory.Build.props

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
<!--./Directory.Build.props-->
1+
<!-- ./Directory.Build.props -->
22
<Project>
33

4-
<PropertyGroup Label="SolutionVariables">
4+
<PropertyGroup Label="SolutionConfig">
55
<_Name>ImeiType</_Name>
66
<_Company>BMTLab</_Company>
7-
<_TestNamespace>Tests</_TestNamespace>
87
</PropertyGroup>
98

109
<PropertyGroup Label="AssemblyInfo">
11-
<AssemblyName Condition="'$(AssemblyName)' == ''">$(_Company).$(MSBuildProjectName)</AssemblyName>
12-
<Title Condition="'$(Title)' == ''">$(AssemblyName)</Title>
13-
<Product Condition="'$(Product)' == ''">$(AssemblyName)</Product>
14-
<RootNamespace Condition="'$(RootNamespace)' == ''">$(AssemblyName)</RootNamespace>
10+
<AssemblyName Condition="'$(AssemblyName)'==''">$(_Company).$(MSBuildProjectName)</AssemblyName>
11+
<Title Condition="'$(Title)'==''">$(AssemblyName)</Title>
12+
<Product Condition="'$(Product)'==''">$(AssemblyName)</Product>
13+
<RootNamespace Condition="'$(RootNamespace)'==''">$(AssemblyName)</RootNamespace>
1514
<Deterministic>true</Deterministic>
1615
<InvariantGlobalization>true</InvariantGlobalization>
1716
<Description>
@@ -21,7 +20,7 @@
2120
</Description>
2221
</PropertyGroup>
2322

24-
<PropertyGroup Label="Package">
23+
<PropertyGroup Label="PackageConfig">
2524
<Company>$(_Company)</Company>
2625
<Authors>Nikita Neverov</Authors>
2726
<Copyright>Copyright $(_Company) © $([System.DateTime]::Now.Date.Year)</Copyright>
@@ -49,86 +48,66 @@
4948
<AllowedOutputExtensionsInPackageBuildOutputFolder>
5049
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
5150
</AllowedOutputExtensionsInPackageBuildOutputFolder>
52-
53-
<!-- Overridden in underlying configuration files -->
54-
<IsPackable>false</IsPackable>
5551
</PropertyGroup>
5652

57-
<PropertyGroup Label="Framework">
53+
<PropertyGroup Label="FrameworkConfig">
5854
<LangVersion>latest</LangVersion>
5955
<Nullable>enable</Nullable>
6056
<ImplicitUsings>enable</ImplicitUsings>
6157
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
6258
<RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
6359
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
6460
<AnalysisLevel>preview</AnalysisLevel>
65-
</PropertyGroup>
66-
67-
<PropertyGroup Label="ArtifactDirectory">
6861
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
6962
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
63+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
7064
</PropertyGroup>
7165

72-
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
66+
<PropertyGroup Label="BuildConfig" Condition="'$(Configuration)'=='Debug'">
7367
<DebugSymbols>true</DebugSymbols>
7468
<DebugType>full</DebugType>
75-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
76-
<Optimize>false</Optimize>
7769
</PropertyGroup>
7870

79-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
71+
<PropertyGroup Label="BuildConfig" Condition="'$(Configuration)'=='Release'">
8072
<DebugSymbols>true</DebugSymbols>
8173
<DebugType>pdbonly</DebugType>
8274
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
8375
<Optimize>true</Optimize>
8476
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
8577
</PropertyGroup>
8678

87-
<ItemGroup Label="Annotations">
88-
<PackageReference Include="JetBrains.Annotations">
79+
<ItemGroup Label="CommonReferences">
80+
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
81+
<PackageReference Include="Microsoft.SourceLink.GitHub">
8982
<PrivateAssets>All</PrivateAssets>
9083
</PackageReference>
91-
</ItemGroup>
92-
93-
<ItemGroup Label="Analyzers">
94-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
84+
<PackageReference Include="GitVersion.MsBuild">
9585
<PrivateAssets>All</PrivateAssets>
9686
</PackageReference>
97-
<PackageReference Include="SonarAnalyzer.CSharp">
87+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
9888
<PrivateAssets>All</PrivateAssets>
9989
</PackageReference>
100-
</ItemGroup>
101-
102-
<ItemGroup Label="SourceLink">
103-
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
104-
<PackageReference Include="Microsoft.SourceLink.GitHub">
90+
<PackageReference Include="SonarAnalyzer.CSharp">
10591
<PrivateAssets>All</PrivateAssets>
10692
</PackageReference>
107-
</ItemGroup>
108-
109-
<ItemGroup Label="Versioning">
110-
<PackageReference Include="GitVersion.MsBuild">
93+
<PackageReference Include="JetBrains.Annotations">
11194
<PrivateAssets>All</PrivateAssets>
11295
</PackageReference>
11396
</ItemGroup>
11497

115-
<ItemGroup Label="GlobalUsings">
98+
<ItemGroup Label="GlobalUsingsConfig">
11699
<Using Include="System.Diagnostics"/>
117100
<Using Include="System.Diagnostics.CodeAnalysis"/>
118101
<Using Include="System.Runtime.InteropServices"/>
119102
</ItemGroup>
120103

121-
<ItemGroup Label="Docs">
104+
<ItemGroup Label="AdditionalItemsConfig">
122105
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath=""/>
123106
<None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath=""/>
124107
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath=""/>
125108
<None Include="$(MSBuildThisFileDirectory)SECURITY.md" Pack="true" PackagePath=""/>
126109
</ItemGroup>
127110

128-
<PropertyGroup Label="CI">
129-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
130-
</PropertyGroup>
131-
132111
<ItemGroup Label="EditorConfig">
133112
<EditorConfigFiles Update=".editorconfig">
134113
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

0 commit comments

Comments
 (0)