Skip to content

Commit

Permalink
Merge pull request #6032 from bitfoundation/develop
Browse files Browse the repository at this point in the history 
Version 7.2.0 (#6029)
  • Loading branch information
@msynk
msynk authored Nov 14, 2023
2 parents 50fc761 + c53e0bd commit be99167
Show file tree
Hide file tree
Showing 1,784 changed files with 40,911 additions and 57,785 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"hostRequirements": {
"cpus": 4
},
"onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/9144f37e-b370-41ee-a86f-2d2a69251652/bc1d544112ec134184a5aec7f7a1eaf9/dotnet-sdk-8.0.100-rc.2.23502.2-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 && dotnet dev-certs https --trust && dotnet build src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj && dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Web/Bit.Websites.Platform.Web.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Web/Bit.Websites.Sales.Web.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
"onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/9144f37e-b370-41ee-a86f-2d2a69251652/bc1d544112ec134184a5aec7f7a1eaf9/dotnet-sdk-8.0.100-rc.2.23502.2-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 && dotnet dev-certs https --trust && dotnet build src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj && dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Web/Bit.Websites.Platform.Web.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Web/Bit.Websites.Sales.Web.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
"waitFor": "onCreateCommand",
"customizations": {
"codespaces": {
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ body:
- .NET Sdk version? For example `7.0.401`
- IDE / Version? For example `Visual Studio 17.8 Preview 1`
- Bit.BlazorUI nuget package's version? (If applicable) For example `5.3.0`
- Bit.TodoTemplate nuget package's version? (If applicable) For example `4.0.0`
- Bit.Boilerplate nuget package's version? (If applicable) For example `4.0.0`
- Blazor mode? (If applicable) `WebAssembly (Client)`, `Server`, `Hybrid (MAUI)`, `Electron`
- Customer / Consumers Browser / OS? (If applicable) For example `Chrome 101` For blazor web assembly and server or `Android 12` for hybrid
Expand Down
110 changes: 78 additions & 32 deletions .github/workflows/adminpanel.cd.yml
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .github/workflows/blazorui.demo.cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ jobs:
with:
global-json-file: src/global.json

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15'

- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/nuget.org.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,14 @@ jobs:
- name: dotnet pack SourceGenerators
run: dotnet pack src/SourceGenerators/Bit.SourceGenerators/Bit.SourceGenerators.csproj --output . --configuration Release

- name: dotnet pack TodoTemplate
run: dotnet pack src/Templates/TodoTemplate/Bit.TodoTemplate.ProjectTemplate.csproj --output . --configuration Release
- name: dotnet pack Boilerplate
run: dotnet pack src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack AdminPanel
run: dotnet pack src/Templates/AdminPanel/Bit.AdminPanel.ProjectTemplate.csproj --output . --configuration Release
- name: dotnet pack BlazorWeb
run: dotnet pack src/Templates/BlazorWeb/Bit.BlazorWeb.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack BlazorServer
run: dotnet pack src/Templates/BlazorServer/Bit.BlazorServer.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack BlazorWasm
run: dotnet pack src/Templates/BlazorWasm/Bit.BlazorWasm.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack BlazorDual
run: dotnet pack src/Templates/BlazorDual/Bit.BlazorDual.ProjectTemplate.csproj --output . --configuration Release
- name: dotnet pack BlazorEmpty
run: dotnet pack src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet nuget push
run: dotnet nuget push *.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_ORG_API_KEY}} --skip-duplicate
25 changes: 7 additions & 18 deletions .github/workflows/platform.website.cd.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Platform Website CD

env:
WEB_APP_DEPLOYMENT_TYPE: 'SSR'
APP_SERVICE_NAME: 'bitplatform'

on:
Expand All @@ -14,8 +13,8 @@ permissions:

jobs:

build_blazor_api_wasm:
name: build blazor api + web assembly
build_api_blazor:
name: build api + blazor
runs-on: ubuntu-22.04

steps:
Expand All @@ -28,34 +27,24 @@ jobs:
with:
global-json-file: src/global.json

- name: Switch to blazor web assembly
run: sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/Websites/Platform/src/Bit.Websites.Platform.Web/Bit.Websites.Platform.Web.csproj

- name: Install wasm
run: cd src && dotnet workload install wasm-tools wasm-experimental

- name: Update appsettings.json api server address
uses: microsoft/variable-substitution@v1
with:
files: 'src/Websites/Platform/src/Bit.Websites.Platform.Web/appsettings.json'
env:
ApiServerAddress: 'api/'

- name: Generate CSS/JS files
run: dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Web/Bit.Websites.Platform.Web.csproj -t:BeforeBuildTasks --no-restore
run: dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj -t:BeforeBuildTasks --no-restore

- name: Publish
run: dotnet publish src/Websites/Platform/src/Bit.Websites.Platform.Api/Bit.Websites.Platform.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release --self-contained -r linux-x64 -o api-web
run: dotnet publish src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj -p:Configuration=Release --self-contained -r linux-x64 -o api-web

- name: Upload api-web artifact
uses: actions/upload-artifact@v3
with:
name: api-web-bundle
path: api-web

deploy_blazor_api_wasm:
name: deploy blazor api + web assembly
needs: build_blazor_api_wasm
deploy_api_blazor:
name: deploy api + blazor
needs: build_api_blazor
runs-on: ubuntu-22.04
environment:
name: 'production'
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/prerelease.nuget.org.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,14 @@ jobs:
- name: dotnet pack SourceGenerators
run: dotnet pack src/SourceGenerators/Bit.SourceGenerators/Bit.SourceGenerators.csproj --output . --configuration Release

- name: dotnet pack TodoTemplate
run: dotnet pack src/Templates/TodoTemplate/Bit.TodoTemplate.ProjectTemplate.csproj --output . --configuration Release
- name: dotnet pack Boilerplate
run: dotnet pack src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack AdminPanel
run: dotnet pack src/Templates/AdminPanel/Bit.AdminPanel.ProjectTemplate.csproj --output . --configuration Release
- name: dotnet pack BlazorWeb
run: dotnet pack src/Templates/BlazorWeb/Bit.BlazorWeb.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack BlazorServer
run: dotnet pack src/Templates/BlazorServer/Bit.BlazorServer.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack BlazorWasm
run: dotnet pack src/Templates/BlazorWasm/Bit.BlazorWasm.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet pack BlazorDual
run: dotnet pack src/Templates/BlazorDual/Bit.BlazorDual.ProjectTemplate.csproj --output . --configuration Release
- name: dotnet pack BlazorEmpty
run: dotnet pack src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj --output . --configuration Release

- name: dotnet nuget push
run: dotnet nuget push *.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_ORG_API_KEY}} --skip-duplicate
Loading

0 comments on commit be99167

Please sign in to comment.