Skip to content

Commit

Permalink
Merge pull request #4858 from bitfoundation/develop
Browse files Browse the repository at this point in the history
Version 5.2.0 (#4854)
  • Loading branch information
msynk authored Jul 28, 2023
2 parents 9db89f3 + 72c868e commit 71c6b5d
Show file tree
Hide file tree
Showing 864 changed files with 16,788 additions and 29,770 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/adminpanel.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ jobs:
run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-maccatalyst

- name: Build (To generate CSS/JS files)
run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:CreatePackage=true -f net7.0-maccatalyst
run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net7.0-maccatalyst

- name: Build pkg
run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net7.0-maccatalyst
Expand Down Expand Up @@ -323,17 +323,20 @@ jobs:
env:
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}

- name: Switch to BlazorElectron
run: awk '/<BlazorMode>/{sub(">.*</", ">BlazorElectron</")}1' src/Templates/AdminPanel/Bit.AdminPanel/src/Directory.Build.props > temp.xml && mv temp.xml src/Templates/AdminPanel/Bit.AdminPanel/src/Directory.Build.props

- name: Restore workloads
run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj -p:BlazorMode=BlazorElectron
run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj

- name: Build (To generate CSS/JS files)
run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj -p:BlazorMode=BlazorElectron -p:Configuration=Release
run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj -p:Configuration=Release

