p.13 (#66)

* csproj updates * 2023-04-14 EoD * 04-25-2023 - BoD, Adopt WS2023 UI * Fix echo command? * Change 'echo' to 'message' * Add notification service * gitignore applicationsettings.json & nlog.json * Add settings files back into solution to insure that they are content * Misc * Added menu * Remove comment from index.razor * 2023-04-25 EoD * attempt preload=true * 2023-04-27 EoD * Change back to SSB * Simplify Directory.Build.Props * Add static image to index page * icebg.client.csproj changes * csproj further changes * Remove PWA references in ICEBG.Client * Remove preload * Remove preload only * More csproj * CSS redo * 2023-05-02 WinMerge.1 * WinMerge.2 * Repair (?) to ICEBG.sln * 2023-05-21 DN8P4, Compression disabled * Minor cleanup * Images -> images2 * images2 -> images * Migrate 13.5 resources to 13.0
MarkStega · Jun 4, 2023 · e477331 · e477331
1 parent 2a2bbcf
commit e477331
Show file tree

Hide file tree

Showing 268 changed files with 9,555 additions and 3,471 deletions.
diff --git a/.github/workflows/GithubActionsRelease.yml b/.github/workflows/GithubActionsRelease.yml
@@ -46,35 +46,35 @@ jobs:
       run: echo ""
 
 ############################################################################################################
-# Set unified suffix for the two deployed applications
+# Set unified version for the two deployed applications
 ############################################################################################################
-  set-suffix:
-    name: Create the date based suffix
+  set-unified-version:
+    name: Create the date based unifiedVersion
     needs: [perform-deployment]
     runs-on: ubuntu-latest
     outputs:
-      outputSuffix: ${{ steps.setSuffix.outputs.GlobalSuffix }}
+      unifiedVersion: ${{ steps.setUnifiedVersion.outputs.LocalUnifiedVersion }}
 
     steps:
-    - id: setSuffix
-      run: echo "GlobalSuffix=$(date +'%Y-%m-%d--%H-%M-%S')--${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+    - id: setUnifiedVersion
+      run: echo "LocalUnifiedVersion=$(date +'%Y-%m-%d--%H-%M-%S')--${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
       shell: bash
 
 ############################################################################################################
 # Build and deploy blazor DS image
 ############################################################################################################
   build-deploy-ds:
     name: Build and deploy ICEBG DS
-    needs: [set-suffix]
+    needs: [set-unified-version]
     runs-on: ubuntu-latest
 
     steps:
-    - name: Retrieve the global suffix
-      run: echo "suffix=${{needs.set-suffix.outputs.outputSuffix}}" >> $GITHUB_ENV
+    - name: Retrieve the global unifiedVersion
+      run: echo "unifiedVersion=${{needs.set-unified-version.outputs.unifiedVersion}}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -93,25 +93,25 @@ jobs:
 
     - name: Publish, tag, and push DS image
       run: |
-        dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.suffix }} -p:ContainerImageName=${{env.appNameDS}}
-        docker tag ${{env.appNameDS}}:${{ env.suffix }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.suffix }}
-        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.suffix }}
+        dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerImageName=${{env.appNameDS}}
+        docker tag ${{env.appNameDS}}:${{ env.unifiedVersion }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.unifiedVersion }}
+        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.unifiedVersion }}
 
 ############################################################################################################
 # Build and deploy blazor UI image
 ############################################################################################################
   build-deploy-ui:
     name: Build and deploy ICEBG UI
-    needs: [set-suffix]
+    needs: [set-unified-version]
     runs-on: ubuntu-latest
 
     steps:
-    - name: Retrieve the global suffix
-      run: echo "suffix=${{needs.set-suffix.outputs.outputSuffix}}" >> $GITHUB_ENV
+    - name: Retrieve the global unifiedVersion
+      run: echo "unifiedVersion=${{needs.set-unified-version.outputs.unifiedVersion}}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -130,9 +130,9 @@ jobs:
 
     - name: Publish, tag, and push UI image
       run: |
-        dotnet publish ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.suffix }} -p:ContainerImageName=${{env.appNameUI}} --sc
-        docker tag ${{env.appNameUI}}:${{ env.suffix }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.suffix }}
-        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.suffix }}
+        dotnet publish ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerImageName=${{env.appNameUI}} --sc
+        docker tag ${{env.appNameUI}}:${{ env.unifiedVersion }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.unifiedVersion }}
+        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.unifiedVersion }}
 
 ############################################################################################################
 # Build blazor DS image
@@ -143,12 +143,12 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - name: Set suffix as env variable
-      run: echo "suffix=$(date +'%Y-%m-%d--%H-%M-%S')--${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+    - name: Set unifiedVersion as env variable
+      run: echo "unifiedVersion=$(date +'%Y-%m-%d--%H-%M-%S')--${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -160,7 +160,7 @@ jobs:
 
     - name: Build DS image
       run: |
