Pārlūkot izejas kodu

Merge pull request #655 from PixiEditor/open-beta

Open beta stuff and net 8
Krzysztof Krysiński 8 mēneši atpakaļ
vecāks
revīzija
b15623c513
59 mainītis faili ar 90 papildinājumiem un 88 dzēšanām
  1. 2 2
      samples/Sample1_HelloWorld/Sample1_HelloWorld.csproj
  2. 2 2
      samples/Sample2_LocalizationSample/Sample2_LocalizationSample.csproj
  3. 2 2
      samples/Sample3_Preferences/Sample3_Preferences.csproj
  4. 2 2
      samples/Sample4_CreatePopup/Sample4_CreatePopup.csproj
  5. 2 2
      samples/Sample5_Resources/Sample5_Resources.csproj
  6. 2 2
      samples/Sample6_Palettes/Sample6_Palettes.csproj
  7. 2 2
      samples/Sample7_FlyUI/Sample7_FlyUI.csproj
  8. 1 1
      src/ChunkyImageLib/ChunkyImageLib.csproj
  9. 1 1
      src/ChunkyImageLibVis/ChunkyImageLibVis.csproj
  10. 1 1
      src/Drawie
  11. 1 1
      src/PixiDocks
  12. 1 1
      src/PixiEditor.AnimationRenderer.Core/PixiEditor.AnimationRenderer.Core.csproj
  13. 1 1
      src/PixiEditor.AnimationRenderer.FFmpeg/PixiEditor.AnimationRenderer.FFmpeg.csproj
  14. 9 9
      src/PixiEditor.Beta/BetaExtension.cs
  15. 3 2
      src/PixiEditor.Beta/PixiEditor.Beta.csproj
  16. 1 1
      src/PixiEditor.Beta/Program.cs
  17. 1 1
      src/PixiEditor.Beta/WelcomeMessage.cs
  18. 10 9
      src/PixiEditor.Beta/WelcomeMessageState.cs
  19. 3 3
      src/PixiEditor.Beta/extension.json
  20. 1 1
      src/PixiEditor.Browser/PixiEditor.Browser.csproj
  21. 1 1
      src/PixiEditor.Builder/build/PixiEditor.Builder.csproj
  22. 1 1
      src/PixiEditor.ChangeableDocument/PixiEditor.ChangeableDocument.csproj
  23. 1 1
      src/PixiEditor.Common/PixiEditor.Common.csproj
  24. 1 1
      src/PixiEditor.Desktop/PixiEditor.Desktop.csproj
  25. 1 1
      src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj
  26. 1 1
      src/PixiEditor.Extensions.Runtime/PixiEditor.Extensions.Runtime.csproj
  27. 1 1
      src/PixiEditor.Extensions.Sdk/PixiEditor.Extensions.Sdk.csproj
  28. BIN
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Api.CGlueMSBuild.dll
  29. BIN
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.MSPackageBuilder.dll
  30. 1 1
      src/PixiEditor.Extensions.WasmRuntime/PixiEditor.Extensions.WasmRuntime.csproj
  31. 1 1
      src/PixiEditor.Extensions/PixiEditor.Extensions.csproj
  32. 1 1
      src/PixiEditor.Linux/PixiEditor.Linux.csproj
  33. 1 1
      src/PixiEditor.MacOs/PixiEditor.MacOs.csproj
  34. 1 1
      src/PixiEditor.OperatingSystem/PixiEditor.OperatingSystem.csproj
  35. 1 1
      src/PixiEditor.Platform.MSStore/PixiEditor.Platform.MSStore.csproj
  36. 1 1
      src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj
  37. 1 1
      src/PixiEditor.Platform.Steam/PixiEditor.Platform.Steam.csproj
  38. 1 1
      src/PixiEditor.Platform/PixiEditor.Platform.csproj
  39. 1 1
      src/PixiEditor.SVG/PixiEditor.SVG.csproj
  40. 1 1
      src/PixiEditor.UI.Common/PixiEditor.UI.Common.csproj
  41. 1 1
      src/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller.Desktop/PixiEditor.UpdateInstaller.Desktop.csproj
  42. 1 1
      src/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller.csproj
  43. 1 1
      src/PixiEditor.UpdateModule/PixiEditor.UpdateModule.csproj
  44. 1 1
      src/PixiEditor.Windows/PixiEditor.Windows.csproj
  45. 1 1
      src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj
  46. 1 1
      src/PixiEditor.sln
  47. 6 6
      src/PixiEditor/Helpers/VersionHelpers.cs
  48. 1 1
      src/PixiEditor/Initialization/ClassicDesktopEntry.cs
  49. 1 1
      src/PixiEditor/PixiEditor.csproj
  50. 1 1
      src/PixiParser
  51. 1 1
      src/global.json
  52. 1 1
      tests/CGlueTestLib/CGlueTestLib.csproj
  53. 1 1
      tests/ChunkyImageLibTest/ChunkyImageLibTest.csproj
  54. 1 1
      tests/PixiEditor.Api.CGlueMSBuild.Tests/PixiEditor.Api.CGlueMSBuild.Tests.csproj
  55. 1 1
      tests/PixiEditor.Backend.Tests/PixiEditor.Backend.Tests.csproj
  56. 1 1
      tests/PixiEditor.Extensions.Sdk.Tests/PixiEditor.Extensions.Sdk.Tests.csproj
  57. 1 1
      tests/PixiEditor.Extensions.Tests/PixiEditor.Extensions.Tests.csproj
  58. 1 1
      tests/PixiEditor.Extensions.WasmRuntime.Tests/PixiEditor.Extensions.WasmRuntime.Tests.csproj
  59. 1 1
      tests/PixiEditor.Tests/PixiEditor.Tests.csproj

