Skip to content

Commit 2e2d0bd

Browse files
parsapanahpoorparsapanahpoor
committed
merge confilict pased
2 parents 5ff7396 + 434eaa4 commit 2e2d0bd

File tree

8 files changed

+119
-54
lines changed

8 files changed

+119
-54
lines changed

‎.github/workflows/build.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
branches: [ main, develop ]
88

99
env:
10-
DOTNET_VERSION: '7.0.x'
1110
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
1211
DOTNET_NOLOGO: true
1312

@@ -20,15 +19,21 @@ jobs:
2019
- name: 📥 Checkout
2120
uses: actions/checkout@v4
2221

23-
- name: ⚙️ Setup .NET
22+
- name: ⚙️ Setup .NET SDKs
2423
uses: actions/setup-dotnet@v4
2524
with:
26-
dotnet-version: ${{ env.DOTNET_VERSION }}
25+
dotnet-version: |
26+
6.0.x
27+
7.0.x
28+
8.0.x
29+
9.0.x
30+
10.0.x
31+
dotnet-quality: 'preview'
2732

2833
- name: 📦 Restore dependencies
2934
run: dotnet restore JsonViewer.Blazor.sln
3035

31-
- name: 🏗️ Build Component
36+
- name: 🏗️ Build Component (Multi-target)
3237
run: dotnet build src/Component/Component.csproj --no-restore --configuration Release
3338

3439
- name: 🏗️ Build Demo
@@ -38,6 +43,13 @@ jobs:
3843
run: |
3944
echo "## 🏗️ Build Summary" >> $GITHUB_STEP_SUMMARY
4045
echo "" >> $GITHUB_STEP_SUMMARY
46+
echo "### Targets Built" >> $GITHUB_STEP_SUMMARY
47+
echo "- ✅ net6.0" >> $GITHUB_STEP_SUMMARY
48+
echo "- ✅ net7.0" >> $GITHUB_STEP_SUMMARY
49+
echo "- ✅ net8.0" >> $GITHUB_STEP_SUMMARY
50+
echo "- ✅ net9.0" >> $GITHUB_STEP_SUMMARY
51+
echo "- ✅ net10.0 (Preview)" >> $GITHUB_STEP_SUMMARY
52+
echo "" >> $GITHUB_STEP_SUMMARY
53+
echo "### Projects" >> $GITHUB_STEP_SUMMARY
4154
echo "- **Component**: ✅ Built successfully" >> $GITHUB_STEP_SUMMARY
4255
echo "- **Demo**: ✅ Built successfully" >> $GITHUB_STEP_SUMMARY
43-
echo "- **.NET Version**: ${{ env.DOTNET_VERSION }}" >> $GITHUB_STEP_SUMMARY

‎.github/workflows/codeql.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@ jobs:
2424
- name: 📥 Checkout repository
2525
uses: actions/checkout@v4
2626

27-
- name: 🔧 Setup .NET
27+
- name: 🔧 Setup .NET SDKs
2828
uses: actions/setup-dotnet@v4
2929
with:
30-
dotnet-version: '7.0.x'
30+
dotnet-version: |
31+
6.0.x
32+
7.0.x
33+
8.0.x
34+
9.0.x
35+
10.0.x
36+
dotnet-quality: 'preview'
3137

3238
- name: ⚙️ Initialize CodeQL
3339
uses: github/codeql-action/init@v3

‎.github/workflows/deploy-pages.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ jobs:
3131
- name: 📥 Checkout
3232
uses: actions/checkout@v4
3333

34-
- name: ⚙️ Setup .NET
35-
uses: actions/setup-dotnet@v4
36-
with:
37-
dotnet-version: ${{ env.DOTNET_VERSION }}
34+
- name: ⚙️ Setup .NET SDKs
35+
uses: actions/setup-dotnet@v4
36+
with:
37+
dotnet-version: |
38+
8.0.x
39+
9.0.x
40+
dotnet-quality: 'ga'
3841

3942
- name: 📦 Restore dependencies
4043
run: dotnet restore JsonViewer.Blazor.sln

‎.github/workflows/nuget-publish.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
default: '0.0.3-beta'
1212

