Skip to content

Commit 9d564e4

Browse files
MrJulMrJul
authored
Merge branch 'master' into master
2 parents 35a3102 + 06ab709 commit 9d564e4

File tree

474 files changed

+14638
-5626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

474 files changed

+14638
-5626
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ body:
2525
id: avalonia-version
2626
attributes:
2727
label: Avalonia version
28-
placeholder: e.g. 11.0.9, 11.1.0
28+
placeholder: e.g. 11.2.0, 11.1.0
2929
validations:
3030
required: true
3131
- type: dropdown

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ x64/
4545
*.vssscc
4646
.builds
4747
*.pidb
48-
*.log
4948
*.scc
49+
*.binlog
5050

5151
# Visual C++ cache files
5252
ipch/

‎.nuke/build.schema.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
"RunTests",
9595
"RunToolsTests",
9696
"ValidateApiDiff",
97+
"VerifyXamlCompilation",
9798
"ZipFiles"
9899
]
99100
}
@@ -131,6 +132,7 @@
131132
"RunTests",
132133
"RunToolsTests",
133134
"ValidateApiDiff",
135+
"VerifyXamlCompilation",
134136
"ZipFiles"
135137
]
136138
}

‎Avalonia.Desktop.slnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"samples\\Sandbox\\Sandbox.csproj",
1616
"samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContextPlug\\UnloadableAssemblyLoadContextPlug.csproj",
1717
"samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext.csproj",
18+
"samples\\XEmbedSample\\XEmbedSample.csproj",
1819
"src\\Avalonia.Base\\Avalonia.Base.csproj",
1920
"src\\Avalonia.Build.Tasks\\Avalonia.Build.Tasks.csproj",
2021
"src\\Avalonia.Controls.ColorPicker\\Avalonia.Controls.ColorPicker.csproj",
@@ -48,6 +49,7 @@
4849
"src\\tools\\DevAnalyzers\\DevAnalyzers.csproj",
4950
"src\\tools\\DevGenerators\\DevGenerators.csproj",
5051
"src\\Windows\\Avalonia.Direct2D1\\Avalonia.Direct2D1.csproj",
52+
"src\\Windows\\Avalonia.Win32.Automation\\Avalonia.Win32.Automation.csproj",
5153
"src\\Windows\\Avalonia.Win32.Interoperability\\Avalonia.Win32.Interoperability.csproj",
5254
"src\\Windows\\Avalonia.Win32\\Avalonia.Win32.csproj",
5355
"tests\\Avalonia.Base.UnitTests\\Avalonia.Base.UnitTests.csproj",

