UltralightNet 1.3

.env

@@ -0,0 +1,4 @@
+DOTNET_ROLL_FORWARD=LatestMajor
+DOTNET_TieredPGO=1
+DOTNET_ReadyToRun=0
+DOTNET_TC_QuickJitForLoops=1

.github/workflows/build.yml

@@ -17,91 +17,74 @@ jobs:
     # needs: BuildCmake
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
-      - name: Build packages
+          dotnet-version: 7.x
+      - name: Pack bins
         run: |
-          dotnet pack src/UltralightNet.Binaries -c Release
-          dotnet pack src/UltralightNet.Resources -c Release
-          dotnet pack src/UltralightNet -c Release
-          dotnet pack src/UltralightNet.AppCore.Binaries -c Release
-          dotnet pack src/UltralightNet.AppCore -c Release
-      - run: tree
-      - name: Upload nuget packages artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: nugets
-          path: |
-            UltralightNet.*.nupkg
-            UltralightNet.*.snupkg
-          retention-days: 30
-          if-no-files-found: error
-  DevBuilds:
-    needs: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-      - name: Add Github Packages to NuGet sources
-        run: dotnet nuget add source --username ${{ github.actor }} --password ${{ github.token }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
-      - name: Define a version suffix
-        run: echo "version_suffix=dev-$(date -u +%Y%m%d%H%M%S)-$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
-      - name: Pack
+          chmod +x ./packbinaries.sh
+          ./packbinaries.sh -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
+      - name: Build
+        run: |
+          chmod +x ./regenerate.sh
+          ./regenerate.sh
+      - name: Build compat
+        run: |
+          dotnet build src/UltralightNet -c Release
+          dotnet build src/UltralightNet.AppCore -c Release
+      - name: Upload to github packages
         run: |
-          dotnet pack src/UltralightNet.Binaries -c Release --version-suffix ${{ env.version_suffix }} -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-          dotnet pack src/UltralightNet.Resources -c Release --version-suffix ${{ env.version_suffix }} -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-          dotnet pack src/UltralightNet -c Release --version-suffix ${{ env.version_suffix }} -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-          dotnet pack src/UltralightNet.AppCore.Binaries -c Release --version-suffix ${{ env.version_suffix }} -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-          dotnet pack src/UltralightNet.AppCore -c Release --version-suffix ${{ env.version_suffix }} -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-      - name: Publish
-        run: dotnet nuget push *.nupkg --api-key ${{ github.token }} --source github
+          dotnet nuget add source --username ${{ github.actor }} --password ${{ github.token }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
+          version_suffix=dev-$(date -u +%Y%m%d%H%M%S)-$(git rev-parse --short ${{ github.sha }})
+          dotnet pack src/UltralightNet -c Release --version-suffix $version_suffix -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
+          dotnet pack src/UltralightNet.AppCore -c Release --version-suffix $version_suffix -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
+          dotnet nuget push *.nupkg --api-key ${{ github.token }} --source github --skip-duplicate
+          dotnet nuget push *.snupkg --api-key ${{ github.token }} --source github --skip-duplicate
   Test:
     needs: Build
     runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
-        os : ['windows', 'ubuntu', 'macos']
+        os : ['windows', 'ubuntu'] # 'macos'
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.100
-      - name: Install missing libraries
-        run: | # missing libraries workaround
-          sudo add-apt-repository ppa:linuxuprising/libpng12
-          sudo apt update
-          sudo apt install libpng12-0 libpulse0 libxv1
-          find /usr/lib -name "libffi.so*"
-          sudo ln -s  /usr/lib/x86_64-linux-gnu/libffi.so.7.1.0  /usr/lib/x86_64-linux-gnu/libffi.so.6
-        if: matrix.os=='ubuntu'
-      - name: Download packages
-        uses: actions/download-artifact@v3
-        with:
-          name: nugets
-          path: ./
-      - run: tree
-        if: matrix.os=='ubuntu'
-      - name: Test
-        if: matrix.os!='macos'
-        run: dotnet test src/UltralightNet.Test/UltralightNet.Test.csproj --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura,opencover -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.UseSourceLink=true
-      - name: Test (macos)
-        if: matrix.os=='macos'
+          dotnet-version: 7.x
+      #- name: Install missing libraries
+      #  run: | # missing libraries workaround
+      #    sudo add-apt-repository ppa:linuxuprising/libpng12
+      #    sudo apt update
+      #    sudo apt install libpng12-0 libpulse0 libxv1
+      #    find /usr/lib -name "libffi.so*"
+      #    sudo ln -s  /usr/lib/x86_64-linux-gnu/libffi.so.7.1.0  /usr/lib/x86_64-linux-gnu/libffi.so.6
+      #  if: matrix.os=='ubuntu'
+      - name: Pack bins
+        shell: bash
+        run: |
+          chmod +x ./packbinaries.sh
+          ./packbinaries.sh -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
+      - name: Build
+        shell: bash
+        run: |
+          chmod +x ./regenerate.sh
+          ./regenerate.sh
+      - name: Build compat
         run: |
-          dotnet test src/UltralightNet.Test/UltralightNet.Test.csproj --filter Category!=Renderer --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura,opencover -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.UseSourceLink=true
-          dotnet tool install --global coverlet.console
-          dotnet build -c Release src/UltralightNet.TestRunner/UltralightNet.TestRunner.csproj
-          coverlet src/UltralightNet.TestRunner/bin/Release/net6.0/UltralightNet.TestRunner.dll --target "dotnet" --targetargs "src/UltralightNet.TestRunner/bin/Release/net6.0/UltralightNet.TestRunner.dll" --format cobertura --format opencover
+          dotnet build src/UltralightNet -c Release
+          dotnet build src/UltralightNet.AppCore -c Release
+      - name: Test
+        run: dotnet test src/UltralightNet.Test/UltralightNet.Test.csproj --logger "trx;LogFileName=TestResult.trx" --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura,opencover -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.UseSourceLink=true -- ParallelizeTestCollections=false
+      - name: Read test results
+        if: always()
+        run: cat src/UltralightNet.Test/TestResults/TestResult.trx
+      - name: Test (Stress)
+        run: dotnet test src/UltralightNet.Test/UltralightNet.Test.csproj -e DOTNET_GCStress=0xC --logger "trx;LogFileName=TestResult.trx" --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura,opencover -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.UseSourceLink=true -- ParallelizeTestCollections=false
+      - name: Read test results
+        if: always()
+        run: cat src/UltralightNet.Test/TestResults/TestResult.trx
       - name: Upload coverage
         uses: codecov/codecov-action@v3
         with:
@@ -117,20 +100,26 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref_name == 'master'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.x
+    - name: Pack bins
+      run: |
+        chmod +x ./packbinaries.sh
+        ./packbinaries.sh -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
+    - name: Build
+      run: |
+        chmod +x ./regenerate.sh
+        ./regenerate.sh
     - name: Pack
       run: |
-        dotnet pack src/UltralightNet.Binaries -c Release -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-        dotnet pack src/UltralightNet.Resources -c Release -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
         dotnet pack src/UltralightNet -c Release -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-        dotnet pack src/UltralightNet.AppCore.Binaries -c Release -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
         dotnet pack src/UltralightNet.AppCore -c Release -p:RepositoryBranch=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
     - run: tree
     - name: Publish
       run: |
         dotnet nuget push *.nupkg -k ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+        dotnet nuget push *.snupkg -k ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json --skip-duplicate
       # continue-on-error: true

.gitignore

@@ -9,7 +9,6 @@
 *.pdb
 *.pidb
 *.psess
-*.resources
 *.sln.docstates
 *.suo
 *.svclog
@@ -67,3 +66,4 @@ TestResult.xml
 *.spv
 gpu/shaders/compiled
 BenchmarkDotNet.Artifacts
+**/**.g.cs

.vscode/launch.json

@@ -14,12 +14,7 @@
             "cwd": "${workspaceFolder}/Examples/gpu/UltralightNet.OpenGL.TestApp/bin/Debug/net6.0",
             "console": "internalConsole",
             "stopAtEntry": false,
-            "env": {
-                "DISPLAY": ":0.0",
-				"DOTNET_TieredPGO": "1",
-				"DOTNET_ReadyToRun": "0",
-				"DOTNET_TC_QuickJitForLoops": "1"
-            }
+            "envFile": "${workspaceFolder}/.env"
         },
 		{
             "name": "Vulkan TestApp",
@@ -30,7 +25,8 @@
             "args": [],
             "cwd": "${workspaceFolder}/Examples/gpu/UltralightNet.Vulkan.TestApp/bin/Debug/net6.0",
             "console": "internalConsole",
-            "stopAtEntry": false
+            "stopAtEntry": false,
+			"envFile": "${workspaceFolder}/.env"
         },
 		{
             "name": "Veldrid TestApp",
@@ -52,7 +48,8 @@
             "args": [],
             "cwd": "${workspaceFolder}/Examples/AppCore/UltralightNet.AppCore.TestApp/bin/Debug/net6.0",
             "console": "internalConsole",
-            "stopAtEntry": false
+            "stopAtEntry": false,
+			"envFile": "${workspaceFolder}/.env"
         },
 		{
             "name": "TestApp",
@@ -71,10 +68,8 @@
             "request": "launch",
             "preLaunchTask": "build_Examples_GettingStarted",
             "program": "${workspaceFolder}/Examples/Headless/GettingStarted/bin/Debug/net6.0/GettingStarted.dll",
-            "args": [],
             "cwd": "${workspaceFolder}/Examples/Headless/GettingStarted/bin/Debug/net6.0",
-            "console": "internalConsole",
-            "stopAtEntry": false
+            "envFile": "${workspaceFolder}/.env"
         },
         {
             "name": ".NET Core Attach",

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<VersionPrefix>1.3.0</VersionPrefix>
-		<VersionSuffix>alpha.6</VersionSuffix>
+		<VersionSuffix></VersionSuffix>
 
 		<Authors>Supine</Authors>
 		<PackageProjectUrl>https://github.com/SupinePandora43/UltralightNet</PackageProjectUrl>
@@ -10,6 +10,7 @@
 
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>
+		<UseSourceLink>true</UseSourceLink>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
 		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
@@ -18,19 +19,24 @@
 
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Nullable>enable</Nullable>
-		<LangVersion>10</LangVersion> <!-- Set to 11, when .NET 7 comes out <3 -->
+		<LangVersion>11</LangVersion>
 		<ImplicitUsings>disable</ImplicitUsings>
 
 		<NoWarn>1006</NoWarn>
 		<AnalysisModeReliability>all</AnalysisModeReliability>
 
 		<IsTrimmable>true</IsTrimmable>
 		<PublishTrimmed>true</PublishTrimmed>
-		<TrimMode>link</TrimMode>
+		<TrimMode>full</TrimMode>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
 		<PackageReadmeFile>README.md</PackageReadmeFile>
+
+
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+
+		<UltralightVersion>1.3.0</UltralightVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

Examples/AppCore/UltralightNet.AppCore.TestApp/Program.cs

@@ -1,40 +1,27 @@
 using System;
-using System.IO;
+using UltralightNet;
+using UltralightNet.AppCore;
 
-namespace UltralightNet.AppCore.TestApp;
+ULPlatform.FileSystem = ULPlatform.DefaultFileSystem;
+using var app = ULApp.Create(new(), new());
+using var window = app.MainMonitor.CreateWindow(512, 512);
 
-class Program
-{
-	static void Main()
-	{
-		AppCoreMethods.ulEnableDefaultLogger("./log.txt");
-		AppCoreMethods.ulEnablePlatformFileSystem(Path.GetDirectoryName(typeof(Program).Assembly.Location) ?? "./");
+window.Title = "AppCore Example";
 
-		using ULApp app = ULApp.Create(new(), new());
-		using ULWindow window = app.MainMonitor.CreateWindow(512, 512, false, ULWindowFlags.Titled | ULWindowFlags.Resizable | ULWindowFlags.Maximizable);
+using var overlay = window.CreateOverlay(window.ScreenWidth, window.ScreenHeight);
+window.OnResize += (uint width, uint height) => overlay.Resize(width, height);
+window.OnClose += () => app.Quit();
 
-		window.Title = "test title";
+var view = overlay.View;
+//view.URL = "https://github.com/SupinePandora43/UltralightNet";
 
-		using ULOverlay overlay = window.CreateOverlay(window.Width, window.Height, 0, 0);
-		window.SetResizeCallback((IntPtr user_data, ULWindow window, uint width, uint height) => overlay.Resize(width, height));
-		window.SetCloseCallback((_, _) => app.Quit());
+view.OnFailLoading += (frame_id, is_main_frame, url, description, error_domain, error_code) => throw new Exception("Failed loading");
 
-		View view = overlay.View;
-		//view.URL = "https://github.com/SupinePandora43/UltralightNet";
+//view.HTML = "<html><body><p>123</p></body></html>";
+//view.URL = "https://vk.com/supinepandora43";
+//view.URL = "https://www.youtube.com/watch?v=N1v4TjntTJI";
+//view.URL = "https://twitter.com/@supinepandora43";
+view.URL = "https://ultralig.ht/";
+//while (!l) { app.Renderer.Update(); Thread.Sleep(20); }
 
-		view.OnFailLoading += (frame_id, is_main_frame, url, description, error_domain, error_code) => throw new Exception("Failed loading");
-
-		bool l = false;
-
-		view.OnFinishLoading += (frame_id, is_main_frame, url) => l = true;
-
-		//view.HTML = "<html><body><p>123</p></body></html>";
-		//view.URL = "https://vk.com/supinepandora43";
-		//view.URL = "https://www.youtube.com/watch?v=N1v4TjntTJI";
-		//view.URL = "https://twitter.com/@supinepandora43";
-		view.URL = "https://en.key-test.ru/";
-		//while (!l) { app.Renderer.Update(); Thread.Sleep(20); }
-
-		app.Run();
-	}
-}
+app.Run();

Examples/AppCore/UltralightNet.AppCore.TestApp/UltralightNet.AppCore.TestApp.csproj

@@ -1,19 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="UltralightNet.AppCore" Version="$(Version)" />
-		<PackageReference Include="UltralightNet.Binaries" Version="$(Version)" />
-		<PackageReference Include="UltralightNet.Resources" Version="$(Version)" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ProjectReference Include="..\..\..\src\UltralightNet\UltralightNet.csproj" />
-	  <ProjectReference Include="..\..\..\src\UltralightNet.AppCore\UltralightNet.AppCore.csproj" />
-	</ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="UltralightNet.Binaries" Version="$(UltralightVersion)" />
+		<PackageReference Include="UltralightNet.AppCore.Binaries" Version="$(UltralightVersion)" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\..\..\src\UltralightNet\UltralightNet.csproj" />
+	  <ProjectReference Include="..\..\..\src\UltralightNet.AppCore\UltralightNet.AppCore.csproj" />
+	</ItemGroup>
+
+</Project>