1313
env:
14-
DOTNET_VERSION: '7.0.x'
14+
DOTNET_VERSION: '9.0.x'
1515
PROJECT_PATH: 'src/Component/Component.csproj'
1616

1717
jobs:
@@ -29,10 +29,16 @@ jobs:
2929
with:
3030
fetch-depth: 0
3131

32-
- name: ⚙️ Setup .NET
32+
- name: ⚙️ Setup .NET SDKs
3333
uses: actions/setup-dotnet@v4
3434
with:
35-
dotnet-version: ${{ env.DOTNET_VERSION }}
35+
dotnet-version: |
36+
6.0.x
37+
7.0.x
38+
8.0.x
39+
9.0.x
40+
10.0.x
41+
dotnet-quality: 'preview'
3642

3743
- name: 🔍 Determine Version
3844
id: version

‎docs/CHANGELOG.md‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
<!-- Future changes go here -->
1111

12+
## [0.0.4-beta] - 2025-12-03
13+
14+
### ✨ Added
15+
- **Multi-framework support**: Now supports .NET 6, .NET 7, .NET 8, .NET 9, and .NET 10!
16+
- Wider compatibility for all Blazor applications
17+
18+
### 🔧 Changed
19+
- Updated SDK to .NET 9
20+
- Demo application upgraded to .NET 8 (LTS)
21+
- Conditional dependencies for each target framework
22+
23+
### 📦 Supported Frameworks
24+
| Framework | Status |
25+
|-----------|--------|
26+
| .NET 6.0 | ✅ Supported |
27+
| .NET 7.0 | ✅ Supported |
28+
| .NET 8.0 | ✅ Supported (LTS) |
29+
| .NET 9.0 | ✅ Supported |
30+
| .NET 10.0 | ✅ Supported (Preview) |
31+
1232
## [0.0.3-beta] - 2025-12-03
1333

1434
### ✨ Added
@@ -150,7 +170,8 @@ See [CONTRIBUTING.md](../.github/CONTRIBUTING.md) for details on how to contribu
150170
- 🔒 Security - Security fixes
151171
- 📚 Documentation - Documentation changes
152172

153-
[Unreleased]: https://github.com/JsonViewer-Component/Blazor/compare/v0.0.3-beta...HEAD
173+
[Unreleased]: https://github.com/JsonViewer-Component/Blazor/compare/v0.0.4-beta...HEAD
174+
[0.0.4-beta]: https://github.com/JsonViewer-Component/Blazor/compare/v0.0.3-beta...v0.0.4-beta
154175
[0.0.3-beta]: https://github.com/JsonViewer-Component/Blazor/compare/v0.0.2-beta...v0.0.3-beta
155176
[0.0.2-beta]: https://github.com/JsonViewer-Component/Blazor/compare/v0.0.1-beta...v0.0.2-beta
156177
[0.0.1-beta]: https://github.com/JsonViewer-Component/Blazor/releases/tag/v0.0.1-beta

‎global.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"sdk": {
3-
"version": "7.0.0",
4-
"rollForward": "latestFeature",
5-
"allowPrerelease": false
6-
},
7-
"msbuild-sdks": {
8-
"Microsoft.Build.NoTargets": "3.7.134"
3+
"version": "9.0.100",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": true
96
}
10-
}
7+
}

‎src/Blazor.Demo/Blazor.Demo.csproj‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

3-
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
12-
</ItemGroup>
13-
14-
<ItemGroup>
15-
<ProjectReference Include="..\Component\Component.csproj" />
16-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
12+
</ItemGroup>
1713

14+
<ItemGroup>
15+
<ProjectReference Include="..\Component\Component.csproj" />
16+
</ItemGroup>
1817

1918
</Project>

‎src/Component/Component.csproj‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

