From 79d7d978a42b5ead608a4bbd8dff9f111ef63351 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Mon, 16 Oct 2023 05:43:55 +0000
Subject: [PATCH] feat: update to bit 7.0.0 #25 (#26)

---
 .devcontainer/devcontainer.json               |  2 +-
 .github/workflows/cd.yml                      | 10 ++++-----
 .github/workflows/ci.yml                      | 10 ++++-----
 global.json                                   |  4 ++--
 .../Bit.TemplatePlayground.Client.App.csproj  | 22 +++++++++----------
 .../Bit.TemplatePlayground.Client.Core.csproj | 20 ++++++++---------
 src/Client/Core/Pages/TermsPage.razor         | 22 +++++++++----------
 src/Client/Core/Styles/app.scss               |  1 +
 .../Bit.TemplatePlayground.Client.Web.csproj  | 12 +++++-----
 src/Client/Web/wwwroot/service-worker.js      |  2 +-
 .../Web/wwwroot/service-worker.published.js   |  2 +-
 src/Directory.Build.props                     |  2 +-
 .../Iac/Bit.TemplatePlayground.Iac.csproj     |  2 +-
 src/Server/Api/.config/dotnet-tools.json      |  2 +-
 .../Bit.TemplatePlayground.Server.Api.csproj  | 20 ++++++++---------
 src/Server/Api/Services/JwtService.cs         |  6 ++---
 .../Bit.TemplatePlayground.Shared.csproj      | 14 ++++++------
 src/Shared/Resources/AppStrings.fr.resx       |  2 +-
 18 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f10e414..2704de9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
     "hostRequirements": {
         "cpus": 4
     },
-    "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/764f2fec-710d-490d-a341-88636bce1a8d/35fc13fc20161a7d196200d9c2c6a8f0/dotnet-sdk-8.0.100-rc.1.23463.5-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 tool install --global dotnet-ef --version 8.0.0-rc.1.23419.6 && dotnet ef database update --project src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj && dotnet build src/Client/Web/Bit.TemplatePlayground.Client.Web.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 tool install --global dotnet-ef --version 8.0.0-rc.1.23419.6 && dotnet ef database update --project src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj && dotnet build src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj -t:BeforeBuildTasks --no-restore",
     "waitFor": "onCreateCommand",
     "customizations": {
         "codespaces": {
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 6f7e48b..52cbffd 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -40,7 +40,7 @@ jobs:
       run:  sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj
 
     - name: Install wasm
-      run:  dotnet workload install wasm-tools wasm-experimental --sdk-version=8.0.100-rc.1.23463.5
+      run:  cd src && dotnet workload install wasm-tools wasm-experimental
       
     - name: Generate CSS/JS files
       run: dotnet build src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore
@@ -144,7 +144,7 @@ jobs:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
   
     - name: Install maui
-      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui
   
     - name: Generate CSS/JS files
       run: dotnet build src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore
@@ -191,7 +191,7 @@ jobs:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
   
     - name: Install maui
-      run: dotnet workload install maui-android --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui-android
   
     - name: Generate CSS/JS files
       run: dotnet build src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore
@@ -234,7 +234,7 @@ jobs:
          ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
      - name: Install maui
-       run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
+       run: cd src && dotnet workload install maui
    
      - name: Generate CSS/JS files
        run: dotnet build src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore
@@ -274,7 +274,7 @@ jobs:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - name: Install maui
-      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui
   
     - name: Extract iOS code signing certificate from env
       uses: timheuer/base64-to-file@v1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22813be..585a72c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
         node-version: 18
 
     - name: Install maui
-      run: dotnet workload install maui-android --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui-android
 
     - name: Build
       run: dotnet build src/Client/App/Bit.TemplatePlayground.Client.App.csproj -p:RunAOTCompilation=false -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net8.0-android
@@ -76,7 +76,7 @@ jobs:
         node-version: 18
 
     - name: Install maui
-      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui
 
     - name: Build
       run: dotnet build src/Client/App/Bit.TemplatePlayground.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net8.0-windows10.0.19041.0
@@ -100,7 +100,7 @@ jobs:
         node-version: 18
 
     - name: Install maui
-      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui
 
     - name: Build
       run: dotnet build src/Client/App/Bit.TemplatePlayground.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net8.0-ios
@@ -124,7 +124,7 @@ jobs:
         node-version: 18
 
     - name: Install maui
-      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install maui
       
     - name: Build
       run: dotnet build src/Client/App/Bit.TemplatePlayground.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net8.0-maccatalyst
@@ -151,7 +151,7 @@ jobs:
       run:  sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj
 
     - name: Install wasm
-      run: dotnet workload install wasm-tools wasm-experimental --sdk-version=8.0.100-rc.1.23463.5
+      run: cd src && dotnet workload install wasm-tools wasm-experimental
       
     - name: Build
       run: dotnet build src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:Configuration=Release -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}"
\ No newline at end of file
diff --git a/global.json b/global.json
index 49b584f..273f0cf 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100-rc.1.23463.5",
-        "rollForward": "disable"
+        "version": "8.0.100-rc.2.23502.2",
+		"rollForward": "disable"
     }
 }
