Skip to content

Commit a8dcde8

Browse files
committed
Include resources in main app package
1 parent 2284fa5 commit a8dcde8

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.github/workflows/dotnet-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Gather MSIX files
6161
id: gather
62-
if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/')
62+
if: matrix.configuration == 'Release' #&& startsWith(github.ref, 'refs/tags/')
6363
run: |
6464
$gatherDirectory = Join-Path $env:App_Project_Directory "obj" "Bundle"
6565
New-Item -ItemType Directory -Path $gatherDirectory | Out-Null
@@ -93,7 +93,7 @@ jobs:
9393
Write-Output "upload_file=$uploadFile" >> $env:GITHUB_OUTPUT
9494
9595
- name: Create MSIX bundle
96-
if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/')
96+
if: matrix.configuration == 'Release' #&& startsWith(github.ref, 'refs/tags/')
9797
uses: LanceMcCarthy/Action-MsixBundler@v2.0.0
9898
with:
9999
msix-folder: ${{ steps.gather.outputs.gather_directory }}
@@ -102,15 +102,15 @@ jobs:
102102
sdk-version: '10.0.26100.0' # Default 10.0.19041.0 does not work anymore in September 2025
103103

104104
- name: Create MSIX upload
105-
if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/')
105+
if: matrix.configuration == 'Release' #&& startsWith(github.ref, 'refs/tags/')
106106
run: |
107107
$uploadFile = "${{ steps.gather.outputs.upload_file }}"
108108
$bundleDirectory = "${{ steps.gather.outputs.bundle_directory }}"
109109
110110
Compress-Archive -Path "$bundleDirectory\*" -DestinationPath $uploadFile
111111
112112
- name: Upload build artifacts
113-
if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/')
113+
if: matrix.configuration == 'Release' #&& startsWith(github.ref, 'refs/tags/')
114114
uses: actions/upload-artifact@v4
115115
with:
116116
name: MSIX Package

src/Vocup.WinForms/Package.appxmanifest

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<Logo>Images\StoreLogo.png</Logo>
88
</Properties>
99
<Dependencies>
10-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
11-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
10+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.26100.0" />
1211
</Dependencies>
1312
<Resources>
1413
<Resource Language="x-generate" />

src/Vocup.WinForms/Vocup.WinForms.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<UseWindowsForms>true</UseWindowsForms>
1212
<EnableMsixTooling>true</EnableMsixTooling>
1313
<!-- For ARM64 builds not to fail, satellite assemblies must be configured https://github.com/dotnet/sdk/issues/28419 -->
14-
<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
1514
<ApplicationIcon>icon.ico</ApplicationIcon>
1615
<ApplicationDefaultFont>Microsoft Sans Serif, 8.25pt</ApplicationDefaultFont>
1716
<!-- PerMonitorV2 has too many bugs, e.g. https://github.com/dotnet/winforms/issues/10958
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<packaging>
2+
<!--
3+
Include localization files directly in the app package:
4+
https://learn.microsoft.com/en-us/windows/uwp/app-resources/build-resources-into-app-package#option-1-use-priconfigpackagingxml-to-build-resources-into-your-app-package
5+
-->
6+
<autoResourcePackage qualifier="Scale" />
7+
<autoResourcePackage qualifier="DXFeatureLevel" />
8+
</packaging>

0 commit comments

Comments
 (0)