Skip to content

Commit dbb32e4

Browse files
navhaxsnavhaxs
committed
get compile working on macOS (net8.0 version + fix global-packages path)
1 parent 88b7546 commit dbb32e4

File tree

25 files changed

+57
-35
lines changed

25 files changed

+57
-35
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
HandsLiftedApp/BuildInfo/BuildDate.txt
99
HandsLiftedApp/BuildInfo/GitHash.txt
1010

11-
global-packages/
11+
global-packages/*
1212

1313
# User-specific files
1414
*.rsuser

‎.idea/.idea.HandsLiftedApp/.idea/avalonia.xml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo.AudacityPipe.ConsoleApp1/Demo.AudacityPipe.ConsoleApp1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎Demos/StackedImagesOpacityDemo/StackedImagesOpacityDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
77
<TrimMode>copyused</TrimMode>

‎HandsLiftedApp.Controls/Navigation/ItemOrderListView.axaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@
179179
<MenuItem Header="Add Item" />
180180
</ContextMenu>
181181
</ListBox.ContextMenu>
182-
<ListBox.DataTemplates>
182+
<ListBox.ItemTemplate>
183183
<utils:MyTemplateSelector>
184184
<DataTemplate x:Key="SectionHeadingItem">
185-
<Grid>
185+
<Grid Background="Aqua">
186186
<!-- TODO not working -->
187187
<!--<Grid.Styles>
188188
<Style Selector="Border:pointerover">
@@ -214,7 +214,7 @@
214214
<DockPanel
215215
Margin="0,0,0,0"
216216
VerticalAlignment="Stretch"
217-
Background="Transparent">
217+
Background="Red">
218218
<Grid Width="16">
219219
<Viewbox
220220
Width="25"
@@ -241,7 +241,7 @@
241241
</DockPanel>
242242
</DataTemplate>
243243
</utils:MyTemplateSelector>
244-
</ListBox.DataTemplates>
244+
</ListBox.ItemTemplate>
245245
</ListBox>
246246
</ScrollViewer>
247247
<Button

‎HandsLiftedApp.Core/App.axaml

+2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
x:Class="HandsLiftedApp.Core.App"
44
xmlns:local="using:HandsLiftedApp.Core"
5+
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
56
RequestedThemeVariant="Default">
67
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
78
<Application.DataTemplates>
89
<local:ViewLocator />
910
</Application.DataTemplates>
1011
<Application.Styles>
1112
<FluentTheme />
13+
<avalonia:MaterialIconStyles />
1214
</Application.Styles>
1315
</Application>

‎HandsLiftedApp.Core/Views/MainView.axaml

+14-7
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,34 @@
1414
<vm:MainViewModel />
1515
</Design.DataContext>
1616

17-
<Grid ColumnDefinitions="* 1 2*">
17+
<Grid>
18+
19+
<Grid.ColumnDefinitions>
20+
<ColumnDefinition Width="*" MaxWidth="400" />
21+
<ColumnDefinition Width="6" />
22+
<ColumnDefinition Width="2*" />
23+
</Grid.ColumnDefinitions>
1824

19-
<DockPanel>
20-
<TextBlock
21-
Text="{Binding CurrentPlaylist.Playlist.Title, FallbackValue='Untitled Playlist'}"
25+
<DockPanel>
26+
<TextBox
27+
Text="{Binding CurrentPlaylist.Playlist.Title, FallbackValue='Untitled Playlist'}"
2228
Padding="22 16"
2329
FontSize="16"
24-
HorizontalAlignment="Left"
30+
HorizontalAlignment="Stretch"
31+
BorderThickness="0"
2532
VerticalAlignment="Center"
2633
DockPanel.Dock="Top"/>
2734
<UniformGrid Rows="1" DockPanel.Dock="Top">
2835
<Button Click="OpenFileButton_Clicked" HorizontalAlignment="Stretch">Open file</Button>
2936
<Button Click="SaveFileButton_Clicked" HorizontalAlignment="Stretch">Save file</Button>
30-
<Button Click="TestButton_Clicked" HorizontalAlignment="Stretch">Update title</Button>
37+
<Button Click="TestButton_Clicked" HorizontalAlignment="Stretch">Info</Button>
3138
</UniformGrid>
3239
<controls:ItemOrderListView DataContext="{Binding CurrentPlaylist}"
3340
DockPanel.Dock="Left"/>
3441

3542
</DockPanel>
3643

37-
<GridSplitter Grid.Column="1" />
44+
<GridSplitter Grid.Column="1" Background="Red" />
3845

3946
<DockPanel Grid.Column="2">
4047
<StackPanel Background="Aquamarine">

‎HandsLiftedApp.Core/Views/MainView.axaml.cs

+9-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,15 @@ private async void OpenFileButton_Clicked(object sender, RoutedEventArgs args)
4242

4343
if (this.DataContext is MainViewModel vm)
4444
{
45-
vm.CurrentPlaylist.Playlist = XmlSerialization.ReadFromXmlFile<Playlist>(stream);
45+
try
46+
{
47+
vm.CurrentPlaylist.Playlist = XmlSerialization.ReadFromXmlFile<Playlist>(stream);
48+
}
49+
catch (Exception e)
50+
{
51+
Log.Error("[DOC] Failed to parse playlist XML");
52+
Console.WriteLine(e);
53+
}
4654
}
4755
}
4856
}

‎HandsLiftedApp.GoogleSlidesImporter/HandsLiftedApp.Importer.GoogleSlides.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎HandsLiftedApp.Importer.PDF/HandsLiftedApp.Importer.PDF.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎HandsLiftedApp.PowerPointImporter/HandsLiftedApp.Importer.PowerPoint.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎HandsLiftedApp.PropertyGridControl/HandsLiftedApp.PropertyGridControl.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎HandsLiftedApp.Tests/HandsLiftedApp.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0-windows</TargetFrameworks>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

‎HandsLiftedApp.Utils/HandsLiftedApp.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎HandsLiftedApp.XTransitioningContentControl/HandsLiftedApp.XTransitioningContentControl.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎HandsLiftedApp/HandsLiftedApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ApplicationIcon>Assets\app.ico</ApplicationIcon>
66
<AvaloniaXamlIlDebuggerLaunch>false</AvaloniaXamlIlDebuggerLaunch>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
8-
<TargetFramework>net7.0-windows</TargetFramework>
8+
<TargetFramework>net8.0-windows</TargetFramework>
99
</PropertyGroup>
1010
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1111
<WarningsAsErrors>SYSLIB0011</WarningsAsErrors>

‎ItemsListDemo/ItemsListDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
77
<TrimMode>copyused</TrimMode>

‎Libraries/nativevlcsharpavalonia/TestVlcApp/TestVlcApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎Libraries/nativevlcsharpavalonia/TestVlcSharpAvaloniaApplication/TestVlcSharpAvaloniaApplication.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
77
<TrimMode>copyused</TrimMode>

‎Libraries/vlcsharpavalonia/samples/LibVLCSharp.Avalonia.Sample/LibVLCSharp.Avalonia.Sample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ApplicationManifest>app.manifest</ApplicationManifest>
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎Libraries/vlcsharpavalonia/src/LibVLCSharp.Avalonia/LibVLCSharp.Avalonia.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
</PropertyGroup>
66
<ItemGroup>

‎PDFTestApp/PDFTestApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎ScratchApp/ScratchApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
77
<TrimMode>copyused</TrimMode>

‎global.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
2+
"sdk": {
3+
"version": "8.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": true
6+
},
27
"msbuild-sdks": {
38
"MSBuild.Sdk.Extras": "3.0.38"
4-
},
5-
"sdk": {
69
}
7-
}
10+
}

‎nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<config>
4-
<add key="globalPackagesFolder" value=".\global-packages" />
4+
<add key="globalPackagesFolder" value="./global-packages" />
55
</config>
66
<packageSourceMapping>
77
<clear />

0 commit comments

Comments
 (0)