-        dotnet build ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:Version=${{ env.suffix }}
+        dotnet build ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:Version=${{ env.unifiedVersion }}
 
 ############################################################################################################
 # Build blazor UI image
@@ -171,12 +171,12 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - name: Set suffix as env variable
-      run: echo "suffix=$(date +'%Y-%m-%d--%H-%M-%S')--${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+    - name: Set unifiedVersion as env variable
+      run: echo "unifiedVersion=$(date +'%Y-%m-%d--%H-%M-%S')--${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -188,4 +188,4 @@ jobs:
 
     - name: Build UI image
       run: |
-        dotnet build ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:Version=${{ env.suffix }}
+        dotnet build ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:Version=${{ env.unifiedVersion }}
diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
@@ -12,6 +12,8 @@ on:
 env:
   appNameDS: 'icebg.web.ds.wip'
   appNameUI: 'icebg.web.ui.wip'
+  blazorServerDockerFile: './ICEBG.Web.UserInterface/Dockerfile-Server'
+  blazorWebAssemblyDockerFile: './ICEBG.Web.UserInterface/Dockerfile-WebAssembly'
 
 jobs:
 
@@ -43,31 +45,31 @@ jobs:
       run: echo ""
 
 ############################################################################################################
-# Set unified suffix for the two deployed applications
+# Set unified version for the two deployed applications
 ############################################################################################################
-  set-suffix:
-    name: Create the date based suffix
+  set-unified-version:
+    name: Create the date based UnifiedVersion
     needs: [perform-deployment]
     runs-on: ubuntu-latest
     outputs:
-      outputSuffix: ${{ steps.setSuffix.outputs.GlobalSuffix }}
+      unifiedVersion: ${{ steps.setUnifiedVersion.outputs.LocalUnifiedVersion }}
 
     steps:
-    - id: setSuffix
-      run: echo "GlobalSuffix=$(date +'%Y-%m-%d--%H-%M-%S')--WIP" >> $GITHUB_OUTPUT
+    - id: setUnifiedVersion
+      run: echo "LocalUnifiedVersion=$(date +'%Y-%m-%d--%H-%M-%S')--WIP" >> $GITHUB_OUTPUT
       shell: bash
 
 ############################################################################################################
 # Build and deploy blazor DS image
 ############################################################################################################
   build-deploy-ds:
     name: Build and deploy ICEBG DS
-    needs: [set-suffix]
+    needs: [set-unified-version]
     runs-on: ubuntu-latest
 
     steps:
-    - name: Retrieve the global suffix
-      run: echo "suffix=${{needs.set-suffix.outputs.outputSuffix}}" >> $GITHUB_ENV
+    - name: Retrieve the global UnifiedVersion
+      run: echo "unifiedVersion=${{needs.set-unified-version.outputs.unifiedVersion}}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
@@ -88,25 +90,26 @@ jobs:
 
     - name: Publish, tag, and push DS image
       run: |
-        dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.suffix }} -p:ContainerImageName=${{env.appNameDS}}
-        docker tag ${{env.appNameDS}}:${{ env.suffix }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.suffix }}
-        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.suffix }}
+        dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerImageName=${{env.appNameDS}}
+        docker tag ${{env.appNameDS}}:${{ env.unifiedVersion }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.unifiedVersion }}
+        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameDS}}:${{ env.unifiedVersion }}
+        docker images
 
 ############################################################################################################
 # Build and deploy blazor UI image
 ############################################################################################################
   build-deploy-ui:
     name: Build and deploy ICEBG UI
-    needs: [set-suffix]
+    needs: [set-unified-version]
     runs-on: ubuntu-latest
 
     steps:
-    - name: Retrieve the global suffix
-      run: echo "suffix=${{needs.set-suffix.outputs.outputSuffix}}" >> $GITHUB_ENV
+    - name: Retrieve the global UnifiedVersion
+      run: echo "unifiedVersion=${{needs.set-unified-version.outputs.unifiedVersion}}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -125,9 +128,14 @@ jobs:
 
     - name: Publish, tag, and push UI image
       run: |
-        dotnet publish ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.suffix }} -p:ContainerImageName=${{env.appNameUI}} --sc
-        docker tag ${{env.appNameUI}}:${{ env.suffix }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.suffix }}
-        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.suffix }}
+        dotnet publish ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerImageName=${{env.appNameUI}} --sc
+        docker tag ${{env.appNameUI}}:${{ env.unifiedVersion }} ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.unifiedVersion }}
+        docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{env.appNameUI}}:${{ env.unifiedVersion }}
+        docker images
+  
+      # run: |
+      #   docker build . --file ${{ env.blazorServerDockerFile }} --tag ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{ env.appNameUI }}:${{ env.unifiedVersion }} --build-arg version=${{ env.unifiedVersion }}
+      #   docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/${{ env.appNameUI }}:${{ env.unifiedVersion }}
 
 ############################################################################################################
 # Build blazor DS image
