Updates to clean things up

picoe · Jun 18, 2024 · 5fdddbc · 5fdddbc
1 parent 0d48d90
commit 5fdddbc
Show file tree

Hide file tree

Showing 40 changed files with 553 additions and 548 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,11 +25,14 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '8.0.x'
 
-    - uses: actions/cache@v1
+    - name: Install macos workload
+      run: dotnet workload install macos
+
+    - uses: actions/cache@v4
       with:
         path: ~/.nuget/packages
         key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -43,7 +46,7 @@ jobs:
       run: dotnet pack ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: nuget
         path: artifacts/nuget/**/*.nupkg
@@ -59,18 +62,19 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '8.0.x'
+
+    - name: Install macos workload
+      run: dotnet workload install macos
 
-    - name: setup-xamarin
-      uses: maxim-lobanov/setup-xamarin@v1
+    - name: Setup XCode
+      uses: maxim-lobanov/setup-xcode@v1
       with:
-        mono-version: latest
-        xamarin-mac-version: latest
-        xcode-version: latest
+        xcode-version: latest-stable
 
-    - uses: actions/cache@v1
+    - uses: actions/cache@v4
       with:
         path: ~/.nuget/packages
         key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -84,7 +88,7 @@ jobs:
       run: dotnet pack ${{ env.PlatformBuildParameters }} ${{ env.BuildParameters }}
 
 #    - name: Upload artifacts
-#      uses: actions/upload-artifact@v2
+#      uses: actions/upload-artifact@v4
 #      with:
 #        name: nuget
 #        path: artifacts/nuget/**/Eto.Veldrid.XamMac2.nupkg
@@ -95,10 +99,10 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
     steps:
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
 
       - name: Download NuGet Packages
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: nuget
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,34 +11,31 @@
             "preLaunchTask": "build",
             "program": "",
             "osx": {
-                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Mac64/Debug/net5.0/osx-x64/TestEtoVeldrid.Mac64.app/Contents/MacOS/TestEtoVeldrid.Mac64"
+                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Mac64/Debug/net8.0/TestEtoVeldrid.Mac64.app/Contents/MacOS/TestEtoVeldrid.Mac64"
             },
             "linux": {
-                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Gtk/Debug/net7.0/linux-x64/TestEtoVeldrid.Gtk.dll"
+                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Gtk/Debug/net8.0/linux-x64/TestEtoVeldrid.Gtk.dll"
             },
             "windows": {
-                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Wpf/Debug/net5.0-windows/win-x64/TestEtoVeldrid.Wpf.dll"
+                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Wpf/Debug/net8.0-windows/win-x64/TestEtoVeldrid.Wpf.dll"
             },
             "console": "internalConsole",
             "stopAtEntry": false
         },
         {
-            "name": "Launch Mono",
-            "type": "mono",
+            "name": "Launch macOS",
+            "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
             "program": "",
             "osx": {
-                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Mac64/Debug/net48/osx-x64/TestEtoVeldrid.Mac64.app/Contents/MacOS/TestEtoVeldrid.Mac64",
-                "useRuntime": false
-            },
-            "linux": {
-                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.Gtk/Debug/net48/linux-x64/TestEtoVeldrid.Gtk.exe"
+                "program": "${workspaceFolder}/artifacts/bin/TestEtoVeldrid.macOS/Debug/net8.0-macos/TestEtoVeldrid.macOS.app/Contents/MacOS/TestEtoVeldrid.macOS"
             },
-            "console": "internalConsole"
+            "console": "internalConsole",
+            "stopAtEntry": false
         },
         {
-            "name": "Launch .NET (WPF)",
+            "name": "Launch WPF - net48",
             "type": "clr",
             "request": "launch",
             "preLaunchTask": "build",
@@ -49,7 +46,7 @@
             "console": "internalConsole"
         },
         {
-            "name": "Launch .NET (WinForms)",
+            "name": "Launch WinForms - net48",
             "type": "clr",
             "request": "launch",
             "preLaunchTask": "build",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,73 +5,35 @@
             "label": "build",
             "command": "dotnet",
             "type": "shell",
-            "osx": {
-                "args": [
-                    "build",
-                    "${workspaceFolder}/Eto.Veldrid.sln",
-                    "/p:Platform=Mac",
-                    "/p:Configuration=${input:configuration}",
-                    "/p:GenerateFullPaths=true",
-                    "/consoleloggerparameters:NoSummary"
-                ],
+            "args": [
+                "build",
+                "${workspaceFolder}/Eto.Veldrid.sln",
+                "/p:Configuration=${input:configuration}",
+                "/p:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
             },
-            "linux": {
-                "args": [
-                    "build",
-                    "${workspaceFolder}/Eto.Veldrid.sln",
-                    "/p:Platform=Mac",
-                    "/p:Configuration=${input:configuration}",
-                    "/p:GenerateFullPaths=true",
-                    "/consoleloggerparameters:NoSummary"
-                ],
-            },
-            "windows": {
-                "args": [
-                    "build",
-                    "${workspaceFolder}/Eto.Veldrid.sln",
-                    "/p:Platform=Windows",
-                    "/p:Configuration=${input:configuration}",
-                    "/p:GenerateFullPaths=true",
-                    "/consoleloggerparameters:NoSummary"
-                ],
-            },
-            "problemMatcher": "$msCompile"
         },
         {
             "label": "Pack",
             "command": "dotnet",
             "type": "process",
-            "osx": {
-                "args": [
-                    "pack",
-                    "${workspaceFolder}/Eto.Veldrid.sln",
-                    "/p:Platform=Mac",
-                    "/p:Configuration=${input:configuration}",
-                    "/p:GenerateFullPaths=true",
-                    "/consoleloggerparameters:NoSummary"
-                ]
-            },
-            "linux": {
-                "args": [
-                    "pack",
-                    "${workspaceFolder}/Eto.Veldrid.sln",
-                    "/p:Platform=Mac",
-                    "/p:Configuration=${input:configuration}",
-                    "/p:GenerateFullPaths=true",
-                    "/consoleloggerparameters:NoSummary"
-                ]
-            },
-            "windows": {
-                "args": [
-                    "pack",
-                    "${workspaceFolder}/Eto.Veldrid.sln",
-                    "/p:Platform=Windows",
-                    "/p:Configuration=${input:configuration}",
-                    "/p:GenerateFullPaths=true",
-                    "/consoleloggerparameters:NoSummary"
-                ]
+            "args": [
+                "pack",
+                "${workspaceFolder}/Eto.Veldrid.sln",
+                "/p:Configuration=${input:configuration}",
+                "/p:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
             },
-            "problemMatcher": "$msCompile"
         }
     ],
     "inputs": [
@@ -86,4 +48,4 @@
             ]
         }
     ]
-}
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,6 +8,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>10.0</LangVersion>
+
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+
     <RestoreAdditionalProjectSources>https://www.myget.org/F/eto/</RestoreAdditionalProjectSources>
 
     <TopLevelDirectory>$(MSBuildThisFileDirectory)</TopLevelDirectory>
@@ -28,7 +33,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DevVersion>0.1.0</DevVersion>
+    <DevVersion>0.2.0</DevVersion>
 
     <!-- set version from tag -->
     <Version Condition="$(BuildBranch.StartsWith('refs/tags/'))">$(BuildBranch.Substring(10))</Version>