+ 2 - 2
samples/Sample1_HelloWorld/Sample1_HelloWorld.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <RootNamespace>HelloWorld</RootNamespace>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>

+ 2 - 2
samples/Sample2_LocalizationSample/Sample2_LocalizationSample.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <RootNamespace>LocalizationSample</RootNamespace>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>

+ 2 - 2
samples/Sample3_Preferences/Sample3_Preferences.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <RootNamespace>Preferences</RootNamespace>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>

+ 2 - 2
samples/Sample4_CreatePopup/Sample4_CreatePopup.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <RootNamespace>CreatePopupSample</RootNamespace>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>

+ 2 - 2
samples/Sample5_Resources/Sample5_Resources.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
         <RootNamespace>ResourcesSample</RootNamespace>

+ 2 - 2
samples/Sample6_Palettes/Sample6_Palettes.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
         <RootNamespace>PalettesSample</RootNamespace>

+ 2 - 2
samples/Sample7_FlyUI/Sample7_FlyUI.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <PublishTrimmed>true</PublishTrimmed>
         <WasmSingleFileBundle>true</WasmSingleFileBundle>
         <GenerateExtensionPackage>true</GenerateExtensionPackage>
-        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+        <PixiExtOutputPath>..\..\src\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\win-x64\Extensions</PixiExtOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
         <RootNamespace>FlyUISample</RootNamespace>

+ 1 - 1
src/ChunkyImageLib/ChunkyImageLib.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

+ 1 - 1
src/ChunkyImageLibVis/ChunkyImageLibVis.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>

+ 1 - 1
src/Drawie

@@ -1 +1 @@
-Subproject commit 252c43e10a70ac0e560630ca5623355a5e50de7a
+Subproject commit c6372d7854028add4f17fe36fa98a1ab7dcd3951

+ 1 - 1
src/PixiDocks

@@ -1 +1 @@
-Subproject commit 578cd1cde73b10dad264fbeefd860c44905e28a1
+Subproject commit 68dafe4747a6cead83359ede8e0bbc65cdda02a8

+ 1 - 1
src/PixiEditor.AnimationRenderer.Core/PixiEditor.AnimationRenderer.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.AnimationRenderer.FFmpeg/PixiEditor.AnimationRenderer.FFmpeg.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Configurations>Release;Debug</Configurations>

