fix

bitfoundation · Nov 12, 2023 · 0c22bc8 · 0c22bc8
1 parent 9cb2ad5
commit 0c22bc8
Showing 1 changed file with 39 additions and 47 deletions.
diff --git a/.github/workflows/todotemplate.cd.yml b/.github/workflows/todotemplate.cd.yml
@@ -36,30 +36,22 @@ jobs:
 
     - name: Create project from TodoTemplate
       run: |
-        echo "HELLO"
         cd src/Templates/TodoTemplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
-        echo "HELLO2"
         dotnet new install Bit.TodoTemplate.0.0.0.nupkg
-        echo "HELLO3"
-        echo "$PWD"
-        cd ../../../ && dotnet new bit-todo --name Bit.TodoTemplate --database SqlServer && echo "$PWD"
-        echo "HELLO4"
-        echo "$PWD"
-        echo "HELLO5"
+        cd ../../../ && dotnet new bit-todo --name TodoTemplate --database SqlServer
 
     - name: Switch to blazor web assembly
-      run: |
-        echo "$PWD" && sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' Bit.TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj
+      run: sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj
 
     - name: Install wasm
       run:  cd src && dotnet workload install wasm-tools wasm-experimental
 
     - name: Generate CSS/JS files
-      run: dotnet build Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+      run: dotnet build TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Publish
-      run: dotnet publish Bit.TodoTemplate/src/Server/Api/TodoTemplate.Server.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/api-web
+      run: dotnet publish TodoTemplate/src/Server/Api/TodoTemplate.Server.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/api-web
 
     - name: Upload api-web artifact
       uses: actions/upload-artifact@v3
@@ -125,29 +117,29 @@ jobs:
         cd src/Templates/TodoTemplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.TodoTemplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-todo --name Bit.TodoTemplate --database SqlServer
+        cd ../../../ && dotnet new bit-todo --name TodoTemplate --database SqlServer
   
     - name: Update appsettings.json api server address
       uses: microsoft/variable-substitution@v1 
       with:
-        files: 'Bit.TodoTemplate/src/Client/Core/appsettings.json'
+        files: 'TodoTemplate/src/Client/Core/appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - name: Install maui
       run: cd src && dotnet workload install maui
 
     - name: Generate CSS/JS files
-      run: dotnet build Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+      run: dotnet build TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Build exe
-      run: dotnet build Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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
+      run: dotnet build TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: win-exe-bundle
-        path: Bit.TodoTemplate/src/Client/App/bin/release/net8.0-windows10.0.19041.0/win10-x86
+        path: TodoTemplate/src/Client/App/bin/release/net8.0-windows10.0.19041.0/win10-x86
 
   build_blazor_hybrid_android:
     name: build blazor hybrid (android)
@@ -172,36 +164,36 @@ jobs:
         cd src/Templates/TodoTemplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.TodoTemplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-todo --name Bit.TodoTemplate --database SqlServer
+        cd ../../../ && dotnet new bit-todo --name TodoTemplate --database SqlServer
   
     - name: Extract Android signing key from env
       uses: timheuer/base64-to-file@v1
       with:
-          fileDir: './Bit.TodoTemplate/src/Client/App/'
+          fileDir: './TodoTemplate/src/Client/App/'
           fileName: 'TodoTemplate.keystore'
           encodedString: ${{ secrets.ANDROID_RELEASE_KEYSTORE_FILE_BASE64 }}
 
     - name: Update appsettings.json api server address
       uses: microsoft/variable-substitution@v1 
       with:
-        files: 'Bit.TodoTemplate/src/Client/Core/appsettings.json'
+        files: 'TodoTemplate/src/Client/Core/appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - name: Install maui
       run: cd src && dotnet workload install maui-android
 
     - name: Generate CSS/JS files