\ No newline at end of file
diff --git a/src/Client/App/Bit.TemplatePlayground.Client.App.csproj b/src/Client/App/Bit.TemplatePlayground.Client.App.csproj
index 6af407d..76555e6 100644
--- a/src/Client/App/Bit.TemplatePlayground.Client.App.csproj
+++ b/src/Client/App/Bit.TemplatePlayground.Client.App.csproj
@@ -16,7 +16,7 @@
 
         <!-- App Identifier -->
         <ApplicationId>com.bitplatform.Bit.TemplatePlayground.Template</ApplicationId>
-        <ApplicationIdGuid>B3CC4D37-6CF6-496B-8485-5EF012657E0C</ApplicationIdGuid>
+        <ApplicationIdGuid>2CF3C9D5-3732-41B7-95A7-77338B8C8474</ApplicationIdGuid>
 
         <!-- Versions -->
         <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -65,7 +65,7 @@
 
         <!-- App icon for all platforms -->
         <MauiIcon Include="Resources\AppIcon\appicon.svg" Color="#0065EF" />
-        
+
         <!-- Customize App icon for Android -->
         <MauiIcon Condition="$(TargetFramework.Contains('-android'))" Update="Resources\AppIcon\appicon.svg" Color="#0065EF" ForegroundScale="0.68" />
 
@@ -83,14 +83,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.BlazorUI" Version="6.0.0" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="6.0.0" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="6.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="6.0.0">
+        <PackageReference Include="Bit.BlazorUI" Version="7.0.0" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="7.0.0" />
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="7.0.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="6.0.0">
+        <PackageReference Include="Bit.SourceGenerators" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -102,10 +102,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-rc.1.9171" />
-        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.0-rc.1.9171" />
-        <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.0-rc.1.9171" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.0-rc.1.9171" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-rc.2.9373" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.0-rc.2.9373" />
+        <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.0-rc.2.9373" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.0-rc.2.9373" />
     </ItemGroup>
 
     <!-- Build Properties must be defined within these property groups to ensure successful publishing
diff --git a/src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj b/src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj
index 38cb13b..b73f672 100644
--- a/src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj
+++ b/src/Client/Core/Bit.TemplatePlayground.Client.Core.csproj
@@ -19,21 +19,21 @@
         <Content Remove="appsettings.json" />
         <EmbeddedResource Include="appsettings.json" />
 
-        <PackageReference Include="Bit.BlazorUI" Version="6.0.0" />
-        <PackageReference Include="Bit.BlazorUI.Icons" Version="6.0.0" />
-        <PackageReference Include="Bit.BlazorUI.Assets" Version="6.0.0" />
-        <PackageReference Include="Bit.BlazorUI.Extras" Version="6.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="6.0.0">
+        <PackageReference Include="Bit.BlazorUI" Version="7.0.0" />
+        <PackageReference Include="Bit.BlazorUI.Icons" Version="7.0.0" />
+        <PackageReference Include="Bit.BlazorUI.Assets" Version="7.0.0" />
+        <PackageReference Include="Bit.BlazorUI.Extras" Version="7.0.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="6.0.0">
+        <PackageReference Include="Bit.SourceGenerators" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0-rc.1.23421.29" />
-        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.1.23421.29" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.1.23421.29" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0-rc.2.23480.2" />
+        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.2.23480.2" />
 
         <Using Include="System.Net.Http.Json" />
         <Using Include="System.Collections.Concurrent" />