- name: Build app image
run: cd src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/ && dotnet electronize build /target linux /p:BlazorMode=BlazorElectron
run: cd src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/ && dotnet electronize build /target linux

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: linux-app-image
path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/bin/Desktop/linux-unpacked/*.*
path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/bin/Desktop/linux-unpacked
14 changes: 10 additions & 4 deletions .github/workflows/bit.ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bit Platform CI
name: bit platform CI
on:
workflow_dispatch:
pull_request:
Expand All @@ -24,7 +24,10 @@ jobs:
with:
node-version: latest

- name: Restore prerelease
- name: Restore workloads prerelease
run: dotnet workload restore src/Bit-CI-release.sln && dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj

- name: Restore nuget packages prerelease
run: dotnet restore src/Bit-CI-release.sln

- name: MSBuild prerelease
Expand Down Expand Up @@ -57,8 +60,11 @@ jobs:
with:
node-version: latest

- name: Restore
run: dotnet restore src/Bit-CI.sln /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: Restore workloads
run: dotnet workload restore src/Bit-CI.sln && dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj

- name: Restore nuget packages
run: dotnet workload restore src/Bit-CI.sln && dotnet restore src/Bit-CI.sln /p:WarningLevel=0 /p:RunCodeAnalysis=false

- name: MSBuild
run: dotnet msbuild src/Bit-CI.sln -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
Expand Down
71 changes: 58 additions & 13 deletions .github/workflows/blazorui.demo.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v3

- name: Setup .NET (Bit Blazor UI)
- name: Setup .NET (bit Blazor UI)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/global.json

- name: Setup .NET (Bit Blazor UI Demo)
- name: Setup .NET (bit Blazor UI Demo)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/BlazorUI/Demo/global.json
Expand Down Expand Up @@ -93,12 +93,12 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v3

- name: Setup .NET (Bit Blazor UI)
- name: Setup .NET (bit Blazor UI)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/global.json

- name: Setup .NET (Bit Blazor UI Demo)
- name: Setup .NET (bit Blazor UI Demo)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/BlazorUI/Demo/global.json
Expand Down Expand Up @@ -141,12 +141,12 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v3

- name: Setup .NET (Bit Blazor UI)
- name: Setup .NET (bit Blazor UI)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/global.json

- name: Setup .NET (Bit Blazor UI Demo)
- name: Setup .NET (bit Blazor UI Demo)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/BlazorUI/Demo/global.json
Expand Down Expand Up @@ -190,7 +190,6 @@ jobs:
name: android-bundle
path: src/BlazorUI/Demo/Client/App/bin/release/net7.0-android/*-Signed.*


build_blazor_hybrid_ios:
name: build blazor hybrid (ios)
runs-on: macos-latest
Expand All @@ -200,12 +199,12 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v3

- name: Setup .NET (Bit Blazor UI)
- name: Setup .NET (bit Blazor UI)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/global.json

- name: Setup .NET (Bit Blazor UI Demo)
- name: Setup .NET (bit Blazor UI Demo)
uses: actions/setup-dotnet@v3
with:
global-json-file: src/BlazorUI/Demo/global.json
Expand Down Expand Up @@ -260,6 +259,49 @@ jobs:
name: ios-bundle
path: src/BlazorUI/Demo/Client/App/bin/release/net7.0-ios/ios-arm64/publish/*.ipa

build_blazor_hybrid_maccatalyst:
name: build blazor hybrid (maccatalyst)
runs-on: macos-latest

steps:

- name: Checkout source code
uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
global-json-file: src/BlazorUI/Demo/global.json

- uses: actions/setup-node@v3
with:
node-version: latest

- name: Update appsettings.json api server address
uses: microsoft/variable-substitution@v1
with:
files: 'src/BlazorUI/Demo/Client/Core/appsettings.json'
env:
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}

- name: Install Maui
run: dotnet workload install maui

- name: Restore workloads
run: dotnet workload restore src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-maccatalyst

- name: Build (To generate CSS/JS files)
run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net7.0-maccatalyst

- name: Build pkg
run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net7.0-maccatalyst

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: mac-pkg-bundle
path: src/BlazorUI/Demo/Client/App/bin/release/net7.0-maccatalyst/*.pkg

build_blazor_electron_linux:
name: build blazor electron (linux)
runs-on: ubuntu-latest
Expand Down Expand Up @@ -290,17 +332,20 @@ jobs:
env:
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}

- name: Switch to BlazorElectron
run: awk '/<BlazorMode>/{sub(">.*</", ">BlazorElectron</")}1' src/BlazorUI/Demo/Directory.Build.props > temp.xml && mv temp.xml src/BlazorUI/Demo/Directory.Build.props

- name: Restore workloads
run: dotnet workload restore src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj -p:BlazorMode=BlazorElectron
run: dotnet workload restore src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj

- name: Build (To generate CSS/JS files)
run: dotnet build src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj -p:BlazorMode=BlazorElectron -p:Configuration=Release
run: dotnet build src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj -p:Configuration=Release

- name: Build app image
run: cd src/BlazorUI/Demo/Client/Web/ && dotnet electronize build /target linux /p:BlazorMode=BlazorElectron
run: cd src/BlazorUI/Demo/Client/Web/ && dotnet electronize build /target linux

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: linux-app-image
path: src/BlazorUI/Demo/Client/Web/bin/Desktop/linux-unpacked/*.*
path: src/BlazorUI/Demo/Client/Web/bin/Desktop/linux-unpacked
18 changes: 18 additions & 0 deletions .github/workflows/nuget.org.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,24 @@ jobs:
- name: dotnet pack BlazorUI.Extras
run: dotnet pack src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj --output . --configuration Release

- name: dotnet restore BlazorUI.Assets
run: dotnet restore src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Assets (1)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Assets (2)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet pack BlazorUI.Assets
run: dotnet pack src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj --output . --configuration Release

- name: dotnet restore BlazorUI.Icons
run: dotnet restore src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Icons (1)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Icons (2)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet pack BlazorUI.Icons
run: dotnet pack src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj --output . --configuration Release

- name: dotnet restore Bswup
run: dotnet restore src/Bswup/Bit.Bswup/Bit.Bswup.csproj /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild Bswup (1)
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/prerelease.nuget.org.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,24 @@ jobs:
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet pack BlazorUI.Extras
run: dotnet pack src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj --output . --configuration Release

- name: dotnet restore BlazorUI.Assets
run: dotnet restore src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Assets (1)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Assets (2)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet pack BlazorUI.Assets
run: dotnet pack src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj --output . --configuration Release

- name: dotnet restore BlazorUI.Icons
run: dotnet restore src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Icons (1)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet msbuild BlazorUI.Icons (2)
run: dotnet msbuild src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj /P:Configuration=Release /p:GeneratePackageOnBuild=false -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
- name: dotnet pack BlazorUI.Icons
run: dotnet pack src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj --output . --configuration Release

- name: dotnet restore Bswup
run: dotnet restore src/Bswup/Bit.Bswup/Bit.Bswup.csproj /p:WarningLevel=0 /p:RunCodeAnalysis=false
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/todotemplate.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:
run: dotnet workload restore src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:MultilingualEnabled=false -f net7.0-maccatalyst

- name: Build (To generate CSS/JS files)
run: dotnet build src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:CreatePackage=true -p:MultilingualEnabled=false -f net7.0-maccatalyst
run: dotnet build src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:MultilingualEnabled=false -f net7.0-maccatalyst

- name: Build pkg
run: dotnet build src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:MultilingualEnabled=false -f net7.0-maccatalyst
Expand Down Expand Up @@ -322,17 +322,23 @@ jobs:
env:
ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}

- name: Switch to BlazorElectron
run: awk '/<BlazorMode>/{sub(">.*</", ">BlazorElectron</")}1' src/Templates/TodoTemplate/Bit.TodoTemplate/src/Directory.Build.props > temp.xml && mv temp.xml src/Templates/TodoTemplate/Bit.TodoTemplate/src/Directory.Build.props

- name: Disable Multilingual
run: awk '/<MultilingualEnabled>/{sub(">.*</", ">false</")}1' src/Templates/TodoTemplate/Bit.TodoTemplate/src/Directory.Build.props > temp.xml && mv temp.xml src/Templates/TodoTemplate/Bit.TodoTemplate/src/Directory.Build.props

- name: Restore workloads
run: dotnet workload restore src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj -p:BlazorMode=BlazorElectron -p:MultilingualEnabled=false
run: dotnet workload restore src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj

- name: Build (To generate CSS/JS files)
run: dotnet build src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj -p:BlazorMode=BlazorElectron -p:Configuration=Release -p:MultilingualEnabled=false
run: dotnet build src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj -p:Configuration=Release

- name: Build app image
run: cd src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/ && dotnet electronize build /target linux /p:BlazorMode=BlazorElectron /p:MultilingualEnabled=false
run: cd src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/ && dotnet electronize build /target linux

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: linux-app-image
path: src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/bin/Desktop/linux-unpacked/*.*
path: src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Web/bin/Desktop/linux-unpacked
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ ModelManifest.xml

profile.arm.json

# Bit Platform
# bit
*.map
_book
*yarn.lock
Expand All @@ -241,6 +241,14 @@ _book
/src/BlazorUI/Bit.BlazorUI.Extras/wwwroot/scripts/*.js
/src/BlazorUI/Bit.BlazorUI.Extras/wwwroot/**/*.css.gz

