build(macOS): fix watchdog on osx-x64

Author: DearVa

.github/workflows/linux-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*.*.*'
+  workflow_dispatch:
 
 jobs:
   build-linux:
@@ -27,6 +28,18 @@ jobs:
         submodules: true
         lfs: true
 
+    - name: Verify Tag (Manual Trigger)
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || echo "")
+        if [[ ! "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+          echo "Error: Current commit is not tagged with a valid version (vX.X.X)."
+          echo "Current tag: $TAG"
+          exit 1
+        fi
+        echo "Found valid tag: $TAG"
+        echo "GITHUB_REF=refs/tags/$TAG" >> $GITHUB_ENV
+
     - name: Get version from tag
       id: get_version
       run: |

.github/workflows/macos-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*.*.*'
+  workflow_dispatch:
 
 jobs:
   build-mac:
@@ -24,6 +25,18 @@ jobs:
         submodules: true
         lfs: true
 
+    - name: Verify Tag (Manual Trigger)
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || echo "")
+        if [[ ! "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+          echo "Error: Current commit is not tagged with a valid version (vX.X.X)."
+          echo "Current tag: $TAG"
+          exit 1
+        fi
+        echo "Found valid tag: $TAG"
+        echo "GITHUB_REF=refs/tags/$TAG" >> $GITHUB_ENV
+
     - name: Get version from tag
       id: get_version
       run: |
@@ -75,6 +88,7 @@ jobs:
         dotnet publish src/Everywhere.Mac/Everywhere.Mac.csproj \
           -c Release \
           -r ${{ matrix.runtime }} \
+          /p:RuntimeIdentifier=${{ matrix.runtime }} \
           /p:CodesignKey="$CODE_SIGN_KEY" \
           /p:PackageSigningKey="$PACKAGE_SIGNING_KEY" \
           /p:Version=${{ env.VERSION }} \

.github/workflows/windows-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*.*.*'
+  workflow_dispatch:
 
 jobs:
   build-and-release:
@@ -19,6 +20,22 @@ jobs:
         fetch-depth: 0
         submodules: true
         lfs: true
+
+    - name: Verify Tag (Manual Trigger)
+      if: github.event_name == 'workflow_dispatch'
+      shell: pwsh
+      run: |
+        $tag = git describe --exact-match --tags HEAD 2>$null
+        if ($LASTEXITCODE -ne 0) {
+          Write-Error "Error: Current commit is not tagged."
+          exit 1
+        }
+        if ($tag -notmatch '^v\d+\.\d+\.\d+') {
+          Write-Error "Error: Current commit tag '$tag' does not match vX.X.X format."
+          exit 1
+        }
+        Write-Host "Found valid tag: $tag"
+        echo "GITHUB_REF=refs/tags/$tag" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     
     - name: Get version from tag
       id: get_version

Directory.Build.props

@@ -50,12 +50,12 @@
         <DefineConstants>$(DefineConstants);BROWSER;WASM;IsBrowser;IsWasm</DefineConstants>
     </PropertyGroup>
 
-    <PropertyGroup Condition="$([System.String]::Copy($(RuntimeIdentifier)).Contains('x64')) OR $([System.String]::Copy($(RuntimeIdentifier)).Contains('win-x64'))">
+    <PropertyGroup Condition="$([System.String]::Copy($(RuntimeIdentifier)).Contains('x64'))">
         <IsX64>true</IsX64>
         <DefineConstants>$(DefineConstants);X64;IsX64</DefineConstants>
     </PropertyGroup>
 
-    <PropertyGroup Condition="$([System.String]::Copy($(RuntimeIdentifier)).Contains('x86')) OR $([System.String]::Copy($(RuntimeIdentifier)).Contains('win-x86'))">
+    <PropertyGroup Condition="$([System.String]::Copy($(RuntimeIdentifier)).Contains('x86'))">
         <IsX86>true</IsX86>
         <DefineConstants>$(DefineConstants);X86;IsX86</DefineConstants>
     </PropertyGroup>

src/Build.Watchdog.targets

@@ -34,11 +34,10 @@
           BeforeTargets="BeforeResolveReferences"
           Inputs="$(WatchdogProject)"
           Outputs="$(WatchdogExecutable)">
-
-    <Message Text="Watchdog executable is out-of-date. Building..." Importance="high"/>
+    <Message Text="Watchdog executable is out-of-date. Building... $(RuntimeIdentifier):$(TargetFrameworkPrefix)" Importance="high"/>
 
     <MSBuild Projects="$(WatchdogProject)"
              Targets="Publish"
-             Properties="PublishDir=$(WatchdogOutDir);" />
+             Properties="PublishDir=$(WatchdogOutDir);RuntimeIdentifier=$(RuntimeIdentifier);TargetFramework=$(TargetFrameworkPrefix);Version=$(Version)" />
   </Target>
 </Project>

src/Everywhere.Watchdog/Everywhere.Watchdog.csproj

@@ -5,6 +5,7 @@
     <PublishAot>true</PublishAot>
     <SelfContained>true</SelfContained>
     <OptimizationPreference>Size</OptimizationPreference>
+    <RuntimeIdentifiers>win-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>