@@ -82,7 +82,7 @@
     </ItemGroup>
 
     <Target Name="BeforeBuildTasks" AfterTargets="CoreCompile">
-        <Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install sass@1.65.1 typescript@5.1.6 esbuild@0.19.0 --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
+        <Exec Condition="!Exists('node_modules/.bin/sass') OR !Exists('node_modules/.bin/esbuild') OR !Exists('node_modules/.bin/tsc')" Command="npm install sass@1.69.3 typescript@5.2.2 esbuild@0.19.4 --no-save" StandardOutputImportance="high" StandardErrorImportance="high" />
         <Exec Command="node_modules/.bin/sass .:. Styles/app.scss:wwwroot/styles/app.css --style compressed --load-path=. --update" StandardOutputImportance="high" StandardErrorImportance="high" />
         <Exec Command="node_modules/.bin/tsc" StandardOutputImportance="high" StandardErrorImportance="high" />
         <Exec Condition=" '$(Configuration)' == 'Release' " Command="node_modules/.bin/esbuild wwwroot/scripts/app.js --minify --outfile=wwwroot/scripts/app.js --allow-overwrite" StandardOutputImportance="high" StandardErrorImportance="high" />
diff --git a/src/Client/Core/Pages/TermsPage.razor b/src/Client/Core/Pages/TermsPage.razor
index 05a6ae8..ee13d5f 100644
--- a/src/Client/Core/Pages/TermsPage.razor
+++ b/src/Client/Core/Pages/TermsPage.razor
@@ -9,7 +9,7 @@
         <section class="main-section">
             <h1 class="main-section-title">Bit.TemplatePlayground license</h1>
             <div class="section-desc">
-                This EULA and Privacy Policy are written for individuals who use the Bit.TemplatePlayground Demo Version through the <BitLink Href="https://bit.templateplayground.bitplatform.dev" Target="_blank">bit.templateplayground.bitplatform.dev</BitLink> website, or the published version of this app on the BitPlatform's Google Play, Apple Store, and Microsoft Store accounts.
+                This EULA and Privacy Policy are written for individuals who use the Bit.TemplatePlayground Demo Version through the <BitLink Href="https://bit.templateplayground.bitplatform.dev" Target="_blank">bit.templateplayground.bitplatform.dev</BitLink> website, or the published version of this app on the bit platform's Google Play, Apple Store, and Microsoft Store accounts.
                 <br />
                 If you want to build your own project based on this Project Template, please refer to the <BitLink Href="https://github.com/bitfoundation/bitplatform/blob/develop/LICENSE" Target="_blank">License</BitLink> and create your own project, publish it with the relevant EULA and Privacy Policy for your business.s
             </div>
@@ -18,7 +18,7 @@
         <section class="sub-section">
             <h2 class="sub-section-title">End-User License Agreement (EULA) for Bit.TemplatePlayground Demo Version</h2>
             <div class="section-desc">
-                This End-User License Agreement (EULA) is a legal agreement between you (the "user") and BitPlatform, located at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands, with phone number <BitLink Href="tel:+31684207362">+31684207362</BitLink>, for the use of Bit.TemplatePlayground Demo Version (the "Software").
+                This End-User License Agreement (EULA) is a legal agreement between you (the "user") and bit platform, located at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands, with phone number <BitLink Href="tel:+31684207362">+31684207362</BitLink>, for the use of Bit.TemplatePlayground Demo Version (the "Software").
                 <br />
                 By using the Software, you agree to be bound by the terms and conditions of this agreement.
             </div>
@@ -27,28 +27,28 @@
         <section class="sub-section">
             <h2 class="sub-section-title">License Grant</h2>
             <div class="section-desc">
-                BitPlatform hereby grants the user a non-exclusive, non-transferable license to use the Software, solely for the purpose of evaluating and testing the features of the Bit.TemplatePlayground Demo Version during the term of this EULA.
+                bit platform hereby grants the user a non-exclusive, non-transferable license to use the Software, solely for the purpose of evaluating and testing the features of the Bit.TemplatePlayground Demo Version during the term of this EULA.
             </div>
         </section>
 
         <section class="sub-section">
             <h2 class="sub-section-title">Ownership</h2>
             <div class="section-desc">
