feat: update to bit 7.0.0 #25 (#26)

bitfoundation · Oct 16, 2023 · 79d7d97 · 79d7d97
1 parent c4fba0d
commit 79d7d97
Show file tree

Hide file tree

Showing 18 changed files with 78 additions and 77 deletions.
diff --git 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
@@ -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
@@ -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 }}"
diff --git 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"
     }
 }
diff --git 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
@@ -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 [email protected].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 [email protected].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" />