+ 9 - 9
src/PixiEditor.ClosedBeta/ClosedBetaExtension.cs → src/PixiEditor.Beta/BetaExtension.cs

@@ -1,27 +1,27 @@
 using PixiEditor.Extensions.Sdk;
 
-namespace PixiEditor.ClosedBeta;
+namespace PixiEditor.Beta;
 
-public class ClosedBetaExtension : PixiEditorExtension
+public class BetaExtension : PixiEditorExtension
 {
     public override void OnInitialized()
     {
-        if (Api.Preferences.GetPreference<bool>("ClosedBetaWelcomeShown"))
+        if (Api.Preferences.GetPreference<bool>("BetaWelcomeShown"))
         {
-            return;   
+            return;
         }
-        
+
         WelcomeMessage welcomeMessage = new();
-        var window = Api.WindowProvider.CreatePopupWindow("Welcome to the closed beta!", welcomeMessage);
+        var window = Api.WindowProvider.CreatePopupWindow("Welcome to the PixiEditor 2.0 beta!", welcomeMessage);
         welcomeMessage.OnContinue += () =>
         {
-            Api.Preferences.UpdatePreference("ClosedBetaWelcomeShown", true);
+            Api.Preferences.UpdatePreference("BetaWelcomeShown", true);
             window.Close();
         };
 
         window.Width = 800;
-        window.Height = 600;
-        
+        window.Height = 650;
+
         window.CanResize = false;
         window.CanMinimize = false;
         window.ShowDialog();

+ 3 - 2
src/PixiEditor.ClosedBeta/PixiEditor.ClosedBeta.csproj → src/PixiEditor.Beta/PixiEditor.Beta.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -9,8 +9,9 @@
     <PublishTrimmed>true</PublishTrimmed>
     <WasmSingleFileBundle>true</WasmSingleFileBundle>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PixiExtOutputPath>..\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net9.0\win-x64\Extensions</PixiExtOutputPath>
+    <PixiExtOutputPath>..\PixiEditor.Desktop\bin\Debug\net8.0\Extensions</PixiExtOutputPath>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
+    <RootNamespace>PixiEditor.Beta</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

+ 1 - 1
src/PixiEditor.ClosedBeta/Program.cs → src/PixiEditor.Beta/Program.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.ClosedBeta;
+namespace PixiEditor.Beta;
 
 public static class Program
 {

+ 1 - 1
src/PixiEditor.ClosedBeta/WelcomeMessage.cs → src/PixiEditor.Beta/WelcomeMessage.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.Sdk.Api.FlyUI;
 
-namespace PixiEditor.ClosedBeta;
+namespace PixiEditor.Beta;
 
 public class WelcomeMessage : StatefulElement<WelcomeMessageState>
 {

+ 10 - 9
src/PixiEditor.ClosedBeta/WelcomeMessageState.cs → src/PixiEditor.Beta/WelcomeMessageState.cs

@@ -1,8 +1,7 @@
-using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
-using PixiEditor.Extensions.Sdk;
-using PixiEditor.Extensions.Sdk.Api.FlyUI;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
+using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.ClosedBeta;
+namespace PixiEditor.Beta;
 
 public class WelcomeMessageState : State
 {
@@ -10,11 +9,13 @@ public class WelcomeMessageState : State
 We are extremely exicted to share this version to you, early testers. Before you jump in and test all the new things,
 we have a few things to note:
 
-- This is a very first publicly available version of PixiEditor 2.0. Not every feature promised in the roadmap is
+- This is a very early version of PixiEditor 2.0. Not every feature promised in the roadmap is
   implemented yet. 
 - App is not production ready! Expect bugs, crashes, unfinished features, placeholders and other signs of development.
-- Your feedback is the most important thing of this beta, please take a moment to report any issues and suggestions on the Discord channel.
-- Promised features available in this beta are: Animations, Procedural Art (Nodes)
+- Your feedback is the most important thing of this beta, please take a moment to report any issues and suggestions on PixiEditor Forum.
+(forum.pixieditor.net)
+- We are collecting anonymous usage data to fix bugs, crashes and performance issues. This data will help us to improve the app. During the beta 
+there is no option to opt-out. No personal data is collected.
 
 Click on below checkboxes that you understand what you are getting into and you are ready to test the app.
 
@@ -31,12 +32,12 @@ I understand that:
             new Align(
                 Alignment.TopCenter,
                 new Column(
-                    new Center(new Text("Welcome to the closed beta of PixiEditor 2.0!", TextWrap.Wrap,
+                    new Center(new Text("Welcome to the open beta of PixiEditor 2.0!", TextWrap.Wrap,
                         FontStyle.Normal,
                         fontSize: 24)),
                     new Text(Body, TextWrap.Wrap, fontSize: 16),
                     new CheckBox(
-                        new Text("The app is unstable and may crash and freeze", fontSize: 16,
+                        new Text("The app may be unstable, crash or freeze", fontSize: 16,
                             fontStyle: FontStyle.Italic),
                         onCheckedChanged: (args) => CheckboxChanged(args.Sender as CheckBox, 0)),
                     new CheckBox(

+ 3 - 3
src/PixiEditor.ClosedBeta/extension.json → src/PixiEditor.Beta/extension.json

@@ -1,7 +1,7 @@
 {
-  "displayName": "PixiEditor Closed Beta 1",
-  "uniqueName": "PixiEditor.ClosedBeta1",
-  "description": "First Closed Beta of PixiEditor 2.0",
+  "displayName": "PixiEditor Beta",
+  "uniqueName": "PixiEditor.Beta",
+  "description": "Open Beta of PixiEditor 2.0",
   "version": "1.0.0",
   "author": {
     "name": "PixiEditor",

+ 1 - 1
src/PixiEditor.Browser/PixiEditor.Browser.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0-browser</TargetFramework>
+    <TargetFramework>net8.0-browser</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
     <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
     <OutputType>Exe</OutputType>

+ 1 - 1
src/PixiEditor.Builder/build/PixiEditor.Builder.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
         <AssemblyName>PixiEditor.Builder</AssemblyName>
         <RootNamespace>PixiEditor.Builder</RootNamespace>

+ 1 - 1
src/PixiEditor.ChangeableDocument/PixiEditor.ChangeableDocument.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

+ 1 - 1
src/PixiEditor.Common/PixiEditor.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>PixiEditor.Common</RootNamespace>

+ 1 - 1
src/PixiEditor.Desktop/PixiEditor.Desktop.csproj

@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
     One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

+ 1 - 1
src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.Extensions.Runtime/PixiEditor.Extensions.Runtime.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.Extensions.Sdk/PixiEditor.Extensions.Sdk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

BIN
src/PixiEditor.Extensions.Sdk/build/PixiEditor.Api.CGlueMSBuild.dll


BIN
src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.MSPackageBuilder.dll


+ 1 - 1
src/PixiEditor.Extensions.WasmRuntime/PixiEditor.Extensions.WasmRuntime.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

+ 1 - 1
src/PixiEditor.Extensions/PixiEditor.Extensions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFramework>net9.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
       <ImplicitUsings>enable</ImplicitUsings>
       <Nullable>enable</Nullable>
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

+ 1 - 1
src/PixiEditor.Linux/PixiEditor.Linux.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.MacOs/PixiEditor.MacOs.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.OperatingSystem/PixiEditor.OperatingSystem.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.Platform.MSStore/PixiEditor.Platform.MSStore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.Platform.Steam/PixiEditor.Platform.Steam.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

+ 1 - 1
src/PixiEditor.Platform/PixiEditor.Platform.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.SVG/PixiEditor.SVG.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.UI.Common/PixiEditor.UI.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller.Desktop/PixiEditor.UpdateInstaller.Desktop.csproj

@@ -3,7 +3,7 @@
         <OutputType>WinExe</OutputType>
         <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
         One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

+ 1 - 1
src/PixiEditor.UpdateModule/PixiEditor.UpdateModule.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

+ 1 - 1
src/PixiEditor.Windows/PixiEditor.Windows.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

+ 1 - 1
src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>Nullable</WarningsAsErrors>
   </PropertyGroup>

+ 1 - 1
src/PixiEditor.sln

@@ -96,7 +96,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Common", "PixiEd
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuiltInExtensions", "BuiltInExtensions", "{99903753-40A6-434E-8B8F-CE55417CF7FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.ClosedBeta", "PixiEditor.ClosedBeta\PixiEditor.ClosedBeta.csproj", "{059904E2-9ACC-41E6-B78D-F0BC03CA9D78}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Beta", "PixiEditor.Beta\PixiEditor.Beta.csproj", "{059904E2-9ACC-41E6-B78D-F0BC03CA9D78}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiDocks.Avalonia", "PixiDocks\src\PixiDocks.Avalonia\PixiDocks.Avalonia.csproj", "{2B4A9926-0532-4C59-9289-37775A7499A4}"
 EndProject

+ 6 - 6
src/PixiEditor/Helpers/VersionHelpers.cs

@@ -11,7 +11,7 @@ internal static class VersionHelpers
 
     public static string GetCurrentAssemblyVersionString(bool moreSpecific = false)
     {
-        StringBuilder builder = new($"{GetCurrentAssemblyVersion().ToString()} Closed Beta");
+        StringBuilder builder = new($"{GetCurrentAssemblyVersion().ToString()} Beta");
 
         // TODO: Dev Build removed for closed beta
 #if MSIX_DEBUG
@@ -39,15 +39,15 @@ internal static class VersionHelpers
     public static string GetBuildId()
     {
 #if DEBUG
-        return "ClosedBetaDebug";
+        return "BetaDebug";
 #elif DEVRELEASE
-        return "ClosedBetaDevRelease";
+        return "BetaDevRelease";
 #elif RELEASE
-        return "ClosedBetaRelease";
+        return "BetaRelease";
 #elif STEAM
-        return "ClosedBetaSteam";
+        return "BetaSteam";
 #elif MSIX
-        return "ClosedBetaMSIX";
+        return "BetaMSIX";
 #else
         #error No build name configured for this configuration
 #endif

+ 1 - 1
src/PixiEditor/Initialization/ClassicDesktopEntry.cs

@@ -96,7 +96,7 @@ internal class ClassicDesktopEntry
         //TODO: fetch from extension store
         extensionLoader.AddOfficialExtension("pixieditor.supporterpack",
             new OfficialExtensionData("supporter-pack.snk", AdditionalContentProduct.SupporterPack));
-        extensionLoader.AddOfficialExtension("pixieditor.closedbeta1", new OfficialExtensionData());
+        extensionLoader.AddOfficialExtension("pixieditor.beta", new OfficialExtensionData());
         extensionLoader.LoadExtensions();
 
         return extensionLoader;

+ 1 - 1
src/PixiEditor/PixiEditor.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

+ 1 - 1
src/PixiParser

@@ -1 +1 @@
-Subproject commit 069637c38964746691a3416c1bcc88793b5554e1
+Subproject commit f8d329ffab59c579a25c8a2813395191e1be9a70

+ 1 - 1
src/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }

+ 1 - 1
tests/CGlueTestLib/CGlueTestLib.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
     <OutputType>Exe</OutputType>
     <PublishTrimmed>true</PublishTrimmed>

+ 1 - 1
tests/ChunkyImageLibTest/ChunkyImageLibTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

+ 1 - 1
tests/PixiEditor.Api.CGlueMSBuild.Tests/PixiEditor.Api.CGlueMSBuild.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

+ 1 - 1
tests/PixiEditor.Backend.Tests/PixiEditor.Backend.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

+ 1 - 1
tests/PixiEditor.Extensions.Sdk.Tests/PixiEditor.Extensions.Sdk.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

+ 1 - 1
tests/PixiEditor.Extensions.Tests/PixiEditor.Extensions.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

+ 1 - 1
tests/PixiEditor.Extensions.WasmRuntime.Tests/PixiEditor.Extensions.WasmRuntime.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

+ 1 - 1
tests/PixiEditor.Tests/PixiEditor.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>