Merge dev to main

.github/workflows/_.yaml

@@ -0,0 +1,58 @@
+name: CI/CD
+env: { DOTNET_NOLOGO: true }
+on:
+  workflow_call:
+    inputs:
+      publish: { type: boolean, default: false, description: Publish application }
+      environment: { type: string, default: dev, description: Choose publish environment <dev|staging|prod> }
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: 'true'
+
+    - name: Read .NET Version
+      shell: pwsh
+      id: dotnet-version
+      run: |
+        $version = (Get-Content .\global.json -Raw | ConvertFrom-Json).sdk.version.TrimEnd('0') + 'x'
+        "version=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with: { dotnet-version: "${{ steps.dotnet-version.outputs.version }}" }
+
+    - name: Setup tools
+      run: |
+        dotnet workload install wasm-tools
+        npm install -g tailwindcss
+
+    - name: Restore
+      working-directory: src/TabKeeper.UI.Wasm
+      run: |
+        npm install
+        dotnet restore
+
+    - name: Build
+      working-directory: src/TabKeeper.UI.Wasm
+      run: dotnet build -c Release --no-restore
+
+    - name: Publish
+      if: ${{ inputs.publish }}
+      working-directory: src/TabKeeper.UI.Wasm
+      shell: pwsh
+      run: |
+        .\css.ps1 -publish
+        dotnet publish --no-restore --no-build
+
+    - name: Publish to Cloudflare Pages
+      if: ${{ inputs.publish }}
+      uses: cloudflare/wrangler-action@v3
+      with:
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+        command: pages deploy artifacts/src/publish/TabKeeper.UI.Wasm/release/wwwroot --project-name=tab-keeper --branch ${{ inputs.environment }}

.github/workflows/build.yaml

@@ -1,17 +1,16 @@
-name: Build
-
-env:
-  DOTNET_NOLOGO: true
-
+name: build
+env: { DOTNET_NOLOGO: true }
 on:
-  workflow_dispatch:
   pull_request:
-    branches: [main, dev]
+    branches:
+      - main
     paths:
