diff --git a/.github/workflows/openhab.yml b/.github/workflows/openhab.yml index 37b04a3e..bc62db1f 100644 --- a/.github/workflows/openhab.yml +++ b/.github/workflows/openhab.yml @@ -50,7 +50,7 @@ jobs: } else { Write-Host "Set build configuration to debug" - #cWrite-Output "BuildConfiguration=debug" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append + #Write-Output "BuildConfiguration=debug" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append Write-Output "BundlePlatforms=x86|x64|arm64" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append } @@ -75,7 +75,7 @@ jobs: name: Build needs: configure with: - build_configuration: ${{needs.configure.outputs.buildConfiguration}} + build_configuration: ${{input.BuildConfiguration}} #${{needs.configure.outputs.buildConfiguration}} bundle_Platforms: ${{ needs.configure.outputs.bundlePlatforms}} build_number: ${{ needs.configure.outputs.buildNumber}} secrets: inherit diff --git a/OpenHAB.Windows.sln b/OpenHAB.Windows.sln index 24f15d85..7a10a9dd 100644 --- a/OpenHAB.Windows.sln +++ b/OpenHAB.Windows.sln @@ -87,18 +87,18 @@ Global {E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x64.Build.0 = Release|x64 {E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x86.ActiveCfg = Release|x86 {E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x86.Build.0 = Release|x86 - {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.ActiveCfg = Debug|ARM64 - {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.Build.0 = Debug|ARM64 - {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.Deploy.0 = Debug|ARM64 + {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.ActiveCfg = Debug|arm64 + {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.Build.0 = Debug|arm64 + {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.Deploy.0 = Debug|arm64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x64.ActiveCfg = Debug|x64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x64.Build.0 = Debug|x64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x64.Deploy.0 = Debug|x64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x86.ActiveCfg = Debug|x86 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x86.Build.0 = Debug|x86 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x86.Deploy.0 = Debug|x86 - {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.ActiveCfg = Release|ARM64 - {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.Build.0 = Release|ARM64 - {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.Deploy.0 = Release|ARM64 + {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.ActiveCfg = Release|arm64 + {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.Build.0 = Release|arm64 + {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.Deploy.0 = Release|arm64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x64.ActiveCfg = Release|x64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x64.Build.0 = Release|x64 {4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x64.Deploy.0 = Release|x64 diff --git a/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj b/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj index 505ad643..77df3637 100644 --- a/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj +++ b/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj @@ -20,13 +20,13 @@ Release x64 - + Debug - ARM64 + arm64 - + Release - ARM64 + arm64 @@ -50,13 +50,13 @@ x86|x64 0 - + Always Always - + Always diff --git a/src/openHAB.Windows/openHAB.Windows.csproj b/src/openHAB.Windows/openHAB.Windows.csproj index 51be950e..c7f97328 100644 --- a/src/openHAB.Windows/openHAB.Windows.csproj +++ b/src/openHAB.Windows/openHAB.Windows.csproj @@ -5,7 +5,7 @@ 10.0.17763.0 $(MSBuildProjectName.Replace(" ", "_")) app.manifest - x86;x64;ARM64 + x86;x64;arm64 win-x86;win-x64;win-arm64 10.0.20348.0 true