Skip to content

Commit 5e527dc

Browse files
msynkmsynk
authored
Merge pull request #9597 from bitfoundation/develop
Version 9.2.0 (#9594)
2 parents 521f7c5 + f1a1650 commit 5e527dc

File tree

301 files changed

+4559
-3059
lines changed

Some content is hidden

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

301 files changed

+4559
-3059
lines changed

‎.github/workflows/admin-sample.cd.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
cd src/Templates/Boilerplate && dotnet build -c Release
3636
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
3737
dotnet new install Bit.Boilerplate.0.0.0.nupkg
38-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
38+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
3939
4040
- name: Update core appsettings.json
4141
uses: devops-actions/[email protected]
@@ -88,7 +88,7 @@ jobs:
8888
cd src/Templates/Boilerplate && dotnet build -c Release
8989
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
9090
dotnet new install Bit.Boilerplate.0.0.0.nupkg
91-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
91+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
9292
9393
- name: Update core appsettings.json
9494
uses: devops-actions/[email protected]
@@ -186,13 +186,14 @@ jobs:
186186
cd src\Templates\Boilerplate && dotnet build -c Release
187187
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
188188
dotnet new install Bit.Boilerplate.0.0.0.nupkg
189-
cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --windows --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --offlineDb --framework net9.0
189+
cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --windows --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net9.0
190190
191191
- name: Update core appsettings.json
192192
uses: devops-actions/[email protected]
193193
with:
194194
files: 'AdminPanel\src\Shared\appsettings.json, AdminPanel\src\Client\AdminPanel.Client.Core\appsettings.json, AdminPanel\src\Client\AdminPanel.Client.Windows\appsettings.json'
195195
env:
196+
WebAppUrl: ${{ env.SERVER_ADDRESS }}
196197
ServerAddress: ${{ env.SERVER_ADDRESS }}
197198
Logging.Sentry.Dsn: ${{ secrets.ADMINPANEL_SENTRY_DSN }}
198199
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
@@ -234,7 +235,7 @@ jobs:
234235
cd src/Templates/Boilerplate && dotnet build -c Release
235236
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
236237
dotnet new install Bit.Boilerplate.0.0.0.nupkg
237-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
238+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
238239
239240
- uses: actions/setup-node@v4
240241
with:
@@ -259,6 +260,7 @@ jobs:
259260
with:
260261
files: 'AdminPanel/src/Shared/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Maui/appsettings.json'
261262
env:
263+
WebAppUrl: ${{ env.SERVER_ADDRESS }}
262264
ServerAddress: ${{ env.SERVER_ADDRESS }}
263265
Logging.Sentry.Dsn: ${{ secrets.ADMINPANEL_SENTRY_DSN }}
264266
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
@@ -311,13 +313,14 @@ jobs:
311313
cd src/Templates/Boilerplate && dotnet build -c Release
312314
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
313315
dotnet new install Bit.Boilerplate.0.0.0.nupkg
314-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
316+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --sample Admin --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net9.0
315317
316318
- name: Update core appsettings.json
317319
uses: devops-actions/[email protected]
318320
with:
319321
files: 'AdminPanel/src/Shared/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json, AdminPanel/src/Client/AdminPanel.Client.Maui/appsettings.json'
320322
env:
323+
WebAppUrl: ${{ env.SERVER_ADDRESS }}
321324
ServerAddress: ${{ env.SERVER_ADDRESS }}
322325
Logging.Sentry.Dsn: ${{ secrets.ADMINPANEL_SENTRY_DSN }}
323326
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}