-      - "version.json"
-      - "src/**/*.cs"
-      - "src/**/*.csproj"
-
+      - src/**
+      - test/**
+    types:
+      - opened
+      - ready_for_review
+      - review_requested
 jobs:
-  Build:
-    uses: panoukos41/TabKeeper/.github/workflows/_ci.yaml@dev
+  pipeline:
+    uses: panoukos41/TabKeeper/.github/workflows/_.yaml@main

.github/workflows/publish.yaml

@@ -1,20 +1,29 @@
-name: Publish
-
-env:
-  DOTNET_NOLOGO: true
-
+name: publish
+env: { DOTNET_NOLOGO: true }
 on:
   workflow_dispatch:
   push:
-    branches: [main, dev]
+    branches:
+    - main
+    tags:
+    - v[0-9]+.[0-9]+.[0-9]+  # Only matches vX.X.X where X is a number
     paths:
-      - "version.json"
-      - "src/**/*.cs"
-      - "src/**/*.csproj"
-
+    - src/**
+    - test/**
 jobs:
-  Build:
-    uses: panoukos41/TabKeeper/.github/workflows/_ci.yaml@dev
-    with:
-      publish: true
-    secrets: inherit
+  pipeline:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine if prod
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: echo "environment=main" >> $GITHUB_ENV
+
+      - name: Determine if dev
+        if: startsWith(github.ref, 'refs/heads/main')
+        run: echo "environment=dev" >> $GITHUB_ENV
+
+      - name: Publish
+        uses: panoukos41/TabKeeper/.github/workflows/_.yaml@main
+        with:
+          publish: true
+          environment: $environment

Directory.Build.props

@@ -1,36 +1,31 @@
 <Project>
-  <!--Build-->
+
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
-    <NoWarn>$(NoWarn);CS8509;IDE0039;IDE0130;IDE0290;IDE0060;RZ10012</NoWarn>
+    <EnablePreviewFeatures>True</EnablePreviewFeatures>
+    <NoWarn>$(NoWarn);CS8509;IDE0039;IDE0130;IDE0290;IDE0060;RZ10012;IDE0052;BL0007;CA1816</NoWarn>
+    <WarningsAsErrors>$(WarningsAsErrors);RZ2012;</WarningsAsErrors>
 
-    <ArtifactsPath>$(MSBuildThisFileDirectory)artifacts/default</ArtifactsPath>
-    <ArtifactsPath Condition="$(MSBuildProjectDirectory.Contains('tests'))">$(MSBuildThisFileDirectory)artifacts/tests</ArtifactsPath>
-    <ArtifactsPath Condition="$(MSBuildProjectDirectory.Contains('tools'))">$(MSBuildThisFileDirectory)artifacts/tools</ArtifactsPath>
-    <ArtifactsPath Condition="$(MSBuildProjectDirectory.Contains('samples'))">$(MSBuildThisFileDirectory)artifacts/samples</ArtifactsPath>
-    <ArtifactsPath Condition="$(MSBuildProjectDirectory.Contains('src'))">$(MSBuildThisFileDirectory)artifacts/src</ArtifactsPath>
+    <ArtifactsPath>$([System.IO.Path]::Combine(
+      $(MSBuildThisFileDirectory),
+      "artifacts",
+      $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory),$(MSBuildProjectDirectory)).Replace("$(MSBuildProjectName)", '').TrimEnd('/'))
+    ))</ArtifactsPath>
     <UseArtifactsOutput>true</UseArtifactsOutput>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <!-- Repository -->
   <PropertyGroup>
     <Authors>Panagiotis Athanasiou</Authors>
-    <Owners>panoukos41</Owners>
-    <Copyright>Copyright (c) 2023 $(Authors)</Copyright>
-    <RepositoryUrl></RepositoryUrl>
+    <Copyright>Copyright (c) $([System.DateTimeOffset]::UtcNow.ToString("yyyy")) $(Authors)</Copyright>
+    <RepositoryUrl>https://www.github.com/panoukos41/TabKeeper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <RepositoryLicense>MIT</RepositoryLicense>
-    <RepositoryDescription></RepositoryDescription>
-    <RepositoryTags></RepositoryTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- Versioning -->
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>

Directory.Packages.props

@@ -0,0 +1,41 @@
+<Project>
+  <!---->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <!---->
+  <!-- Packagges -->
+  <ItemGroup>
+    <PackageVersion Include="Annular.Translate" Version="0.1.7-dev" />
+    <PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
+    <PackageVersion Include="DynamicData" Version="9.1.2" />
+    <PackageVersion Include="Flurl" Version="4.0.0" />
+    <PackageVersion Include="Ignis.Components.HeadlessUI" Version="1.4.0" />
+    <PackageVersion Include="Ignis.Components.Reactivity" Version="1.4.0" />
+    <PackageVersion Include="Ignis.Components.WebAssembly" Version="1.4.0" />
+    <PackageVersion Include="Ignis.Utils" Version="1.4.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageVersion Include="OneOf" Version="3.0.271" />
+    <PackageVersion Include="P41.FontAwesome" Version="6.6.0.2" />
+    <PackageVersion Include="System.Reactive" Version="6.0.1" />
+  </ItemGroup>
+  <!---->
+  <!-- Testing -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
+    <PackageVersion Include="TUnit" Version="0.10.28" />
+    <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
+    <PackageVersion Include="Verify.TUnit" Version="28.10.1" />
+  </ItemGroup>
+  <!---->
+  <!-- Versioning & SourceLink -->
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <GlobalPackageReference Include="GitVersion.MSBuild" Version="6.1.0" />
+  </ItemGroup>
+  <!---->
+</Project>

GitVersion.yaml

@@ -0,0 +1,8 @@
+workflow: GitHubFlow/v1
+branches:
+  main:
+    label: beta
+    increment: Patch
+  feature:
+    label: alpha
+    increment: Minor

TabKeeper.sln

@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{689C1AA2-E
 		.gitignore = .gitignore
 		.gitmodules = .gitmodules
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
 		LICENSE = LICENSE
 		publish.ps1 = publish.ps1
@@ -94,4 +95,3 @@ Global
 		SolutionGuid = {26EECD34-43C6-4F7A-A567-0F8AC7F82094}
 	EndGlobalSection
 EndGlobal
-bal

TabKeeper.slnx

@@ -1,35 +1,16 @@
 <Solution>
-  <Folder Name="/tests/">
-    <Project Path="tests\TabKeeper.UI.UnitTests\TabKeeper.UI.UnitTests.csproj" />
-  </Folder>
-  <Folder Name="/src/">
-    <Project Path="src\TabKeeper.UI.Wasm\TabKeeper.UI.Wasm.csproj" />
-    <Project Path="src\TabKeeper.UI\TabKeeper.UI.csproj" />
-    <Project Path="src\TabKeeper\TabKeeper.csproj" />
-  </Folder>
   <Folder Name="/src-modules/">
-    <Project Path="src-modules\Core\src\Core.App\Core.App.csproj" />
-    <Project Path="src-modules\Core\src\Core.Blazor\Core.Blazor.csproj" />
-    <Project Path="src-modules\Core\src\Core.Web\Core.Web.csproj" />
-    <Project Path="src-modules\Core\src\Core\Core.csproj" />
+    <Project Path="src-modules/Core/src/Core.App/Core.App.csproj" />
+    <Project Path="src-modules/Core/src/Core.Blazor/Core.Blazor.csproj" />
+    <Project Path="src-modules/Core/src/Core.Web/Core.Web.csproj" />
+    <Project Path="src-modules/Core/src/Core/Core.csproj" />
   </Folder>
-  <Folder Name="/root/">
-    <File Path=".editorconfig" />
-    <File Path=".gitattributes" />
-    <File Path=".gitignore" />
-    <File Path=".gitmodules" />
-    <File Path="Directory.Build.props" />
-    <File Path="global.json" />
-    <File Path="LICENSE" />
-    <File Path="publish.ps1" />
-    <File Path="README.md" />
-    <File Path="version.json" />
+  <Folder Name="/src/">
+    <Project Path="src/TabKeeper.UI.Wasm/TabKeeper.UI.Wasm.csproj" />
+    <Project Path="src/TabKeeper.UI/TabKeeper.UI.csproj" />
+    <Project Path="src/TabKeeper/TabKeeper.csproj" />
   </Folder>
-</Solution>th="Directory.Build.props" />
-    <File Path="global.json" />
-    <File Path="LICENSE" />
-    <File Path="publish.ps1" />
-    <File Path="README.md" />
-    <File Path="version.json" />
+  <Folder Name="/tests/">
+    <Project Path="tests/TabKeeper.UI.UnitTests/TabKeeper.UI.UnitTests.csproj" />
   </Folder>
-</Solution>
+</Solution>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }

src/TabKeeper.UI.Wasm/App.razor

@@ -1,14 +1,16 @@
-@using TabKeeper.Layout
+@using System.Runtime.InteropServices.JavaScript
+@using TabKeeper.Layout
+
+@inject TranslateService translate
 
 <Router AppAssembly="@typeof(App).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(ShellLayout)" />
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
     <NotFound>
-        <PageTitle>Not found</PageTitle>
+        <PageTitle>@("general.not-found.title" | translate)</PageTitle>
         <LayoutView Layout="@typeof(ShellLayout)">
-            <p role="alert">Sorry, there's nothing at this address.</p>
+            <p role="alert">@("general.not-found.description" | translate)</p>
         </LayoutView>
     </NotFound>
 </Router>