-                BitPlatform retains all rights, title, and interest in and to the Software, including any and all intellectual property rights.
+                bit platform retains all rights, title, and interest in and to the Software, including any and all intellectual property rights.
             </div>
         </section>
 
         <section class="sub-section">
             <h2 class="sub-section-title">User Data</h2>
             <div class="section-desc">
-                BitPlatform may collect user data, including name, surname, photo, date of birth, and gender. Providing this information is optional, and BitPlatform will only use it for the purposes of the Bit.TemplatePlayground Demo Version. If the user requests, BitPlatform will delete this data within one day, using one of the contact methods provided at the end of this EULA. In addition, the user is required to provide an email address for account verification purposes, but BitPlatform will not use this email for any other purposes.
+                bit platform may collect user data, including name, surname, photo, date of birth, and gender. Providing this information is optional, and bit platform will only use it for the purposes of the Bit.TemplatePlayground Demo Version. If the user requests, bit platform will delete this data within one day, using one of the contact methods provided at the end of this EULA. In addition, the user is required to provide an email address for account verification purposes, but bit platform will not use this email for any other purposes.
             </div>
         </section>
 
         <section class="sub-section">
             <h2 class="sub-section-title">Analytics and Cookies</h2>
             <div class="section-desc">
-                BitPlatform does not use any Analytics tools for measuring website traffic and only uses strictly necessary cookies.
+                bit platform does not use any Analytics tools for measuring website traffic and only uses strictly necessary cookies.
             </div>
         </section>
 
@@ -62,28 +62,28 @@
         <section class="sub-section">
             <h2 class="sub-section-title">No Warranty</h2>
             <div class="section-desc">
-                The Software is provided "AS IS" and without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. BitPlatform does not warrant that the Software will be error-free or that its use will be uninterrupted.
+                The Software is provided "AS IS" and without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. bit platform does not warrant that the Software will be error-free or that its use will be uninterrupted.
             </div>
         </section>
 
         <section class="sub-section">
             <h2 class="sub-section-title">Limitation of Liability</h2>
             <div class="section-desc">
-                BitPlatform shall not be liable for any damages whatsoever arising out of the use of or inability to use the Software, including but not limited to direct, indirect, incidental, special, or consequential damages, even if BitPlatform has been advised of the possibility of such damages.
+                bit platform shall not be liable for any damages whatsoever arising out of the use of or inability to use the Software, including but not limited to direct, indirect, incidental, special, or consequential damages, even if bit platform has been advised of the possibility of such damages.
             </div>
         </section>
 
         <section class="sub-section">
             <h2 class="sub-section-title">Termination</h2>
             <div class="section-desc">
-                This EULA shall remain in effect until 2025-12-31. BitPlatform reserves the right to terminate this EULA at any time without notice. Upon termination, the user shall immediately cease all use of the Software and destroy all copies of the Software in its possession.
+                This EULA shall remain in effect until 2025-12-31. bit platform reserves the right to terminate this EULA at any time without notice. Upon termination, the user shall immediately cease all use of the Software and destroy all copies of the Software in its possession.
             </div>
         </section>
 
         <section class="sub-section">
             <h2 class="sub-section-title">Contact Information</h2>
             <div class="section-desc">
-                If you have any questions or concerns regarding this EULA or the Privacy Policy, or if you would like to contact BitPlatform for any reason, please email <BitLink Href="mailto:info@bitplatform.dev">info@bitplatform.dev</BitLink> or call <BitLink Href="tel:+31684207362">+31684207362</BitLink>, or visit our website at <BitLink Href="https://bitplatform.dev/contact-us" Target="_blank">our website</BitLink> or visit us at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands.
+                If you have any questions or concerns regarding this EULA or the Privacy Policy, or if you would like to contact bit platform for any reason, please email <BitLink Href="mailto:info@bitplatform.dev">info@bitplatform.dev</BitLink> or call <BitLink Href="tel:+31684207362">+31684207362</BitLink>, or visit our website at <BitLink Href="https://bitplatform.dev/contact-us" Target="_blank">our website</BitLink> or visit us at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands.
             </div>
         </section>
 