‎.github/workflows/bit.full.ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -146,33 +146,33 @@ jobs:
146146
continue-on-error: true
147147
run: |
148148
dotnet new bit-bp --name TestPostgreSQL --database PostgreSQL --framework net8.0 --signalR
149-
cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Api/
149+
cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Web/
150150
dotnet build
151151
cd ../../../../
152152
dotnet new bit-bp --name TestMySql --database MySql --framework net8.0 --sample Admin --offlineDb
153-
cd TestMySql/src/Server/TestMySql.Server.Api/
153+
cd TestMySql/src/Server/TestMySql.Server.Web/
154154
dotnet build
155155
cd ../../../../
156156
dotnet new bit-bp --name TestOther --database Other --framework net9.0 --sample Todo --sentry
157-
cd TestOther/src/Server/TestOther.Server.Api/
157+
cd TestOther/src/Server/TestOther.Server.Web/
158158
dotnet build
159159
160160
- name: Test file storage options
161161
continue-on-error: true
162162
run: |
163163
dotnet new bit-bp --name TestLocal --filesStorage Local --framework net8.0 --appInsights
164-
cd TestLocal/src/Server/TestLocal.Server.Api/
164+
cd TestLocal/src/Server/TestLocal.Server.Web/
165165
dotnet build
166166
cd ../../../../
167167
dotnet new bit-bp --name TestAzureBlobStorage --filesStorage AzureBlobStorage --framework net9.0 --captcha reCaptcha --notification
168-
cd TestAzureBlobStorage/src/Server/TestAzureBlobStorage.Server.Api/
168+
cd TestAzureBlobStorage/src/Server/TestAzureBlobStorage.Server.Web/
169169
dotnet build
170170
171171
- name: Test backend setup options
172172
continue-on-error: true
173173
run: |
174174
dotnet new bit-bp --name TestStandalone --api Standalone --framework net8.0
175-
cd TestStandalone/src/Server/TestStandalone.Server.Api/
175+
cd TestStandalone/src/Server/TestStandalone.Server.Web/
176176
dotnet build
177177
cd ../
178178
cd TestStandalone.Server.Web/

‎.github/workflows/todo-sample.cd.yml

+105-8
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
cd src/Templates/Boilerplate && dotnet build -c Release
4343
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
4444
dotnet new install Bit.Boilerplate.0.0.0.nupkg
45-
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
45+
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
4646
4747
- name: Update core appsettings.json
4848
uses: devops-actions/[email protected]
@@ -121,8 +121,8 @@ jobs:
121121
CLOUDFLARE_ZONE: ${{ secrets.BITPLATFORM_DEV_CLOUDFLARE_ZONE }}
122122
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
123123

124-
deploy_blazor_wasm_standalone:
125-
name: build blazor wasm standalone
124+
deploy_blazor_wasm_standalone_aot:
125+
name: build blazor wasm standalone (AOT)
126126
runs-on: ubuntu-24.04
127127