@@ -138,12 +146,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set suffix as env variable
-      run: echo "suffix=$(date +'%Y-%m-%d--%H-%M-%S')--WIP" >> $GITHUB_ENV
+    - name: Set unifiedVersion as env variable
+      run: echo "unifiedVersion=$(date +'%Y-%m-%d--%H-%M-%S')--WIP" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -155,7 +163,7 @@ jobs:
 
     - name: Build DS image
       run: |
-        dotnet build ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:Version=${{ env.suffix }}
+        dotnet build ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:Version=${{ env.unifiedVersion }}
 
 ############################################################################################################
 # Build blazor UI image
@@ -166,12 +174,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set suffix as env variable
-      run: echo "suffix=$(date +'%Y-%m-%d--%H-%M-%S')--WIP" >> $GITHUB_ENV
+    - name: Set unifiedVersion as env variable
+      run: echo "unifiedVersion=$(date +'%Y-%m-%d--%H-%M-%S')--WIP" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout repository under $GITHUB_WORKSPACE so the job can access it 🛎️
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         persist-credentials: false
 
@@ -183,4 +191,4 @@ jobs:
 
     - name: Build UI image
       run: |
-        dotnet build ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.suffix }}
+        dotnet build ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }}
diff --git a/.gitignore b/.gitignore
@@ -122,6 +122,7 @@ UpgradeLog*.htm
 #Node modules
 **/node_modules/
 
+#Generated css/js & compressed versions
 ICEBG.Client/wwwroot/*.css
 ICEBG.Client/wwwroot/*.br
 ICEBG.Client/wwwroot/*.gz
@@ -131,4 +132,3 @@ ICEBG.Client/wwwroot/css/*.gz
 ICEBG.Client/wwwroot/js/*.js
 ICEBG.Client/wwwroot/js/*.br
 ICEBG.Client/wwwroot/js/*.gz
-
diff --git a/ApplicationConfiguration/ApplicationConfiguration.csproj b/ApplicationConfiguration/ApplicationConfiguration.csproj
@@ -1,26 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>disable</ImplicitUsings>
-    <Nullable>disable</Nullable>
-	  <Configurations>Azure;Develop_Server;Develop_WebAssembly;Release_WebAssembly;</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Azure|AnyCPU'">
-	  <DefineConstants>AZURE;BLAZOR_SERVER</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop_Server|AnyCPU'">
-	  <DefineConstants>DEVELOP;BLAZOR_SERVER</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop_WebAssembly|AnyCPU'">
-	  <DefineConstants>DEVELOP;BLAZOR_WEBASSEMBLY</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Material.Blazor" Version="4.0.0-preview.16" />
+    <PackageReference Include="Material.Blazor" Version="4.0.0-preview.18" />
   </ItemGroup>
 
 </Project>
diff --git a/ApplicationConfigurationServer/ApplicationConfigurationServer.csproj b/ApplicationConfigurationServer/ApplicationConfigurationServer.csproj
@@ -1,27 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>disable</Nullable>
-		<Configurations>Azure;Develop_Server;Develop_WebAssembly;Release_WebAssembly;</Configurations>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Azure|AnyCPU'">
-		<DefineConstants>AZURE;BLAZOR_SERVER</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop_Server|AnyCPU'">
-		<DefineConstants>DEVELOP;BLAZOR_SERVER</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop_WebAssembly|AnyCPU'">
-		<DefineConstants>DEVELOP;BLAZOR_WEBASSEMBLY</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
-		<PackageReference Include="Material.Blazor" Version="4.0.0-preview.16" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-preview.3.23177.8" />
+		<PackageReference Include="Material.Blazor" Version="4.0.0-preview.18" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-preview.4.23260.4" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/ApplicationConfigurationWASM/ApplicationConfigurationWASM.csproj b/ApplicationConfigurationWASM/ApplicationConfigurationWASM.csproj
@@ -1,26 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Configurations>Azure;Develop_Server;Develop_WebAssembly;Release_WebAssembly;</Configurations>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Azure|AnyCPU'">
-		<DefineConstants>AZURE;BLAZOR_SERVER</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop_Server|AnyCPU'">
-		<DefineConstants>DEVELOP;BLAZOR_SERVER</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop_WebAssembly|AnyCPU'">
-		<DefineConstants>DEVELOP;BLAZOR_WEBASSEMBLY</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
-		<PackageReference Include="Material.Blazor" Version="4.0.0-preview.16" />
+		<PackageReference Include="Material.Blazor" Version="4.0.0-preview.18" />
 	</ItemGroup>
 
 	<ItemGroup>