@@ -92,7 +92,7 @@
             <h1 class="main-section-title">Privacy Policy</h1>
             <div class="section-desc">
                 <ul>
-                    <li>BitPlatform is committed to protecting the privacy of user data.</li>
+                    <li>bit platform is committed to protecting the privacy of user data.</li>
                     <li>We will only use the data collected from the user for the purposes of the Bit.TemplatePlayground Demo Version and will delete this data upon user request, using one of the contact methods provided above.</li>
                     <li>We do not share user data with any third parties and do not allow users to share data with anyone in any way.</li>
                     <li>We do not collect any information on user's usage in the Bit.TemplatePlayground Demo Version.</li>
diff --git a/src/Client/Core/Styles/app.scss b/src/Client/Core/Styles/app.scss
index c1924ea..87641b5 100644
--- a/src/Client/Core/Styles/app.scss
+++ b/src/Client/Core/Styles/app.scss
@@ -4,6 +4,7 @@
 
 * {
     box-sizing: border-box;
+    -webkit-text-size-adjust: none;
     -webkit-tap-highlight-color: transparent;
     font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif;
 }
diff --git a/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj b/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj
index 2c8c86e..631cf2c 100644
--- a/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj
+++ b/src/Client/Web/Bit.TemplatePlayground.Client.Web.csproj
@@ -34,18 +34,18 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.Bup" Version="6.0.0" />
-        <PackageReference Include="Bit.Bswup" Version="6.0.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="6.0.0">
+        <PackageReference Include="Bit.Bup" Version="7.0.0" />
+        <PackageReference Include="Bit.Bswup" Version="7.0.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="6.0.0">
+        <PackageReference Include="Bit.SourceGenerators" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.1.23421.29" />
-        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.1.23421.29" PrivateAssets="all" />
+        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
+        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.2.23480.2" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Client/Web/wwwroot/service-worker.js b/src/Client/Web/wwwroot/service-worker.js
index 118cf9c..44d4403 100644
--- a/src/Client/Web/wwwroot/service-worker.js
+++ b/src/Client/Web/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 6.0.0
+// bit version: 7.0.0
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 // Make sure to apply all changes you make here to the service-worker.published.js file too (if required).
diff --git a/src/Client/Web/wwwroot/service-worker.published.js b/src/Client/Web/wwwroot/service-worker.published.js
index e5b39c9..0ec1e68 100644
--- a/src/Client/Web/wwwroot/service-worker.published.js
+++ b/src/Client/Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 6.0.0
+// bit version: 7.0.0
 // https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
 
 self.assetsInclude = [];
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 3822b7c..27e0ff8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-admin template v-6.0.0 -->
+<!-- Generated by bit-admin template v-7.0.0 -->
 <Project>
     <PropertyGroup>
 
diff --git a/src/Infra/Iac/Bit.TemplatePlayground.Iac.csproj b/src/Infra/Iac/Bit.TemplatePlayground.Iac.csproj
index 781527f..2469702 100644
--- a/src/Infra/Iac/Bit.TemplatePlayground.Iac.csproj
+++ b/src/Infra/Iac/Bit.TemplatePlayground.Iac.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pulumi.AzureNative" Version="2.9.0" />
+        <PackageReference Include="Pulumi.AzureNative" Version="2.11.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Server/Api/.config/dotnet-tools.json b/src/Server/Api/.config/dotnet-tools.json
index 241a28d..a465223 100644
--- a/src/Server/Api/.config/dotnet-tools.json
+++ b/src/Server/Api/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.0-rc.1.23419.6",
+      "version": "8.0.0-rc.2.23480.2",
       "commands": [
         "dotnet-ef"
       ]
diff --git a/src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj b/src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj
index 9e591fe..ffc1308 100644
--- a/src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj
+++ b/src/Server/Api/Bit.TemplatePlayground.Server.Api.csproj
@@ -15,40 +15,40 @@
         <Content Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="..\..\Client\Web\Pages\_Layout.cshtml" Link="Pages\_Layout.cshtml" />
         <Compile Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="..\..\Client\Web\Services\ServerSideAuthTokenProvider.cs" Link="Services\ServerSideAuthTokenProvider.cs" />
         <Compile Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="..\..\Client\Web\Extensions\HttpRequestExtensions.cs" Link="Extensions\HttpRequestExtensions.cs" />