128128
steps:
@@ -140,7 +140,7 @@ jobs:
140140
cd src/Templates/Boilerplate && dotnet build -c Release
141141
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
142142
dotnet new install Bit.Boilerplate.0.0.0.nupkg
143-
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
143+
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
144144
145145
- name: Update core appsettings.json
146146
uses: devops-actions/[email protected]
@@ -166,7 +166,101 @@ jobs:
166166
- name: Upload to asw
167167
run: |
168168
npm install -g @azure/static-web-apps-cli
169-
swa deploy --deployment-token ${{ secrets.TODO_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
169+
swa deploy --deployment-token ${{ secrets.TODO_AOT_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
170+
171+
deploy_blazor_wasm_standalone_offlineDb:
172+
name: build blazor wasm standalone (Offline database)
173+
runs-on: ubuntu-24.04
174+
175+
steps:
176+
177+
- name: Checkout source code
178+
uses: actions/checkout@v4
179+
180+
- name: Setup .NET
181+
uses: actions/setup-dotnet@v4
182+
with:
183+
global-json-file: src/global.json
184+
185+
- name: Create project from Boilerplate
186+
run: |
187+
cd src/Templates/Boilerplate && dotnet build -c Release
188+
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
189+
dotnet new install Bit.Boilerplate.0.0.0.nupkg
190+
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --offlineDb --signalR --framework net9.0
191+
192+
- name: Update core appsettings.json
193+
uses: devops-actions/[email protected]
194+
with:
195+
files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.Production.json'
196+
env:
197+
ServerAddress: ${{ env.SERVER_ADDRESS }}
198+
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
199+
200+
- uses: actions/setup-node@v4
201+
with:
202+
node-version: 22
203+
204+
- name: Install wasm
205+
run: cd src && dotnet workload install wasm-tools
206+
207+
- name: Generate CSS/JS files
208+
run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release
209+
210+
- name: Publish
211+
run: dotnet publish TodoSample/src/Client/TodoSample.Client.Web/TodoSample.Client.Web.csproj -c Release -p:PwaEnabled=true -o ${{env.DOTNET_ROOT}}/client -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}"
212+
213+
- name: Upload to asw
214+
run: |
215+
npm install -g @azure/static-web-apps-cli
216+
swa deploy --deployment-token ${{ secrets.TODO_OFFLINE_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
217+
218+
deploy_blazor_wasm_standalone_small:
219+
name: build blazor wasm standalone (small)
220+
runs-on: ubuntu-24.04
221+
222+
steps:
223+
224+
- name: Checkout source code
225+
uses: actions/checkout@v4
226+
227+
- name: Setup .NET
228+
uses: actions/setup-dotnet@v4
229+
with:
230+
global-json-file: src/global.json
231+
232+
- name: Create project from Boilerplate
233+
run: |
234+
cd src/Templates/Boilerplate && dotnet build -c Release
235+
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
236+
dotnet new install Bit.Boilerplate.0.0.0.nupkg
237+
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --framework net9.0
238+
239+
- name: Update core appsettings.json
240+
uses: devops-actions/[email protected]
241+
with:
242+
files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.json, TodoSample/src/Client/TodoSample.Client.Web/appsettings.Production.json'
243+
env:
244+
ServerAddress: ${{ env.SERVER_ADDRESS }}
245+
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
246+
247+
- uses: actions/setup-node@v4
248+
with:
249+
node-version: 22
250+
251+
- name: Install wasm
252+
run: cd src && dotnet workload install wasm-tools
253+
254+
- name: Generate CSS/JS files
255+
run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release
256+
257+
- name: Publish
258+
run: dotnet publish TodoSample/src/Client/TodoSample.Client.Web/TodoSample.Client.Web.csproj -c Release -p:PwaEnabled=true -o ${{env.DOTNET_ROOT}}/client -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:MultilingualEnabled=false
259+
260+
- name: Upload to asw
261+
run: |
262+
npm install -g @azure/static-web-apps-cli
263+
swa deploy --deployment-token ${{ secrets.TODO_SMALL_ASW_TOKEN }} --env production --app-location ${{env.DOTNET_ROOT}}/client/wwwroot
170264
171265
build_blazor_hybrid_windows:
172266
name: build blazor hybrid (windows)
@@ -195,13 +289,14 @@ jobs:
195289
cd src\Templates\Boilerplate && dotnet build -c Release
196290
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
197291
dotnet new install Bit.Boilerplate.0.0.0.nupkg
198-
cd ..\..\..\ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --windows --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net8.0
292+
cd ..\..\..\ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --windows --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --captcha reCaptcha --signalR --framework net8.0
199293
200294
- name: Update core appsettings.json
201295
uses: devops-actions/[email protected]
202296
with:
203297
files: 'TodoSample\src\Shared\appsettings.json, TodoSample\src\Client\TodoSample.Client.Core\appsettings.json, TodoSample\src\Client\TodoSample.Client.Windows\appsettings.json'
204298
env:
299+
WebAppUrl: ${{ env.SERVER_ADDRESS }}
205300
ServerAddress: ${{ env.SERVER_ADDRESS }}
206301
Logging.Sentry.Dsn: ${{ secrets.TODO_SENTRY_DSN }}
207302
WindowsUpdate.FilesUrl: https://windows-todo.bitplatform.dev
@@ -251,7 +346,7 @@ jobs:
251346
cd src/Templates/Boilerplate && dotnet build -c Release
252347
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
253348
dotnet new install Bit.Boilerplate.0.0.0.nupkg
254-
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
349+
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
255350
256351
- name: Extract Android signing key from env
257352
uses: timheuer/[email protected]
@@ -272,6 +367,7 @@ jobs:
272367
with:
273368
files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Maui/appsettings.json'
274369
env:
370+
WebAppUrl: ${{ env.SERVER_ADDRESS }}
275371
ServerAddress: ${{ env.SERVER_ADDRESS }}
276372
Logging.Sentry.Dsn: ${{ secrets.TODO_SENTRY_DSN }}
277373
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
@@ -348,13 +444,14 @@ jobs:
348444
cd src/Templates/Boilerplate && dotnet build -c Release
349445
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
350446
dotnet new install Bit.Boilerplate.0.0.0.nupkg
351-
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --serverUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
447+
cd ../../../ && dotnet new bit-bp --name TodoSample --database PostgreSQL --sample Todo --appInsights --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --framework net8.0
352448
353449
- name: Update core appsettings.json
354450
uses: devops-actions/[email protected]
355451
with:
356452
files: 'TodoSample/src/Shared/appsettings.json, TodoSample/src/Client/TodoSample.Client.Core/appsettings.json, TodoSample/src/Client/TodoSample.Client.Maui/appsettings.json'
357453
env:
454+
WebAppUrl: ${{ env.SERVER_ADDRESS }}
358455
ServerAddress: ${{ env.SERVER_ADDRESS }}
359456
Logging.Sentry.Dsn: ${{ secrets.TODO_SENTRY_DSN }}
360457
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 bit platform
3+
Copyright (c) 2025 bit platform
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)