Skip to content

Commit 4004d44

Browse files
msynkmsynk
authored
Merge pull request #7371 from bitfoundation/develop
Version 8.8.1 (#7369)
2 parents 0e62473 + df64882 commit 4004d44

File tree

157 files changed

+1767
-893
lines changed

Some content is hidden

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

157 files changed

+1767
-893
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"hostRequirements": {
44
"cpus": 4
55
},
6-
"onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/656a3402-6889-400f-927f-7f956856e58b/93750973d6eedd17c6d963658e7ec214/dotnet-sdk-8.0.203-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && sudo dotnet workload install wasm-tools wasm-experimental && dotnet dev-certs https --trust && dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
6+
"onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/0a1b3cbd-b4af-4d0d-9ed7-0054f0e200b4/4bcc533c66379caaa91770236667aacb/dotnet-sdk-8.0.204-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && sudo dotnet workload install wasm-tools wasm-experimental && dotnet dev-certs https --trust && dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
77
"waitFor": "onCreateCommand",
88
"customizations": {
99
"codespaces": {

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

+43-35
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
steps:
2424

2525
- name: Checkout source code
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Setup .NET
29-
uses: actions/setup-dotnet@v3
29+
uses: actions/setup-dotnet@v4
3030
with:
3131
global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
3232

@@ -35,18 +35,19 @@ 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 SqlServer --sample Admin
38+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --appInsights
3939
4040
- name: Update appsettings.json api server address
41-
uses: microsoft/variable-substitution@v1
41+
uses: devops-actions/variable-substitution@v1.2
4242
with:
4343
files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
4444
env:
4545
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
46+
ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
4647

47-
- uses: actions/setup-node@v3
48+
- uses: actions/setup-node@v4
4849
with:
49-
node-version: 18
50+
node-version: 20
5051

5152
- name: Install wasm
5253
run: cd src && dotnet workload install wasm-tools wasm-experimental
@@ -67,7 +68,7 @@ jobs:
6768
run: dotnet publish AdminPanel/src/AdminPanel.Server/AdminPanel.Server.csproj -c Release -p:PwaEnabled=true --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/server -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}"
6869

6970
- name: Upload server artifact
70-
uses: actions/upload-artifact@v3
71+
uses: actions/upload-artifact@v4
7172
with:
7273
name: server-bundle
7374
path: ${{env.DOTNET_ROOT}}/server
@@ -83,7 +84,7 @@ jobs:
8384
steps:
8485

8586
- name: Retrieve server bundle
86-
uses: actions/download-artifact@v2
87+
uses: actions/download-artifact@v4
8788
with:
8889
name: server-bundle
8990

@@ -92,7 +93,7 @@ jobs:
9293
rm IdentityCertificate.pfx
9394
9495
- name: Extract identity certificate from env
95-
uses: timheuer/base64-to-file@v1
96+
uses: timheuer/base64-to-file@v1.2
9697
with:
9798
fileDir: './'
9899
fileName: 'IdentityCertificate.pfx'
@@ -120,31 +121,32 @@ jobs:
120121
steps:
121122

122123
- name: Checkout source code
123-
uses: actions/checkout@v3
124+
uses: actions/checkout@v4
124125

125126
- name: Setup .NET
126-
uses: actions/setup-dotnet@v3
127+
uses: actions/setup-dotnet@v4
127128
with:
128129
global-json-file: src\Templates\Boilerplate\Bit.Boilerplate\global.json
129130

130-
- uses: actions/setup-node@v3
131+
- uses: actions/setup-node@v4
131132
with:
132-
node-version: 18
133+
node-version: 20
133134

134135
- name: Create project from Boilerplate
135136
run: |
136137
cd src\Templates\Boilerplate && dotnet build -c Release
137138
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
138139
dotnet new install Bit.Boilerplate.0.0.0.nupkg
139-
cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --windows
140+
cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --windows --appInsights
140141
141142
- name: Update appsettings.json api server address
142-
uses: microsoft/variable-substitution@v1
143+
uses: devops-actions/variable-substitution@v1.2
143144
with:
144145
files: 'AdminPanel\src\Client\AdminPanel.Client.Core\appsettings.json'
145146
env:
146147
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
147148
WindowsUpdateSettings.FilesUrl: https://windows-adminpanel.bitplatform.dev
149+
ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
148150

149151
- name: Generate CSS/JS files
150152
run: dotnet build AdminPanel\src\Client\AdminPanel.Client.Core\AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
@@ -165,7 +167,7 @@ jobs:
165167
echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h
166168
echo A | xcopy .\bin\publish .\publish-result /s /e /h
167169
dotnet tool restore
168-
dotnet vpk pack -u AdminPanel.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e AdminPanel.Client.Windows-x86.exe -r win-x86 --framework net8.0.2-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel'
170+
dotnet vpk pack -u AdminPanel.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e AdminPanel.Client.Windows-x86.exe -r win-x86 --framework net8.0.4-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel'
169171
170172
- name: Upload artifact
171173
uses: actions/upload-artifact@v2
@@ -180,10 +182,10 @@ jobs:
180182
steps:
181183

182184
- name: Checkout source code
183-
uses: actions/checkout@v3
185+
uses: actions/checkout@v4
184186

185187
- name: Setup .NET
186-
uses: actions/setup-dotnet@v3
188+
uses: actions/setup-dotnet@v4
187189
with:
188190
global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
189191

@@ -192,25 +194,26 @@ jobs:
192194
cd src/Templates/Boilerplate && dotnet build -c Release
193195
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
194196
dotnet new install Bit.Boilerplate.0.0.0.nupkg
195-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin
197+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --appInsights
196198
197-
- uses: actions/setup-node@v3
199+
- uses: actions/setup-node@v4
198200
with:
199-
node-version: 18
201+
node-version: 20
200202

201203
- name: Extract Android signing key from env
202-
uses: timheuer/base64-to-file@v1
204+
uses: timheuer/base64-to-file@v1.2
203205
with:
204206
fileDir: './AdminPanel/src/Client/AdminPanel.Client.Maui/'
205207
fileName: 'AdminPanel.keystore'
206208
encodedString: ${{ secrets.ANDROID_RELEASE_KEYSTORE_FILE_BASE64 }}
207209

208210
- name: Update appsettings.json api server address
209-
uses: microsoft/variable-substitution@v1
211+
uses: devops-actions/variable-substitution@v1.2
210212
with:
211213
files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
212214
env:
213215
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
216+
ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
214217

215218
- name: Set android universal link
216219
run: sed -i 's/bp.bitplatform.dev/adminpanel.bitplatform.dev/g' AdminPanel/src/Client/AdminPanel.Client.Maui/Platforms/Android/MainActivity.cs
@@ -222,7 +225,9 @@ jobs:
222225
run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
223226

224227
- name: Generate CSS/JS files
225-
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
228+
run: |
229+
dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
230+
dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
226231
227232
- name: Build aab
228233
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="AdminPanel.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net8.0-android
@@ -235,39 +240,40 @@ jobs:
235240

236241
build_blazor_hybrid_ios:
237242
name: build blazor hybrid (iOS-macOS)
238-
runs-on: macos-13
243+
runs-on: macos-14
239244

240245
steps:
241246

242247
- name: Checkout source code
243-
uses: actions/checkout@v3
248+
uses: actions/checkout@v4
244249

245250
- name: Setup .NET
246-
uses: actions/setup-dotnet@v3
251+
uses: actions/setup-dotnet@v4
247252
with:
248253
global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
249254

250255
- uses: maxim-lobanov/setup-xcode@v1
251256
with:
252-
xcode-version: '15'
257+
xcode-version: '15.3'
253258

254-
- uses: actions/setup-node@v3
259+
- uses: actions/setup-node@v4
255260
with:
256-
node-version: 18
261+
node-version: 20
257262

258263
- name: Create project from Boilerplate
259264
run: |
260265
cd src/Templates/Boilerplate && dotnet build -c Release
261266
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
262267
dotnet new install Bit.Boilerplate.0.0.0.nupkg
263-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin
268+
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --appInsights
264269
265270
- name: Update appsettings.json api server address
266-
uses: microsoft/variable-substitution@v1
271+
uses: devops-actions/variable-substitution@v1.2
267272
with:
268273
files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
269274
env:
270275
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
276+
ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
271277

272278
- name: Set iOS universal link
273279
run: brew install gnu-sed && gsed -i 's/bp.bitplatform.dev/adminpanel.bitplatform.dev/g' AdminPanel/src/Client/AdminPanel.Client.Maui/Platforms/iOS/Entitlements.plist
@@ -276,14 +282,14 @@ jobs:
276282
run: cd src && dotnet workload install maui
277283

278284
- name: Extract iOS code signing certificate from env
279-
uses: timheuer/base64-to-file@v1
285+
uses: timheuer/base64-to-file@v1.2
280286
with:
281287
fileDir: './'
282288
fileName: 'DistributionCert.p12'
283289
encodedString: ${{ secrets.APPSTORE_CODE_SIGNING_CERTIFICATE_FILE_BASE64 }}
284290

285291
- name: Import Code-Signing Certificates
286-
uses: Apple-Actions/import-codesign-certs@v1
292+
uses: apple-actions/import-codesign-certs@v2
287293
with:
288294
p12-filepath: './DistributionCert.p12'
289295
p12-password: ${{ secrets.APPSTORE_CODE_SIGNING_CERTIFICATE_FILE_PASSWORD }}
@@ -297,7 +303,9 @@ jobs:
297303
api-private-key: ${{ secrets.APPSTORE_API_KEY_PRIVATE_KEY }}
298304

299305
- name: Generate CSS/JS files
300-
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
306+
run: |
307+
dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
308+
dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore
301309
302310
- name: Build ipa
303311
run: dotnet publish AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="AdminPanel" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net8.0-ios

‎.github/workflows/bit.ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
uses: actions/checkout@v2
1717

1818
- name: Setup .NET
19-
uses: actions/setup-dotnet@v3
19+
uses: actions/setup-dotnet@v4
2020
with:
2121
global-json-file: src/global.json
2222

23-
- uses: actions/setup-node@v3
23+
- uses: actions/setup-node@v4
2424
with:
25-
node-version: 18
25+
node-version: 20
2626

2727
- name: Install wasm and maui
2828
run: cd src && dotnet workload install maui-android wasm-tools wasm-experimental
@@ -44,13 +44,13 @@ jobs:
4444
uses: actions/checkout@v2
4545

4646
- name: Setup .NET
47-
uses: actions/setup-dotnet@v3
47+
uses: actions/setup-dotnet@v4
4848
with:
4949
global-json-file: src/global.json
5050

51-
- uses: actions/setup-node@v3
51+
- uses: actions/setup-node@v4
5252
with:
53-
node-version: 18
53+
node-version: 20
5454

5555
- name: Install wasm and maui
5656
run: cd src && dotnet workload install maui-android wasm-tools wasm-experimental

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
uses: actions/checkout@v2
1616

1717
- name: Setup .NET
18-
uses: actions/setup-dotnet@v3
18+
uses: actions/setup-dotnet@v4
1919
with:
2020
global-json-file: src/global.json
2121

22-
- uses: actions/setup-node@v3
22+
- uses: actions/setup-node@v4
2323
with:
24-
node-version: 18
24+
node-version: 20
2525

2626
- name: Install Bit.Boilerplate from local source
2727
run: |

0 commit comments

Comments
 (0)