/src/BlazorUI/Bit.BlazorUI.Assets/**/*.css
/src/BlazorUI/Bit.BlazorUI.Assets/wwwroot/scripts/*.js
/src/BlazorUI/Bit.BlazorUI.Assets/wwwroot/**/*.css.gz

/src/BlazorUI/Bit.BlazorUI.Icons/**/*.css
/src/BlazorUI/Bit.BlazorUI.Icons/wwwroot/scripts/*.js
/src/BlazorUI/Bit.BlazorUI.Icons/wwwroot/**/*.css.gz

/src/Bup/Bit.Bup/wwwroot/**/*.js
/src/Bup/Bit.Bup/wwwroot/**/*.css
/src/Bswup/Bit.Bswup/wwwroot/**/*.js
Expand Down
7 changes: 3 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
There are many ways to contribute

* Give us a try and use bit platform nuget packages in your apps!
* [Code review](https://github.com/bitfoundation/bitplatform/pulls)
* Fork / Star this project! (":
* Fork / Star this project 😊
* Submit [bugs](https://github.com/bitfoundation/bitplatform/issues/new?template=bug_report.yml) & [feature requests](https://github.com/bitfoundation/bitplatform/issues/new?template=feature_request.yml)
* Engage with other developers on [stackoverflow](https://stackoverflow.com/questions/tagged/bitplatform)
* Checkout our list of [issues](https://github.com/bitfoundation/bitplatform/issues) and submit new PRs 🤩
* Engage with other developers on [stackoverflow](https://stackoverflow.com/questions/tagged/bitplatform)
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Bit Platform
Copyright (c) 2023 bit platform

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

0 comments on commit 71c6b5d

Please sign in to comment.