‎Avalonia.sln

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Vulkan", "src\Aval
301301
EndProject
302302
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.RenderTests.WpfCompare", "tests\Avalonia.RenderTests.WpfCompare\Avalonia.RenderTests.WpfCompare.csproj", "{9AE1B827-21AC-4063-AB22-C8804B7F931E}"
303303
EndProject
304+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Automation", "src\Windows\Avalonia.Win32.Automation\Avalonia.Win32.Automation.csproj", "{0097673D-DBCE-476E-82FE-E78A56E58AA2}"
305+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XEmbedSample", "samples\XEmbedSample\XEmbedSample.csproj", "{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}"
306+
EndProject
304307
Global
305308
GlobalSection(SolutionConfigurationPlatforms) = preSolution
306309
Debug|Any CPU = Debug|Any CPU
@@ -701,6 +704,14 @@ Global
701704
{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Debug|Any CPU.Build.0 = Debug|Any CPU
702705
{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Release|Any CPU.ActiveCfg = Release|Any CPU
703706
{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Release|Any CPU.Build.0 = Release|Any CPU
707+
{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
708+
{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
709+
{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
710+
{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Release|Any CPU.Build.0 = Release|Any CPU
711+
{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
712+
{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
713+
{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
714+
{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Release|Any CPU.Build.0 = Release|Any CPU
704715
EndGlobalSection
705716
GlobalSection(SolutionProperties) = preSolution
706717
HideSolutionNode = FALSE
@@ -788,6 +799,8 @@ Global
788799
{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0} = {9CCA131B-DE95-4D44-8788-C3CAE28574CD}
789800
{DA5F1FF9-4259-4C54-B443-85CFA226EE6A} = {9CCA131B-DE95-4D44-8788-C3CAE28574CD}
790801
{9AE1B827-21AC-4063-AB22-C8804B7F931E} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
802+
{0097673D-DBCE-476E-82FE-E78A56E58AA2} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
803+
{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4} = {9B9E3891-2366-4253-A952-D08BCEB71098}
791804
EndGlobalSection
792805
GlobalSection(ExtensibilityGlobals) = postSolution
793806
SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}

‎Avalonia.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=TYPEDEF/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
2323
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
2424
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
25+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
2526
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
2627
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
2728
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Interfaces/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>

‎api/Avalonia.Win32.nupkg.xml

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0001</DiagnosticId>
6+
<Target>T:Avalonia.Win32.Interop.Automation.DockPosition</Target>
7+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
8+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
9+
</Suppression>
10+
<Suppression>
11+
<DiagnosticId>CP0001</DiagnosticId>
12+
<Target>T:Avalonia.Win32.Interop.Automation.IDockProvider</Target>
13+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
14+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
15+
</Suppression>
16+
<Suppression>
17+
<DiagnosticId>CP0001</DiagnosticId>
18+
<Target>T:Avalonia.Win32.Interop.Automation.IExpandCollapseProvider</Target>
19+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
20+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
21+
</Suppression>
22+
<Suppression>
23+
<DiagnosticId>CP0001</DiagnosticId>
24+
<Target>T:Avalonia.Win32.Interop.Automation.IGridItemProvider</Target>
25+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
26+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
27+
</Suppression>
28+
<Suppression>
29+
<DiagnosticId>CP0001</DiagnosticId>
30+
<Target>T:Avalonia.Win32.Interop.Automation.IGridProvider</Target>
31+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
32+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
33+
</Suppression>
34+
<Suppression>
35+
<DiagnosticId>CP0001</DiagnosticId>
36+
<Target>T:Avalonia.Win32.Interop.Automation.IInvokeProvider</Target>
37+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
38+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
39+
</Suppression>
40+
<Suppression>
41+
<DiagnosticId>CP0001</DiagnosticId>
42+
<Target>T:Avalonia.Win32.Interop.Automation.IMultipleViewProvider</Target>
43+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
44+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
45+
</Suppression>
46+
<Suppression>
47+
<DiagnosticId>CP0001</DiagnosticId>
48+
<Target>T:Avalonia.Win32.Interop.Automation.IRangeValueProvider</Target>
49+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
50+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
51+
</Suppression>
52+
<Suppression>
53+
<DiagnosticId>CP0001</DiagnosticId>
54+
<Target>T:Avalonia.Win32.Interop.Automation.IRawElementProviderAdviseEvents</Target>
55+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
56+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
57+
</Suppression>
58+
<Suppression>
59+
<DiagnosticId>CP0001</DiagnosticId>
60+
<Target>T:Avalonia.Win32.Interop.Automation.IRawElementProviderFragment</Target>
61+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
62+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
63+
</Suppression>
64+
<Suppression>
65+
<DiagnosticId>CP0001</DiagnosticId>
66+
<Target>T:Avalonia.Win32.Interop.Automation.IRawElementProviderFragmentRoot</Target>
67+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
68+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
69+
</Suppression>
70+
<Suppression>
71+
<DiagnosticId>CP0001</DiagnosticId>
72+
<Target>T:Avalonia.Win32.Interop.Automation.IRawElementProviderSimple</Target>
73+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
74+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
75+
</Suppression>
76+
<Suppression>
77+
<DiagnosticId>CP0001</DiagnosticId>
78+
<Target>T:Avalonia.Win32.Interop.Automation.IRawElementProviderSimple2</Target>
79+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
80+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
81+
</Suppression>
82+
<Suppression>
83+
<DiagnosticId>CP0001</DiagnosticId>
84+
<Target>T:Avalonia.Win32.Interop.Automation.IScrollItemProvider</Target>
85+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
86+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
87+
</Suppression>
88+
<Suppression>
89+
<DiagnosticId>CP0001</DiagnosticId>
90+
<Target>T:Avalonia.Win32.Interop.Automation.IScrollProvider</Target>
91+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
92+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
93+
</Suppression>
94+
<Suppression>
95+
<DiagnosticId>CP0001</DiagnosticId>
96+
<Target>T:Avalonia.Win32.Interop.Automation.ISelectionItemProvider</Target>
97+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
98+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
99+
</Suppression>
100+
<Suppression>
101+
<DiagnosticId>CP0001</DiagnosticId>
102+
<Target>T:Avalonia.Win32.Interop.Automation.ISelectionProvider</Target>
103+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
104+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
105+
</Suppression>
106+
<Suppression>
107+
<DiagnosticId>CP0001</DiagnosticId>
108+
<Target>T:Avalonia.Win32.Interop.Automation.ISynchronizedInputProvider</Target>
109+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
110+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
111+
</Suppression>
112+
<Suppression>
113+
<DiagnosticId>CP0001</DiagnosticId>
114+
<Target>T:Avalonia.Win32.Interop.Automation.ITableItemProvider</Target>
115+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
116+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
117+
</Suppression>
118+
<Suppression>
119+
<DiagnosticId>CP0001</DiagnosticId>
120+
<Target>T:Avalonia.Win32.Interop.Automation.ITableProvider</Target>
121+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
122+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
123+
</Suppression>
124+
<Suppression>
125+
<DiagnosticId>CP0001</DiagnosticId>
126+
<Target>T:Avalonia.Win32.Interop.Automation.ITextProvider</Target>
127+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
128+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
129+
</Suppression>
130+
<Suppression>
131+
<DiagnosticId>CP0001</DiagnosticId>
132+
<Target>T:Avalonia.Win32.Interop.Automation.ITextRangeProvider</Target>
133+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
134+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
135+
</Suppression>
136+
<Suppression>
137+
<DiagnosticId>CP0001</DiagnosticId>
138+
<Target>T:Avalonia.Win32.Interop.Automation.IToggleProvider</Target>
139+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
140+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
141+
</Suppression>
142+
<Suppression>
143+
<DiagnosticId>CP0001</DiagnosticId>
144+
<Target>T:Avalonia.Win32.Interop.Automation.ITransformProvider</Target>
145+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
146+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
147+
</Suppression>
148+
<Suppression>
149+
<DiagnosticId>CP0001</DiagnosticId>
150+
<Target>T:Avalonia.Win32.Interop.Automation.IValueProvider</Target>
151+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
152+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
153+
</Suppression>
154+
<Suppression>
155+
<DiagnosticId>CP0001</DiagnosticId>
156+
<Target>T:Avalonia.Win32.Interop.Automation.IWindowProvider</Target>
157+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
158+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
159+
</Suppression>
160+
<Suppression>
161+
<DiagnosticId>CP0001</DiagnosticId>
162+
<Target>T:Avalonia.Win32.Interop.Automation.NavigateDirection</Target>
163+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
164+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
165+
</Suppression>
166+
<Suppression>
167+
<DiagnosticId>CP0001</DiagnosticId>
168+
<Target>T:Avalonia.Win32.Interop.Automation.ProviderOptions</Target>
169+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
170+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
171+
</Suppression>
172+
<Suppression>
173+
<DiagnosticId>CP0001</DiagnosticId>
174+
<Target>T:Avalonia.Win32.Interop.Automation.RowOrColumnMajor</Target>
175+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
176+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
177+
</Suppression>
178+
<Suppression>
179+
<DiagnosticId>CP0001</DiagnosticId>
180+
<Target>T:Avalonia.Win32.Interop.Automation.SupportedTextSelection</Target>
181+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
182+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
183+
</Suppression>
184+
<Suppression>
185+
<DiagnosticId>CP0001</DiagnosticId>
186+
<Target>T:Avalonia.Win32.Interop.Automation.SynchronizedInputType</Target>
187+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
188+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
189+
</Suppression>
190+
<Suppression>
191+
<DiagnosticId>CP0001</DiagnosticId>
192+
<Target>T:Avalonia.Win32.Interop.Automation.TextPatternRangeEndpoint</Target>
193+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
194+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
195+
</Suppression>
196+
<Suppression>
197+
<DiagnosticId>CP0001</DiagnosticId>
198+
<Target>T:Avalonia.Win32.Interop.Automation.TextUnit</Target>
199+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
200+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
201+
</Suppression>
202+
<Suppression>
203+
<DiagnosticId>CP0001</DiagnosticId>
204+
<Target>T:Avalonia.Win32.Interop.Automation.WindowInteractionState</Target>
205+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
206+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
207+
</Suppression>
208+
<Suppression>
209+
<DiagnosticId>CP0001</DiagnosticId>
210+
<Target>T:Avalonia.Win32.Interop.Automation.WindowVisualState</Target>
211+
<Left>baseline/netstandard2.0/Avalonia.Win32.dll</Left>
212+
<Right>target/netstandard2.0/Avalonia.Win32.dll</Right>
213+
</Suppression>
214+
</Suppressions>

‎api/Avalonia.nupkg.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,10 @@
9191
<Left>baseline/netstandard2.0/Avalonia.Controls.dll</Left>
9292
<Right>target/netstandard2.0/Avalonia.Controls.dll</Right>
9393
</Suppression>
94+
<Suppression>
95+
<DiagnosticId>CP0012</DiagnosticId>
96+
<Target>M:Avalonia.Controls.Button.OnAccessKey(Avalonia.Interactivity.RoutedEventArgs)</Target>
97+
<Left>baseline/netstandard2.0/Avalonia.Controls.dll</Left>
98+
<Right>target/netstandard2.0/Avalonia.Controls.dll</Right>
99+
</Suppression>
94100
</Suppressions>

‎azure-pipelines.yml

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ jobs:
4343
script: |
4444
dotnet workload install android macos wasm-tools
4545
46-
- task: CmdLine@2
47-
displayName: 'Install Tizen Workload'
48-
inputs:
49-
targetType: 'inline'
50-
script: |
51-
curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.sh | sudo bash -s -- -d "/opt/hostedtoolcache/dotnet"
52-
5346
- task: CmdLine@2
5447
displayName: 'Run Build'
5548
inputs:
@@ -69,7 +62,7 @@ jobs:
6962
variables:
7063
SolutionDir: '$(Build.SourcesDirectory)'
7164
pool:
72-
vmImage: 'macos-12'
65+
vmImage: 'macos-13'
7366
steps:
7467
- task: UseDotNet@2
7568
displayName: 'Use .NET 6.0 Runtime'
@@ -88,13 +81,6 @@ jobs:
8881
inputs:
8982
script: |
9083
dotnet workload install android ios macos wasm-tools
91-
92-
- task: CmdLine@2
93-
displayName: 'Install Tizen Workload'
94-
inputs:
95-
targetType: 'inline'
96-
script: |
97-
curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.sh | sudo bash
9884
9985
- task: CmdLine@2
10086
displayName: 'Generate avalonia-native'
@@ -109,10 +95,11 @@ jobs:
10995
inputs:
11096
actions: 'build'
11197
scheme: ''
112-
sdk: 'macosx12.3'
98+
sdk: 'macosx13.0'
11399
configuration: 'Release'
114100
xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
115-
xcodeVersion: '13' # Options: 8, 9, default, specifyPath
101+
xcodeVersion: 'specifyPath' # Options: 8, 9, default, specifyPath
102+
xcodeDeveloperDir: '/Applications/Xcode_14.1.app/Contents/Developer'
116103
args: '-derivedDataPath ./'
117104

118105
- task: CmdLine@2
@@ -169,13 +156,6 @@ jobs:
169156
script: |
170157
dotnet workload install android ios tvos wasm-tools
171158
172-
- task: PowerShell@2
173-
displayName: 'Install Tizen Workload'
174-
inputs:
175-
targetType: 'inline'
176-
script: |
177-
(New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1') | Invoke-Expression
178-
179159
- task: CmdLine@2
180160
displayName: 'Install Nuke'
181161
inputs:

‎build/HarfBuzzSharp.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<ItemGroup>
3-
<PackageReference Include="HarfBuzzSharp" Version="7.3.0.2" />
4-
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
5-
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="7.3.0.2" />
3+
<PackageReference Include="HarfBuzzSharp" Version="7.3.0.3" />
4+
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.3" />
5+
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="7.3.0.3" />
66
</ItemGroup>
77
</Project>

0 commit comments

Comments
 (0)