Skip to content

Commit 3a4ef81

Browse files
sharpninjaCopilot
andcommitted
Fix all three CI build failures
- Android/Linux: Patch Markdown.Avalonia.props for Linux CI (submodule only defines PackageTargetFrameworks for Windows_NT, causing empty framework identifier error on ubuntu-latest) - Windows MSIX: Fix null plugins crash in MsixTools (update submodule), add plugins: [] to msix.yml for explicit empty config - Remove global.json (was pinning SDK version unnecessarily for CI) - Add .gitattributes to enforce LF line endings for shell scripts Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 797078e commit 3a4ef81

5 files changed

Lines changed: 24 additions & 8 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.sh text eol=lf

.github/workflows/build-android.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ jobs:
6565
with:
6666
dotnet-version: '9.0.x'
6767

68+
- name: Patch Markdown.Avalonia for Linux
69+
run: |
70+
# The submodule props only defines PackageTargetFrameworks for Windows_NT.
71+
# Add a Linux fallback so NuGet restore can resolve the project graph.
72+
sed -i '/<\/Project>/i \
73+
<PropertyGroup Condition=" '\''$(OS)'\'' != '\''Windows_NT'\'' ">\
74+
<PackageTargetFrameworks>netstandard2.0<\/PackageTargetFrameworks>\
75+
<DemoAppTargetFrameworks>netstandard2.0<\/DemoAppTargetFrameworks>\
76+
<TestTargetFrameworks>netstandard2.0<\/TestTargetFrameworks>\
77+
<\/PropertyGroup>' lib/Markdown.Avalonia/Markdown.Avalonia.props
78+
6879
- run: dotnet workload install android
6980

7081
- name: Decode keystore
@@ -166,6 +177,15 @@ jobs:
166177
with:
167178
dotnet-version: '9.0.x'
168179

180+
- name: Patch Markdown.Avalonia for Linux
181+
run: |
182+
sed -i '/<\/Project>/i \
183+
<PropertyGroup Condition=" '\''$(OS)'\'' != '\''Windows_NT'\'' ">\
184+
<PackageTargetFrameworks>netstandard2.0<\/PackageTargetFrameworks>\
185+
<DemoAppTargetFrameworks>netstandard2.0<\/DemoAppTargetFrameworks>\
186+
<TestTargetFrameworks>netstandard2.0<\/TestTargetFrameworks>\
187+
<\/PropertyGroup>' lib/Markdown.Avalonia/Markdown.Avalonia.props
188+
169189
- name: Build DEB package
170190
run: |
171191
chmod +x scripts/build-deb.sh

global.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

msix.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ build:
1515
rid: win-x64
1616
selfContained: true
1717

18+
plugins: []
19+
1820
output:
1921
dir: artifacts
2022

scripts/MsixTools

0 commit comments

Comments
 (0)