-        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.1.23421.29" />
+        <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.2.23480.2" />
         <ProjectReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="..\..\Client\Web\Bit.TemplatePlayground.Client.Web.csproj" />
 
         <EmbeddedResource Include="Resources\*.cshtml" />
         <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.3.0" />
-        <PackageReference Include="Bit.CodeAnalyzers" Version="6.0.0">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="6.0.0">
+        <PackageReference Include="Bit.SourceGenerators" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="FluentEmail.Razor" Version="3.0.2" />
         <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
 
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0-rc.1.23421.29" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0-rc.2.23480.2" />
 
 
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-rc.1.23421.29" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-rc.2.23480.2" />
         <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
 
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.1.23419.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.2.23480.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
 
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.2.23480.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.0-rc.1.23421.29" />
+        <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.0-rc.2.23480.2" />
         <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
         <PackageReference Include="AspNetCore.HealthChecks.System" Version="7.0.0" />
diff --git a/src/Server/Api/Services/JwtService.cs b/src/Server/Api/Services/JwtService.cs
index ee4937e..9d5a130 100644
--- a/src/Server/Api/Services/JwtService.cs
+++ b/src/Server/Api/Services/JwtService.cs
@@ -33,9 +33,9 @@ public async Task<SignInResponseDto> GenerateToken(User user)
             {
                 Issuer = _appSettings.JwtSettings.Issuer,
                 Audience = _appSettings.JwtSettings.Audience,
-                IssuedAt = DateTime.Now,
-                NotBefore = DateTime.Now.AddMinutes(_appSettings.JwtSettings.NotBeforeMinutes),
-                Expires = DateTime.Now.AddMinutes(_appSettings.JwtSettings.ExpirationMinutes),
+                IssuedAt = DateTime.UtcNow,
+                NotBefore = DateTime.UtcNow.AddMinutes(_appSettings.JwtSettings.NotBeforeMinutes),
+                Expires = DateTime.UtcNow.AddMinutes(_appSettings.JwtSettings.ExpirationMinutes),
                 SigningCredentials = signingCredentials,
                 Subject = new ClaimsIdentity(claims)
             });
diff --git a/src/Shared/Bit.TemplatePlayground.Shared.csproj b/src/Shared/Bit.TemplatePlayground.Shared.csproj
index 0aa2137..76671cb 100644
--- a/src/Shared/Bit.TemplatePlayground.Shared.csproj
+++ b/src/Shared/Bit.TemplatePlayground.Shared.csproj
@@ -6,19 +6,19 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bit.CodeAnalyzers" Version="6.0.0">
+        <PackageReference Include="Bit.CodeAnalyzers" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Bit.SourceGenerators" Version="6.0.0">
+        <PackageReference Include="Bit.SourceGenerators" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.0-rc.1.23421.29" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.1.23419.4" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0-rc.1.23421.29" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-rc.1.23419.4" />
-        <PackageReference Include="System.Text.Json" Version="8.0.0-rc.1.23419.4" />
+        <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.0-rc.2.23480.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0-rc.2.23480.2" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-rc.2.23479.6" />
+        <PackageReference Include="System.Text.Json" Version="8.0.0-rc.2.23479.6" />
         <PackageReference Include="Riok.Mapperly" Version="3.2.0" PrivateAssets="all" ExcludeAssets="runtime">
             <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Shared/Resources/AppStrings.fr.resx b/src/Shared/Resources/AppStrings.fr.resx
index 0bf8992..569df0f 100644
--- a/src/Shared/Resources/AppStrings.fr.resx
+++ b/src/Shared/Resources/AppStrings.fr.resx
@@ -712,7 +712,7 @@ Veuillez confirmer votre email en cliquant sur le lien.</value>
     <value>Non</value>
   </data>
   <data name="UsingBitPlatform" xml:space="preserve">
-    <value>Utiliser bitplatform !</value>
+    <value>Utiliser bit platform !</value>
   </data>
   <data name="Yes" xml:space="preserve">
     <value>Oui</value>