Skip to content

Commit 4a08183

Browse files
jonthyselljonthysell
committed
Update dependencies
1 parent 7df7f11 commit 4a08183

File tree

8 files changed

+46
-31
lines changed

8 files changed

+46
-31
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
## next ##
44

55
* Update all projects to .NET 8.0
6+
* Updated Avalonia to v11.3.0
7+
* Updated Avalonia.Desktop to v11.3.0
8+
* Updated Avalonia.Diagnostics to v11.3.0
9+
* Updated Avalonia.Themes.Fluent to v11.3.0
10+
* Updated CommunityToolkit.Mvvm to v8.4.0
11+
* Updated coverlet.collector to v6.0.4
12+
* Updated Microsoft.NET.Test.Sdk to v17.13.0
13+
* Updated MSTest.TestAdapter to v3.8.3
14+
* Updated MSTest.TestFramework to v3.8.3
15+
* Updated System.Reactive.Linq to v6.0.1
16+
* Updated WixToolset.Heat to v6.0.0
17+
* Updated WixToolset.UI.wixext to v6.0.0
18+
* Updated WixToolset.Util.wixext to v6.0.0
619

720
## v0.15.1 ##
821

‎README.md‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ For more information on Mzinga and its projects, please check out the [Mzinga Wi
1414

1515
Mzinga was written in C# and should run anywhere that supports [.NET 8.0](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md). It has been officially tested on:
1616

17-
* Windows 10 and 11
18-
* Ubuntu 20.04
19-
* macOS 10.15
17+
* Windows 10 and 11 (x64)
18+
* Ubuntu 22.04 (x64)
2019

2120
### Windows ###
2221

2322
#### Standard ####
2423

25-
The standard Windows release provides self-contained x86/x64/arm64 binaries which run on Windows 7 SP1+, 8.1, 10, and 11.
24+
The standard Windows release provides self-contained x86/x64/arm64 binaries which run on 10 and 11.
2625

2726
1. Download the latest Windows zip file (Mzinga.WinX86.zip, Mzinga.WinX64.zip, *or* Mzinga.WinArm64.zip) from https://github.com/jonthysell/Mzinga/releases/latest
2827
2. Extract the zip file
@@ -31,7 +30,7 @@ The standard Windows release provides self-contained x86/x64/arm64 binaries whic
3130

3231
#### Setup MSI ####
3332

34-
A standalone version of *MzingaViewer* is available via an installer which can run on Windows 7 SP1+, 8.1, 10, and 11.
33+
A standalone version of *MzingaViewer* is available via an installer which can run on 10 and 11.
3534

3635
1. Download the latest Windows setup file (MzingaViewer.WinX86.Setup.msi, MzingaViewer.WinX64.Setup.msi *or* MzingaViewer.WinArm64.Setup.msi) from https://github.com/jonthysell/Mzinga/releases/latest
3736
2. Open the installer
@@ -48,14 +47,14 @@ A standalone version of *MzingaViewer* is available via the Microsoft Store for
4847

4948
### MacOS ###
5049

51-
The MacOS release provides self-contained x64/arm64 binaries which run on OSX >= 10.15.
50+
The MacOS release provides self-contained x64/arm64 binaries which should run on OSX >= 13.
5251

5352
1. Download the latest MacOS tar.gz file (Mzinga.MacOSX64.tar.gz *or* Mzinga.MacOSArm64.tar.gz) from https://github.com/jonthysell/Mzinga/releases/latest
5453
2. Extract the tar.gz file
5554

56-
**Note:** If you're unsure which version to download, try Mzinga.MacOSX64.tar.gz first. Most modern PCs are x64.
55+
**Note:** If you're on Apple Silicon (M1/M2/etc.), try Mzinga.MacOSArm64.tar.gz first. Otherwise if you're on Intel hardware use Mzinga.MacOSX64.tar.gz.
5756

58-
**Note:** If MacOS Gatekeeper prevents you from running Mzinga, you may need to run `xattr -cr` on the downloaded files.
57+
**Note:** If MacOS Gatekeeper prevents you from running Mzinga (complaining that it's "damaged"), you may need to run `xattr -cr Mzinga*` in the directory first.
5958

6059
### Linux ###
6160

@@ -68,7 +67,7 @@ The Linux release provides self-contained x64/arm64 binaries which run on many L
6867

6968
### Unpacked ###
7069

71-
The Unpacked release provides loose, framework-dependent .NET 6 binaries.
70+
The Unpacked release provides loose, framework-dependent .NET 8 binaries.
7271

7372
1. Install the latest [.NET Runtime](https://dotnet.microsoft.com/download/dotnet/8.0)
7473
2. Download the latest Unpacked zip file (Mzinga.Unpacked.zip) from https://github.com/jonthysell/Mzinga/releases/latest

‎src/Mzinga.Test/Mzinga.Test.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
22-
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
23-
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
24-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
22+
<PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
23+
<PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
24+
<PackageReference Include="coverlet.collector" Version="6.0.4">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
2528
</ItemGroup>
2629

2730
<ItemGroup>

‎src/Mzinga.Viewer.Setup/Mzinga.Viewer.Setup.wixproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<Import Project="Sdk.props"
33
Sdk="WixToolset.Sdk"
4-
Version="4.0.3" />
4+
Version="6.0.0" />
55
<PropertyGroup>
66
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
77
<OutputName Condition="'$(Platform)' == 'x86'">MzingaViewer.WinX86.Setup</OutputName>
8-
<OutputName Condition=" '$(Platform)' == 'x64'">MzingaViewer.WinX64.Setup</OutputName>
9-
<OutputName Condition=" '$(Platform)' == 'ARM64'">MzingaViewer.WinArm64.Setup</OutputName>
10-
<OutputName Condition=" '$(OutputName)' == ''">MzingaViewer.Setup</OutputName>
8+
<OutputName Condition="'$(Platform)' == 'x64'">MzingaViewer.WinX64.Setup</OutputName>
9+
<OutputName Condition="'$(Platform)' == 'ARM64'">MzingaViewer.WinArm64.Setup</OutputName>
10+
<OutputName Condition="'$(OutputName)' == ''">MzingaViewer.Setup</OutputName>
1111
<OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
1212
<IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
1313
<SuppressIces>ICE61;</SuppressIces>
@@ -24,15 +24,15 @@
2424
</ItemGroup>
2525
<ItemGroup>
2626
<PackageReference Include="WixToolset.UI.wixext"
27-
Version="4.0.3" />
27+
Version="6.0.0" />
2828
<PackageReference Include="WixToolset.Util.wixext"
29-
Version="4.0.3" />
29+
Version="6.0.0" />
3030
<PackageReference Include="WixToolset.Heat"
31-
Version="4.0.3" />
31+
Version="6.0.0" />
3232
</ItemGroup>
3333
<Import Project="Sdk.targets"
3434
Sdk="WixToolset.Sdk"
35-
Version="4.0.3" />
35+
Version="6.0.0" />
3636
<PropertyGroup>
3737
<PostBuildEvent />
3838
</PropertyGroup>
@@ -41,7 +41,7 @@
4141
<PropertyGroup>
4242
<LinkerBaseInputPaths>..\Mzinga.Viewer\bin\$(Platform)\$(Configuration) (Setup)\</LinkerBaseInputPaths>
4343
<DefineConstants>PublishPath=..\Mzinga.Viewer\bin\$(Platform)\$(Configuration) (Setup)\</DefineConstants>
44-
<RunWixToolsOutOfProc Condition=" '$(PROCESSOR_ARCHITECTURE)'!='x86'">true</RunWixToolsOutOfProc>
44+
<RunWixToolsOutOfProc Condition="'$(PROCESSOR_ARCHITECTURE)'!='x86'">true</RunWixToolsOutOfProc>
4545
</PropertyGroup>
4646
<HeatDirectory AutoGenerateGuids="true"
4747
ComponentGroupName="MzingaPublishOut"

‎src/Mzinga.Viewer/Mzinga.Viewer.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="Avalonia" Version="11.0.7" />
49-
<PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
50-
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.7" Condition="'$(Configuration)' == 'Debug'" />
51-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.7" />
48+
<PackageReference Include="Avalonia" Version="11.3.0" />
49+
<PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
50+
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition="'$(Configuration)' == 'Debug'" />
51+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
5252
<PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
5353
<PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" />
5454
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
55-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
56-
<PackageReference Include="System.Reactive.Linq" Version="6.0.0" />
55+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
56+
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
5757
</ItemGroup>
5858

5959
<ItemGroup>

‎src/Mzinga.Viewer/Views/ConfirmationWindow.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
4646
</md:MarkdownScrollViewer.Styles>
4747
<md:MarkdownScrollViewer.Engine>
48-
<md:Markdown HyperlinkCommand="{Binding (vm:ConfirmationViewModel)$parent[Window].DataContext.AppVM.LaunchURL}" />
48+
<md:Markdown HyperlinkCommand="{Binding $parent[Window].DataContext.AppVM.LaunchURL}" />
4949
</md:MarkdownScrollViewer.Engine>
5050
</md:MarkdownScrollViewer>
5151
<Grid.ContextMenu>

‎src/Mzinga.Viewer/Views/InformationWindow.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<StyleInclude Source="avares://MzingaViewer/Resources/MarkdownStyles.axaml" />
4646
</md:MarkdownScrollViewer.Styles>
4747
<md:MarkdownScrollViewer.Engine>
48-
<md:Markdown HyperlinkCommand="{Binding (vm:ConfirmationViewModel)$parent[Window].DataContext.AppVM.LaunchURL}" />
48+
<md:Markdown HyperlinkCommand="{Binding $parent[Window].DataContext.AppVM.LaunchURL}" />
4949
</md:MarkdownScrollViewer.Engine>
5050
</md:MarkdownScrollViewer>
5151
<Grid.ContextMenu>

‎src/Mzinga.Viewer/Views/MainWindow.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
<ListBox.Styles>
343343
<Style Selector="ListBoxItem">
344344
<Setter Property="IsHitTestVisible"
345-
Value="{Binding (vm:MainViewModel)$parent[Window].DataContext.IsReviewMode}" />
345+
Value="{Binding $parent[Window].DataContext.IsReviewMode}" />
346346
</Style>
347347
</ListBox.Styles>
348348
<ListBox.ItemTemplate>

0 commit comments

Comments
 (0)