Skip to content

Commit 4917c51

Browse files
Meta-AgentsMeta-Agents
committed
ZX Basic Studio v1.8.0.6
- Upgraded to .Net 10 - Bug in nextcreator
1 parent ef83dc3 commit 4917c51

11 files changed

Lines changed: 77 additions & 55 deletions

File tree

‎Bufdio/Bufdio.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="FFmpeg.AutoGen" Version="5.1.2.3" />
12+
<PackageReference Include="FFmpeg.AutoGen" Version="6.1.0.1" />
1313
</ItemGroup>
1414

1515
</Project>

‎Bufdio/Players/AudioPlayer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,8 @@ private void RunEngine()
478478
continue;
479479
}
480480

481-
var samples = MemoryMarshal.Cast<byte, float>(frame.Data);
481+
float[] samplesArray = MemoryMarshal.Cast<byte, float>(frame.Data).ToArray();
482+
Span<float> samples = samplesArray.AsSpan();
482483
ProcessSampleProcessors(samples);
483484

484485
SetAndRaiseStateChanged(PlaybackState.Playing);

‎MsBox.Avalonia/Dto/AbstractMessageBoxParams.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public abstract class AbstractMessageBoxParams
9292
/// <summary>
9393
/// Determines system decorations (title bar, border, etc)
9494
/// </summary>
95-
public WindowDecorations SystemDecorations { get; set; } = WindowDecorations.Full;
95+
public SystemDecorations SystemDecorations { get; set; } = SystemDecorations.Full;
9696

9797
/// <summary>
9898
/// Window under all windows

‎MsBox.Avalonia/MsBox.Avalonia.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Avalonia" Version="12.1.1" />
11-
<PackageReference Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
12-
<PackageReference Include="DialogHost.Avalonia" Version="0.12.3" />
10+
<PackageReference Include="Avalonia" Version="11.3.18" />
11+
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
12+
<PackageReference Include="DialogHost.Avalonia" Version="0.11.0" />
1313
<PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.3" />
1414
</ItemGroup>
1515

