Skip to content

Commit 19fff18

Browse files
authored
Merge pull request #6696 from bitfoundation/develop
Version 8.7.3 (#6692)
2 parents 92f0117 + cb57b6f commit 19fff18

File tree

189 files changed

+7801
-2483
lines changed

Some content is hidden

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

189 files changed

+7801
-2483
lines changed

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

Lines changed: 33 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717
jobs:
1818

1919
build_api_blazor:
20-
name: build api + blazor
20+
name: build api + blazor web
2121
runs-on: ubuntu-22.04
2222

2323
steps:
@@ -121,44 +121,57 @@ jobs:
121121

122122
- name: Checkout source code
123123
uses: actions/checkout@v3
124-
124+
125125
- name: Setup .NET
126126
uses: actions/setup-dotnet@v3
127127
with:
128-
global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
128+
global-json-file: src\Templates\Boilerplate\Bit.Boilerplate\global.json
129129

130-
- name: Create project from Boilerplate
131-
run: |
132-
cd src/Templates/Boilerplate && dotnet build -c Release
133-
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
134-
dotnet new install Bit.Boilerplate.0.0.0.nupkg
135-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin
136-
137130
- uses: actions/setup-node@v3
138131
with:
139132
node-version: 18
140133

134+
- name: Create project from Boilerplate
135+
run: |
136+
cd src\Templates\Boilerplate && dotnet build -c Release
137+
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
138+
dotnet new install Bit.Boilerplate.0.0.0.nupkg
139+
cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --windows
140+
141141
- name: Update appsettings.json api server address
142142
uses: microsoft/variable-substitution@v1
143143
with:
144-
files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
144+
files: 'AdminPanel\src\Client\AdminPanel.Client.Core\appsettings.json'
145145
env:
146146
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
147-
148-
- name: Install maui
149-
run: cd src && dotnet workload install maui
147+
WindowsUpdateSettings.FilesUrl: https://windows-adminpanel.bitplatform.dev
150148

151149
- name: Generate CSS/JS files
152-
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
153-
154-
- name: Build exe
155-
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:WindowsPackageType=None -p:SelfContained=true -p:WindowsAppSDKSelfContained=true -p:GenerateAppxPackageOnBuild=false -p:RuntimeIdentifier=win10-x86 -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -p:UseRidGraph=true -f net8.0-windows10.0.19041.0
150+
run: dotnet build AdminPanel\src\Client\AdminPanel.Client.Core\AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
151+
152+
- name: Publish
153+
run: |
154+
cd AdminPanel\src\Client\AdminPanel.Client.Windows\
155+
dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish-arm64 -r win-arm64
156+
ren .\bin\publish-arm64\AdminPanel.Client.Windows.exe AdminPanel.Client.Windows-arm64.exe
157+
dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish-x86 -r win-x86
158+
ren .\bin\publish-x86\AdminPanel.Client.Windows.exe AdminPanel.Client.Windows-x86.exe
159+
dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish-x64 -r win-x64
160+
ren .\bin\publish-x64\AdminPanel.Client.Windows.exe AdminPanel.Client.Windows-x64.exe
161+
dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish
162+
del .\bin\publish\AdminPanel.Client.Windows.exe
163+
echo D | xcopy .\bin\publish-arm64 .\publish-result /s /e /h
164+
echo A | xcopy .\bin\publish-x86 .\publish-result /s /e /h
165+
echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h
166+
echo A | xcopy .\bin\publish .\publish-result /s /e /h
167+
dotnet tool restore
168+
dotnet vpk pack -u AdminPanel.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e AdminPanel.Client.Windows-x64.exe -r win-x64 --framework net8.0.1-x64-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel'
156169
157170
- name: Upload artifact
158171
uses: actions/upload-artifact@v2
159172
with:
160173
name: win-exe-bundle
161-
path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/release/net8.0-windows10.0.19041.0/win10-x86
174+
path: AdminPanel\src\Client\AdminPanel.Client.Windows\Releases
162175

163176
build_blazor_hybrid_android:
164177
name: build blazor hybrid (android)
@@ -220,55 +233,8 @@ jobs:
220233
name: android-bundle
221234
path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/Release/net8.0-android/*-Signed.*
222235

223-
build_blazor_hybrid_maccatalyst:
224-
name: build blazor hybrid (maccatalyst)
225-
runs-on: macos-13
226-
227-
steps:
228-
229-
- name: Checkout source code
230-
uses: actions/checkout@v3
231-
232-
- name: Setup .NET
233-
uses: actions/setup-dotnet@v3
234-
with:
235-
global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
236-
237-
- uses: actions/setup-node@v3
238-
with:
239-
node-version: 18
240-
241-
- name: Create project from Boilerplate
242-
run: |
243-
cd src/Templates/Boilerplate && dotnet build -c Release
244-
dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
245-
dotnet new install Bit.Boilerplate.0.0.0.nupkg
246-
cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin
247-
248-
- name: Update appsettings.json api server address
249-
uses: microsoft/variable-substitution@v1
250-
with:
251-
files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
252-
env:
253-
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
254-
255-
- name: Install maui
256-
run: cd src && dotnet workload install maui
257-
258-
- name: Generate CSS/JS files
259-
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
260-
261-
- name: Build pkg
262-
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net8.0-maccatalyst
263-
264-
- name: Upload artifact
265-
uses: actions/upload-artifact@v2
266-
with:
267-
name: mac-pkg-bundle
268-
path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/release/net8.0-maccatalyst/*.pkg
269-
270236
build_blazor_hybrid_ios:
271-
name: build blazor hybrid (ios)
237+
name: build blazor hybrid (iOS-macOS)
272238
runs-on: macos-13
273239

274240
steps:

.github/workflows/bit.ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
6060

6161
- name: Build
62-
run: dotnet build src/Bit-CI.sln -p:WarningLevel=0 -p:RunCodeAnalysis=false
62+
run: dotnet build src/Bit-CI.sln -p:WarningLevel=0 -p:RunCodeAnalysis=false -p:EnableWindowsTargeting=true
6363

6464
- name: Test
6565
run: dotnet test --no-build --verbosity normal src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run: dotnet test src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj -c Release
6666

6767
- name: Release build bit blazor ui demo
68-
run: dotnet build src/BlazorUI/Bit.BlazorUI.sln -c Release -p:RunAOTCompilation=false
68+
run: dotnet build src/BlazorUI/Bit.BlazorUI.sln -c Release -p:RunAOTCompilation=false -p:EnableWindowsTargeting=true
6969

7070
- name: Create projects from BlazorEmpty project template with different parameters
7171
run: |

.github/workflows/blazorui.demo.cd.yml

Lines changed: 29 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515
jobs:
1616

1717
build_api_blazor:
18-
name: build api + blazor
18+
name: build api + blazor web
1919
runs-on: ubuntu-22.04
2020

2121
steps:
@@ -95,37 +95,50 @@ jobs:
9595

9696
- name: Checkout source code
9797
uses: actions/checkout@v3
98-
98+
9999
- name: Setup .NET
100100
uses: actions/setup-dotnet@v3
101101
with:
102-
global-json-file: src/global.json
103-
102+
global-json-file: src\global.json
103+
104104
- uses: actions/setup-node@v3
105105
with:
106106
node-version: 18
107-
107+
108108
- name: Update appsettings.json api server address
109109
uses: microsoft/variable-substitution@v1
110110
with:
111-
files: 'src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/appsettings.json'
111+
files: 'src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Core\appsettings.json'
112112
env:
113113
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
114-
115-
- name: Install maui
116-
run: cd src && dotnet workload install maui
114+
WindowsUpdateSettings.FilesUrl: https://windows-components.bitplatform.dev
117115

118116
- name: Generate CSS/JS files
119-
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -c Release
120-
121-
- name: Build exe
122-
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -c Release -p:WindowsPackageType=None -p:SelfContained=true -p:WindowsAppSDKSelfContained=true -p:GenerateAppxPackageOnBuild=false -p:RuntimeIdentifier=win10-x86 -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:UseRidGraph=true -f net8.0-windows10.0.19041.0
117+
run: dotnet build src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Core\Bit.BlazorUI.Demo.Client.Core.csproj -c Release
118+
119+
- name: Publish
120+
run: |
121+
cd src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Windows\
122+
dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish-arm64 -r win-arm64
123+
ren .\bin\publish-arm64\Bit.BlazorUI.Demo.Client.Windows.exe Bit.BlazorUI.Demo.Client.Windows-arm64.exe
124+
dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish-x86 -r win-x86
125+
ren .\bin\publish-x86\Bit.BlazorUI.Demo.Client.Windows.exe Bit.BlazorUI.Demo.Client.Windows-x86.exe
126+
dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish-x64 -r win-x64
127+
ren .\bin\publish-x64\Bit.BlazorUI.Demo.Client.Windows.exe Bit.BlazorUI.Demo.Client.Windows-x64.exe
128+
dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish
129+
del .\bin\publish\Bit.BlazorUI.Demo.Client.Windows.exe
130+
echo D | xcopy .\bin\publish-arm64 .\publish-result /s /e /h
131+
echo A | xcopy .\bin\publish-x86 .\publish-result /s /e /h
132+
echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h
133+
echo A | xcopy .\bin\publish .\publish-result /s /e /h
134+
dotnet tool restore
135+
dotnet vpk pack -u Bit.BlazorUI.Demo.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Bit.BlazorUI.Demo.Client.Windows-x64.exe -r win-x64 --framework net8.0.1-x64-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Bit Blazor UI'
123136
124137
- name: Upload artifact
125138
uses: actions/upload-artifact@v2
126139
with:
127140
name: win-exe-bundle
128-
path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/release/net8.0-windows10.0.19041.0/win10-x86
141+
path: src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Windows\Releases
129142

130143
build_blazor_hybrid_android:
131144
name: build blazor hybrid (android)
@@ -176,49 +189,9 @@ jobs:
176189
with:
177190
name: android-bundle
178191
path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/Release/net8.0-android/*-Signed.*
179-
180-
build_blazor_hybrid_maccatalyst:
181-
name: build blazor hybrid (maccatalyst)
182-
runs-on: macos-13
183-
184-
steps:
185-
186-
- name: Checkout source code
187-
uses: actions/checkout@v3
188-
189-
- name: Setup .NET
190-
uses: actions/setup-dotnet@v3
191-
with:
192-
global-json-file: src/global.json
193-
194-
- uses: actions/setup-node@v3
195-
with:
196-
node-version: 18
197-
198-
- name: Update appsettings.json api server address
199-
uses: microsoft/variable-substitution@v1
200-
with:
201-
files: 'src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/appsettings.json'
202-
env:
203-
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
204-
205-
- name: Install maui
206-
run: cd src && dotnet workload install maui
207-
208-
- name: Generate CSS/JS files
209-
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -c Release
210-
211-
- name: Build pkg
212-
run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -c Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-maccatalyst
213-
214-
- name: Upload artifact
215-
uses: actions/upload-artifact@v2
216-
with:
217-
name: mac-pkg-bundle
218-
path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/release/net8.0-maccatalyst/*.pkg
219-
192+
220193
build_blazor_hybrid_ios:
221-
name: build blazor hybrid (ios)
194+
name: build blazor hybrid (iOS-macOS)
222195
runs-on: macos-13
223196

224197
steps:

.github/workflows/platform.website.cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515

1616
build_api_blazor:
17-
name: build api + blazor
17+
name: build api + blazor web
1818
runs-on: ubuntu-22.04
1919

2020
steps:

.github/workflows/sales.website.cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515

1616
build_api_blazor:
17-
name: build api + blazor
17+
name: build api + blazor web
1818
runs-on: ubuntu-22.04
1919

2020
steps:

0 commit comments

Comments
 (0)