Merge pull request #46 from tryphotino/debug

Update Samples to Photino v3.0
tryphotino · May 30, 2024 · b246310 · b246310
2 parents 3d3a71b + d2a141c
commit b246310
Show file tree

Hide file tree

Showing 135 changed files with 22,552 additions and 49,523 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Photino.HelloPhotino.3d.React/HelloPhotino.3d.React.csproj b/Photino.HelloPhotino.3d.React/HelloPhotino.3d.React.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -16,8 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Photino.Native" Version="2.5.2" />
-    <PackageReference Include="Photino.NET" Version="2.5.2" />
+    <PackageReference Include="Photino.NET" Version="3.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Photino.HelloPhotino.3d.React/Program.cs b/Photino.HelloPhotino.3d.React/Program.cs
@@ -1,4 +1,4 @@
-using PhotinoNET;
+using Photino.NET;
 using System;
 using System.Drawing;
 

diff --git a/Photino.HelloPhotino.3d/HelloPhotino.3d.csproj b/Photino.HelloPhotino.3d/HelloPhotino.3d.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -16,8 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="Photino.Native" Version="2.5.2" />
-      <PackageReference Include="Photino.NET" Version="2.5.2" />
+      <PackageReference Include="Photino.NET" Version="3.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Photino.HelloPhotino.3d/Program.cs b/Photino.HelloPhotino.3d/Program.cs
@@ -1,4 +1,4 @@
-using PhotinoNET;
+using Photino.NET;
 using System;
 using System.Drawing;
 

diff --git a/Photino.HelloPhotino.Angular/HelloPhotino.Angular.csproj b/Photino.HelloPhotino.Angular/HelloPhotino.Angular.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Platforms>AnyCPU</Platforms>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
@@ -18,11 +18,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" Condition=" '$(GenerateEmbeddedFilesManifest)' == 'true' " />
-		<PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
-		<PackageReference Include="Photino.Native" Version="2.5.2" />
-		<PackageReference Include="Photino.NET" Version="2.5.2" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.1" Condition=" '$(GenerateEmbeddedFilesManifest)' == 'true' " />
+		<PackageReference Include="Photino.NET" Version="3.0.0" />
 		<PackageReference Include="Photino.NET.Server" Version="1.0.0" />
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
 	</ItemGroup>
@@ -60,7 +57,7 @@
 		<Exec WorkingDirectory="$(UiRoot)" Command="npm run build" />
 
 		<ItemGroup>
-			<UiBuildOutputFiles Include="$(UiRoot)$(UiBuildOutput)**\*.*" />
+			<UiBuildOutputFiles Include="$(UiRoot)$(UiBuildOutput)\**\*.*" />
 		</ItemGroup>
 
 		<Copy SourceFiles="@(UiBuildOutputFiles)" DestinationFiles="@(UiBuildOutputFiles->'$(WwwRoot)%(RecursiveDir)%(Filename)%(Extension)')" />

diff --git a/Photino.HelloPhotino.Angular/Program.cs b/Photino.HelloPhotino.Angular/Program.cs
@@ -1,19 +1,30 @@
-using System.Drawing;
-using System.Text;
-using PhotinoNET;
+using Photino.NET;
 using PhotinoNET.Server;
+using System.Drawing;
+using System.Text;
 
 namespace Photino.HelloPhotino.Angular;
 
 class Program
 {
+#if DEBUG
+    public static bool IsDebugMode = true;
+#else
+    public static bool IsDebugMode = false;
+#endif
+
     [STAThread]
     static void Main(string[] args)
     {
         PhotinoServer
-            .CreateStaticFileServer(args, out string baseUrl)
+            .CreateStaticFileServer(args, 8000, 100, "wwwroot/browser/", out string baseUrl)
             .RunAsync();
 
+        // The appUrl is set to the local development server when in debug mode.
+        // This helps with hot reloading and debugging.
+        string appUrl = IsDebugMode ? "http://localhost:4200" : $"{baseUrl}/index.html";
+        Console.WriteLine($"Serving Angular app at {appUrl}");
+
         // Window title declared here for visibility
         string windowTitle = "Photino.Angular Demo App";
 
@@ -24,6 +35,8 @@ static void Main(string[] args)
             .SetSize(new Size(2048, 1024))
             // Resize to a percentage of the main monitor work area
             //.Resize(50, 50, "%")
+            .SetUseOsDefaultSize(false)
+            .SetSize(new Size(800, 600))
             // Center window in the middle of the screen
             .Center()
             // Users can resize windows by default.
@@ -56,8 +69,8 @@ static void Main(string[] args)
                 // "window.external.receiveMessage(callback: Function)"
                 window.SendWebMessage(response);
             })
-            .Load($"{baseUrl}/index.html"); // Can be used with relative path strings or "new URI()" instance to load a website.
+            .Load(appUrl); // Can be used with relative path strings or "new URI()" instance to load a website.
 
         window.WaitForClose(); // Starts the application event loop
     }
-}
+}
diff --git a/...hotino.Angular/Resources/wwwroot/.gitkeep → ...ngular/Resources/wwwroot/browser/.gitkeep b/...hotino.Angular/Resources/wwwroot/.gitkeep → ...ngular/Resources/wwwroot/browser/.gitkeep
diff --git a/Photino.HelloPhotino.Angular/UserInterface/.browserslistrc b/Photino.HelloPhotino.Angular/UserInterface/.browserslistrc
diff --git a/Photino.HelloPhotino.Angular/UserInterface/.gitignore b/Photino.HelloPhotino.Angular/UserInterface/.gitignore
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
 
 # Compiled output
 /dist

diff --git a/Photino.HelloPhotino.Angular/UserInterface/README.md b/Photino.HelloPhotino.Angular/UserInterface/README.md
@@ -1,6 +1,6 @@
-# PhotionHelloPhotinoAngularUi
+# PhotinoHellophotinoAngular
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.3.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.0.2.
 
 ## Development server
 
@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To u
 
 ## Further help
 
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
diff --git a/Photino.HelloPhotino.Angular/UserInterface/angular.json b/Photino.HelloPhotino.Angular/UserInterface/angular.json
@@ -3,54 +3,59 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "Photion.HelloPhotino.Angular.Ui": {
+    "photino-hellophotino-angular": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist",
+            "outputPath": "dist/photino-hellophotino-angular",
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
             "tsConfig": "tsconfig.app.json",
-            "assets": ["src/favicon.ico", "src/assets"],
-            "styles": ["src/styles.css"],
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
             "scripts": []
           },
           "configurations": {
             "production": {
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumWarning": "500kB",
+                  "maximumError": "1MB"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "maximumWarning": "2kB",
+                  "maximumError": "4kB"
                 }
               ],
               "outputHashing": "all"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
             }
           },
           "defaultConfiguration": "production"
@@ -59,29 +64,35 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "Photion.HelloPhotino.Angular.Ui:build:production"
+              "buildTarget": "photino-hellophotino-angular:build:production"
             },
             "development": {
-              "browserTarget": "Photion.HelloPhotino.Angular.Ui:build:development"
+              "buildTarget": "photino-hellophotino-angular:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "Photion.HelloPhotino.Angular.Ui:build"
-          }
+          "builder": "@angular-devkit/build-angular:extract-i18n"
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
             "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "assets": ["src/favicon.ico", "src/assets"],
-            "styles": ["src/styles.css"],
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
             "scripts": []
           }
         }

diff --git a/Photino.HelloPhotino.Angular/UserInterface/karma.conf.js b/Photino.HelloPhotino.Angular/UserInterface/karma.conf.js