-      run: dotnet build Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+      run: dotnet build TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Build aab
-      run: dotnet build Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="TodoTemplate.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-android
+      run: dotnet build TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="TodoTemplate.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-android
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: android-bundle
-        path: Bit.TodoTemplate/src/Client/App/bin/Release/net8.0-android/*-Signed.*
+        path: TodoTemplate/src/Client/App/bin/Release/net8.0-android/*-Signed.*
 
   build_blazor_hybrid_maccatalyst:
      name: build blazor hybrid (maccatalyst)
@@ -223,32 +215,32 @@ jobs:
 
      - name: Create project from TodoTemplate
        run: |
-          cd src/Templates/TodoTemplate && dotnet build -c Release
-          dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
-          dotnet new install Bit.TodoTemplate.0.0.0.nupkg
-          cd ../../../ && dotnet new bit-todo --name Bit.TodoTemplate --database SqlServer
+         cd src/Templates/TodoTemplate && dotnet build -c Release
+         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
+         dotnet new install Bit.TodoTemplate.0.0.0.nupkg
+         cd ../../../ && dotnet new bit-todo --name TodoTemplate --database SqlServer
    
      - name: Update appsettings.json api server address
        uses: microsoft/variable-substitution@v1 
        with:
-         files: 'Bit.TodoTemplate/src/Client/Core/appsettings.json'
+         files: 'TodoTemplate/src/Client/Core/appsettings.json'
        env:
          ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
      - name: Install maui
        run: cd src && dotnet workload install maui
 
      - name: Generate CSS/JS files
-       run: dotnet build Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+       run: dotnet build TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
      - name: Build pkg
-       run: dotnet build 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 }}" -f net8.0-maccatalyst
+       run: dotnet build 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 }}" -f net8.0-maccatalyst
 
      - name: Upload artifact
        uses: actions/upload-artifact@v2
        with:
          name: mac-pkg-bundle
-         path: Bit.TodoTemplate/src/Client/App/bin/release/net8.0-maccatalyst/*.pkg
+         path: TodoTemplate/src/Client/App/bin/release/net8.0-maccatalyst/*.pkg
 
   build_blazor_hybrid_ios:
     name: build blazor hybrid (ios)
@@ -277,12 +269,12 @@ jobs:
         cd src/Templates/TodoTemplate && dotnet build -c Release
         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
         dotnet new install Bit.TodoTemplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-todo --name Bit.TodoTemplate --database SqlServer
+        cd ../../../ && dotnet new bit-todo --name TodoTemplate --database SqlServer
   
     - name: Update appsettings.json api server address
       uses: microsoft/variable-substitution@v1 
       with:
-        files: 'Bit.TodoTemplate/src/Client/Core/appsettings.json'
+        files: 'TodoTemplate/src/Client/Core/appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
@@ -311,16 +303,16 @@ jobs:
         api-private-key: ${{ secrets.APPSTORE_API_KEY_PRIVATE_KEY }}
 
     - name: Generate CSS/JS files
-      run: dotnet build Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+      run: dotnet build TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Build ipa
-      run: dotnet publish Bit.TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:RuntimeIdentifier=ios-arm64 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="TodoTemplate" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-ios
+      run: dotnet publish TodoTemplate/src/Client/App/TodoTemplate.Client.App.csproj -p:RuntimeIdentifier=ios-arm64 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="TodoTemplate" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-ios
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ios-bundle
-        path: Bit.TodoTemplate/src/Client/App/bin/release/net8.0-ios/ios-arm64/publish/*.ipa
+        path: TodoTemplate/src/Client/App/bin/release/net8.0-ios/ios-arm64/publish/*.ipa
 
   build_blazor_electron_linux:
      name: build blazor electron (linux)
@@ -347,32 +339,32 @@ jobs:
 
      - name: Create project from TodoTemplate
        run: |
-        cd src/Templates/TodoTemplate && dotnet build -c Release
-        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
-        dotnet new install Bit.TodoTemplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-todo --name Bit.TodoTemplate --database SqlServer
-   
+         cd src/Templates/TodoTemplate && dotnet build -c Release
+         dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
+         dotnet new install Bit.TodoTemplate.0.0.0.nupkg
+         cd ../../../ && dotnet new bit-todo --name TodoTemplate --database SqlServer
+     
      - name: Update appsettings.json api server address
        uses: microsoft/variable-substitution@v1 
        with:
-         files: 'Bit.TodoTemplate/src/Client/Core/appsettings.json'
+         files: 'TodoTemplate/src/Client/Core/appsettings.json'
        env:
          ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
      - name: Switch to BlazorElectron
-       run: awk '/<BlazorMode>/{sub(">.*</", ">BlazorElectron</")}1' Bit.TodoTemplate/src/Directory.Build.props > temp.xml && mv temp.xml Bit.TodoTemplate/src/Directory.Build.props
+       run: awk '/<BlazorMode>/{sub(">.*</", ">BlazorElectron</")}1' TodoTemplate/src/Directory.Build.props > temp.xml && mv temp.xml TodoTemplate/src/Directory.Build.props
 
      - name: Generate CSS/JS files
-       run: dotnet build Bit.TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+       run: dotnet build TodoTemplate/src/Client/Core/TodoTemplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
      - name: Restore electron .net
-       run: dotnet build Bit.TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj -t:BeforeBuildTasks
+       run: dotnet build TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj -t:BeforeBuildTasks
 
      - name: Build app image
-       run: cd Bit.TodoTemplate/src/Client/Web/ && dotnet electronize build /target linux
+       run: cd TodoTemplate/src/Client/Web/ && dotnet electronize build /target linux
 
      - name: Upload artifact
        uses: actions/upload-artifact@v2
        with:
          name: linux-app-image
-         path: Bit.TodoTemplate/src/Client/Web/bin/Desktop/linux-unpacked
+         path: TodoTemplate/src/Client/Web/bin/Desktop/linux-unpacked