[chore][msi] Build custom actions dll as platform agnostic (#7269)

* [chore][msi] Build custom actions as platform agnostic

* Take advantage of the portable dll

Author: pjanotti

.github/workflows/ansible.yml

@@ -69,13 +69,7 @@ jobs:
 
   msi-custom-actions:
     needs: lint
-    strategy:
-      matrix:
-        OS: [ "windows-2025" ]
     uses: ./.github/workflows/reusable-msi-custom-actions.yml
-    with:
-      OS: ${{ matrix.OS }}
-      ARCH: "x64"
 
   msi-build:
     needs: [ cross-compile, agent-bundle-windows, msi-custom-actions ]

.github/workflows/chef-test.yml

@@ -67,13 +67,7 @@ jobs:
 
   msi-custom-actions:
     needs: [ chef-lint-spec-test ]
-    strategy:
-      matrix:
-        OS: [ "windows-2025" ]
     uses: ./.github/workflows/reusable-msi-custom-actions.yml
-    with:
-      OS: ${{ matrix.OS }}
-      ARCH: "x64"
 
   msi-build:
     needs: [ cross-compile, agent-bundle-windows, msi-custom-actions ]

.github/workflows/puppet-test.yml

@@ -234,9 +234,6 @@ jobs:
 
   puppet-build-windows-msi-custom-actions:
     uses: ./.github/workflows/reusable-msi-custom-actions.yml
-    with:
-      OS: windows-2022
-      ARCH: x64
 
   # Use reusable workflow for MSI build
   puppet-build-windows-msi-local-package:

.github/workflows/reusable-msi-build.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Downloading msi-custom-actions
         uses: actions/download-artifact@v7
         with:
-          name: msi-custom-actions-${{ inputs.OS }}
+          name: msi-custom-actions
           path: ./packaging/msi/SplunkCustomActions/bin/Release
 
       - name: Build MSI

.github/workflows/reusable-msi-custom-actions.yml

@@ -2,29 +2,30 @@ name: msi-custom-actions
 
 on:
   workflow_call:
-    inputs:
-      OS:
-        required: true
-        type: string
-      ARCH:
-        required: true
-        type: string
+
 jobs:
   msi-custom-actions:
-    runs-on: ${{ inputs.OS }}
+    # WiX requires Windows, but what matters for the custom actions build is the
+    # .NET SDK version, that is being pinned via a dedicated step.
+    runs-on: windows-2025
     steps:
+      - name: Setup .NET
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # tag: v5.1.0
+        with:
+          dotnet-version: 10.0.103
+
       - name: Check out the codebase.
         uses: actions/checkout@v5
 
       - name: Build Custom Actions
         working-directory: packaging/msi/SplunkCustomActions
         run: |
           dotnet test ./test/SplunkCustomActionsTests.csproj -c Release
-          dotnet build ./src/SplunkCustomActions.csproj -c Release -p:Platform=${{ inputs.ARCH }} -o ./bin/Release
+          dotnet build ./src/SplunkCustomActions.csproj -c Release -p:Platform="Any CPU" -o ./bin/Release
           mkdir "${{ github.workspace }}/dist"
-          cp ./bin/Release/SplunkCustomActions.CA.dll "${{ github.workspace }}/dist/SplunkCustomActions-${{ inputs.ARCH }}.CA.dll"
+          cp ./bin/Release/SplunkCustomActions.CA.dll "${{ github.workspace }}/dist/SplunkCustomActions.CA.dll"
 
       - uses: actions/upload-artifact@v6
         with:
-          name: msi-custom-actions-${{ inputs.OS }}
-          path: ./dist/SplunkCustomActions-${{ inputs.ARCH }}.CA.dll
+          name: msi-custom-actions
+          path: ./dist/SplunkCustomActions.CA.dll

.github/workflows/win-package-test.yml

@@ -44,13 +44,7 @@ jobs:
       OS: ${{ matrix.OS.runner }}
 
   msi-custom-actions:
-    strategy:
-      matrix:
-        OS: [ {"runner": "windows-2022", "arch": "x64"}, {"runner": "windows-2025", "arch": "x64"}, {"runner": "windows-11-arm", "arch": "arm64"} ]
     uses: ./.github/workflows/reusable-msi-custom-actions.yml
-    with:
-      OS: ${{ matrix.OS.runner }}
-      ARCH: ${{ matrix.OS.arch }}
 
   msi-build:
     strategy:

packaging/msi/msi-builder/build.sh

@@ -172,16 +172,15 @@ parse_args_and_build() {
 
     cd ${WORK_DIR}
 
-    dotnetarch="x64"
+    wixarch="x64"
     if [[ "$os" =~ "arm" ]]; then
-        dotnetarch="arm64"
+        wixarch="arm64"
     fi
 
     dotnet wix build "${WXS_PATH}" \
-        -arch "${dotnetarch}" \
+        -arch "${wixarch}" \
         -out "${build_dir}/${msi_name}" \
         -bindpath "${files_dir}" \
-        -d Arch="${dotnetarch}" \
         -d Version="${version}" \
         -d Otelcol="${otelcol}" \
         -d JmxMetricsJar="${jmx_metrics_jar}" \

packaging/msi/splunk-otel-collector.wxs

@@ -19,7 +19,7 @@
       <Property Id="ARPNOMODIFY" Value="1" />
 
       <!-- Load the Splunk custom actions -->
-      <Binary Id="SplunkCustomActionsDll" SourceFile="$(sys.SOURCEFILEDIR)/SplunkCustomActions/bin/Release/SplunkCustomActions-$(var.Arch).CA.dll" />
+      <Binary Id="SplunkCustomActionsDll" SourceFile="$(sys.SOURCEFILEDIR)/SplunkCustomActions/bin/Release/SplunkCustomActions.CA.dll" />
       <CustomAction Id="CheckLaunchConditions" DllEntry="CheckLaunchConditions" Execute="immediate" BinaryRef="SplunkCustomActionsDll" />
       <CustomAction Id="AddOptionalConfigurationsCustomActionData" Property="AddOptionalConfigurations" Value="GODEBUG=[GODEBUG];GOMEMLIMIT=[GOMEMLIMIT];SPLUNK_COLLECTD_DIR=[SPLUNK_COLLECTD_DIR];SPLUNK_GATEWAY_URL=[SPLUNK_GATEWAY_URL];SPLUNK_LISTEN_INTERFACE=[SPLUNK_LISTEN_INTERFACE];SPLUNK_MEMORY_LIMIT_MIB=[SPLUNK_MEMORY_LIMIT_MIB];SPLUNK_MEMORY_TOTAL_MIB=[SPLUNK_MEMORY_TOTAL_MIB]" />
       <CustomAction Id="AddOptionalConfigurations" DllEntry="AddOptionalConfigurations" Execute="deferred" Impersonate="no" BinaryRef="SplunkCustomActionsDll" />