‎MsBox.Avalonia/ViewModels/AbstractMsBoxViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected AbstractMsBoxViewModel(AbstractMessageBoxParams @params, Icon icon = I
8686
public double MaxHeight { get; set; }
8787
public double Height { get; set; }
8888

89-
public WindowDecorations SystemDecorations { get; set; }
89+
public SystemDecorations SystemDecorations { get; set; }
9090
public bool Topmost { get; set; }
9191

9292
public SizeToContent SizeToContent { get; set; } = SizeToContent.Height;

‎MsBox.Avalonia/Windows/MsBoxWindow.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
x:Class="MsBox.Avalonia.Windows.MsBoxWindow"
77
SizeToContent="WidthAndHeight"
88
x:CompileBindings="False"
9-
WindowDecorations="{Binding WindowDecorations}"
9+
SystemDecorations="{Binding SystemDecorations}"
1010
Topmost="{Binding Topmost}"
1111
Icon="{Binding WindowIconPath}"
1212
WindowStartupLocation="{Binding LocationOfMyWindow}"

‎ZXBSInstaller/ZXBSInstaller.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,18 @@
5555
</ItemGroup>
5656

5757
<ItemGroup>
58-
<PackageReference Include="Avalonia" Version="12.1.1" />
59-
<PackageReference Include="Avalonia.Desktop" Version="12.1.1" />
60-
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.1" />
61-
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.1" />
58+
<PackageReference Include="Avalonia" Version="11.3.18" />
59+
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
60+
<PackageReference Include="Avalonia.Desktop" Version="11.3.18" />
61+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.18" />
62+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.18" />
6263
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
6364
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.18">
6465
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
6566
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
6667
</PackageReference>
67-
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.13" />
68+
<PackageReference Include="Avalonia.Themes.Simple" Version="11.3.18" />
69+
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.1" />
6870
</ItemGroup>
6971

7072
<ItemGroup>

‎ZXBStudio/BuildSystem/ZXProjectBuilder.cs‎

Lines changed: 52 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -250,50 +250,68 @@ private static bool BuildNexFile(byte[] binary, ZXBuildSettings settings, ZXProj
250250
File.Delete(nexDataFile);
251251
}
252252

253-
outputLogWritter.WriteLine("Building .nex file...");
254-
Process process = new Process();
255-
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
253+
// Build .nex file
256254
{
257-
CheckNextCreator();
258-
process.StartInfo.FileName = Path.Combine(Path.GetDirectoryName(ZXOptions.Current.ZxbcPath), "python", "python.exe");
259-
process.StartInfo.Arguments = string.Format("{0} nex.cfg {1}",
260-
Path.Combine(Path.GetDirectoryName(ZXOptions.Current.ZxbcPath), "tools", "nextcreator.py"),
261-
Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex");
262-
process.StartInfo.WorkingDirectory = project.ProjectPath;
263-
process.StartInfo.UseShellExecute = false;
264-
process.StartInfo.CreateNoWindow = true;
265-
process.StartInfo.RedirectStandardOutput = true;
266-
}
267-
else
268-
{
269-
process.StartInfo.FileName = Path.Combine(Path.GetDirectoryName(ZXOptions.Current.ZxbcPath), "tools", "nextcreator.py");
270-
process.StartInfo.Arguments = "nex.cfg " + Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex";
255+
outputLogWritter.WriteLine("Building .nex file...");
256+
257+
var nextCreatorPath = Path.Combine(Path.GetDirectoryName(ZXOptions.Current.ZxbcPath), "tools", "nextcreator");
258+
bool usePython = false;
259+
if (File.Exists(nextCreatorPath + ".exe"))
260+
{
261+
nextCreatorPath += ".exe";
262+
}
263+
else if (File.Exists(nextCreatorPath))
264+
{
265+
// Linux
266+
}
267+
else
268+
{
269+
nextCreatorPath += ".py";
270+
usePython = true;
271+
}
272+
273+
//CheckNextCreator();
274+
Process process = new Process();
275+
if (usePython)
276+
{
277+
process.StartInfo.FileName = Path.Combine(Path.GetDirectoryName(ZXOptions.Current.ZxbcPath), "python", "python.exe");
278+
process.StartInfo.Arguments = string.Format("{0} nex.cfg {1}",
279+
nextCreatorPath,
280+
Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex");
281+
}
282+
else
283+
{
284+
process.StartInfo.FileName = nextCreatorPath;
285+
process.StartInfo.Arguments = string.Format("nex.cfg {0}",
286+
Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex");
287+
}
271288
process.StartInfo.WorkingDirectory = project.ProjectPath;
272289
process.StartInfo.UseShellExecute = false;
273290
process.StartInfo.CreateNoWindow = true;
274291
process.StartInfo.RedirectStandardOutput = true;
275-
}
276-
outputLogWritter.WriteLine(string.Format("{0} {1}",
277-
process.StartInfo.FileName,
278-
process.StartInfo.Arguments));
279-
process.Start();
280-
process.WaitForExit();
281292

282-
if (!File.Exists(nexFile))
283-
{
284-
outputLogWritter.WriteLine("Error building .nex file");
285-
outputLogWritter.WriteLine(process.StartInfo.WorkingDirectory);
293+
outputLogWritter.WriteLine(string.Format("{0} {1}",
294+
process.StartInfo.FileName,
295+
process.StartInfo.Arguments));
296+
process.Start();
297+
process.WaitForExit();
286298

287-
using (StreamReader reader = process.StandardOutput)
299+
if (!File.Exists(nexFile))
288300
{
289-
string output = reader.ReadToEnd();
290-
outputLogWritter.WriteLine(output);
301+
outputLogWritter.WriteLine("Error building .nex file");
302+
outputLogWritter.WriteLine(process.StartInfo.WorkingDirectory);
303+
304+
using (StreamReader reader = process.StandardOutput)
305+
{
306+
string output = reader.ReadToEnd();
307+
outputLogWritter.WriteLine(output);
308+
}
309+
return false;
291310
}
292-
return false;
293-
}
294311

295-
// Copy .nex file to data folder
296-
File.Copy(nexFile, nexDataFile);
312+
// Copy .nex file to data folder
313+
File.Copy(nexFile, nexDataFile);
314+
}
297315
}
298316
return true;
299317
}

‎ZXBStudio/ZXBasicStudio.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Title>ZX Basic Studio</Title>
1414
<AssemblyVersion></AssemblyVersion>
1515
<Deterministic>False</Deterministic>
16-
<Version>1.8.0.5</Version>
16+
<Version>1.8.0.6</Version>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
@@ -571,17 +571,17 @@
571571
</ItemGroup>
572572

573573
<ItemGroup>
574-
<PackageReference Include="Avalonia" Version="12.1.1" />
575-
<PackageReference Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
576-
<PackageReference Include="Avalonia.Desktop" Version="12.1.1" />
577-
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.1" />
574+
<PackageReference Include="Avalonia" Version="11.3.18" />
575+
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
576+
<PackageReference Include="Avalonia.Desktop" Version="11.3.18" />
577+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.18" />
578578
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
579579
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.18" />
580-
<PackageReference Include="Avalonia.Themes.Simple" Version="12.1.1" />
580+
<PackageReference Include="Avalonia.Themes.Simple" Version="11.3.18" />
581581
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
582582
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
583583
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
584-
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.13" />
584+
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.1" />
585585
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
586586
<PackageReference Include="TextCopy" Version="6.2.1" />
587587
</ItemGroup>

‎ZXBStudio/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8.0.5
1+
1.8.0.6

0 commit comments

Comments
 (0)