3+
<!-- ═══════════════════════════════════════════════════════════════ -->
4+
<!-- 🎯 Multi-Target Frameworks -->
5+
<!-- ═══════════════════════════════════════════════════════════════ -->
36
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
7+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
58
<Nullable>enable</Nullable>
69
<ImplicitUsings>enable</ImplicitUsings>
710
<LangVersion>latest</LangVersion>
@@ -13,7 +16,7 @@
1316
<PropertyGroup>
1417
<!-- Basic Info -->
1518
<PackageId>JsonViewer.Blazor</PackageId>
16-
<Version>0.0.3-beta</Version>
19+
<Version>0.0.4-beta</Version>
1720
<Title>JSON Viewer for Blazor</Title>
1821
<Authors>Parsa Panahpoor</Authors>
1922
<Company>JsonViewer-Component</Company>
@@ -37,33 +40,26 @@
3740
• Fully responsive design
3841
• High performance - handles large JSON files
3942

40-
📦 Easy to install and use in Blazor WebAssembly and Blazor Server applications.
43+
📦 Supports .NET 6, .NET 7, .NET 8, .NET 9, and .NET 10!
4144
</Description>
4245

4346
<!-- Summary for package manager UI -->
4447
<Summary>A powerful JSON viewer component for Blazor with search, statistics, themes, and editing capabilities.</Summary>
4548

4649
<!-- Tags - Help users find your package -->
47-
<PackageTags>blazor;json;viewer;component;wasm;webassembly;dotnet;csharp;razor;asp.net;json-viewer;syntax-highlighting;dark-theme;light-theme;search;export;copy;statistics;tree-view;collapsible;expandable;editor;formatter;beautifier</PackageTags>
50+
<PackageTags>blazor;json;viewer;component;wasm;webassembly;dotnet;csharp;razor;asp.net;json-viewer;syntax-highlighting;dark-theme;light-theme;search;export;copy;statistics;tree-view;collapsible;expandable;editor;formatter;beautifier;net6;net7;net8;net9;net10</PackageTags>
4851

4952
<!-- Release Notes - Shows in NuGet "Release Notes" tab -->
5053
<PackageReleaseNotes>
51-
## 🎉 Version 0.0.3-beta
54+
## 🎉 Version 0.0.4-beta
5255

5356
### ✨ New Features
54-
- Improved repository structure
55-
- Enhanced documentation
56-
- Better CI/CD pipeline
57+
- Multi-framework support: .NET 6, .NET 7, .NET 8, .NET 9, .NET 10
58+
- Wider compatibility for all Blazor applications
5759

58-
### 🐛 Bug Fixes
59-
- Fixed Persian comments translated to English
60-
- Fixed workflow issues
61-
- Improved code quality
62-
63-
### 📚 Documentation
64-
- Reorganized project structure
65-
- Updated all documentation to English
66-
- Added comprehensive CHANGELOG
60+
### 🔧 Changes
61+
- Updated to support multiple .NET versions
62+
- Optimized dependencies for each framework
6763

6864
For full changelog, visit: https://github.com/JsonViewer-Component/Blazor/blob/main/docs/CHANGELOG.md
6965
</PackageReleaseNotes>
@@ -107,14 +103,39 @@ For full changelog, visit: https://github.com/JsonViewer-Component/Blazor/blob/m
107103
</PropertyGroup>
108104

109105
<!-- ═══════════════════════════════════════════════════════════════ -->
110-
<!-- 📚 Dependencies -->
106+
<!-- 📚 Dependencies - Conditional per Framework -->
111107
<!-- ═══════════════════════════════════════════════════════════════ -->
112108
<ItemGroup>
113109
<SupportedPlatform Include="browser" />
114110
</ItemGroup>
115111

116-
<ItemGroup>
112+
<!-- .NET 6 -->
113+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
114+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.36" />
115+
</ItemGroup>
116+
117+
<!-- .NET 7 -->
118+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
117119
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20" />
120+
</ItemGroup>
121+
122+
<!-- .NET 8 -->
123+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
124+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
125+
</ItemGroup>
126+
127+
<!-- .NET 9 -->
128+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
129+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
130+
</ItemGroup>
131+
132+
<!-- .NET 10 (Preview) -->
133+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
134+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-preview.4.25258.110" />
135+
</ItemGroup>
136+
137+
<!-- Shared Dependencies -->
138+
<ItemGroup>
118139
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
119140
</ItemGroup>
120141

0 commit comments

Comments
 (0)