bring branch up to date with develop

picoe · Dec 15, 2020 · 2628ce1 · 2628ce1
2 parents d763b6d + f3bdea1
commit 2628ce1
Show file tree

Hide file tree

Showing 155 changed files with 2,914 additions and 935 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-t4": {
+      "version": "2.0.5",
+      "commands": [
+        "t4"
+      ]
+    }
+  }
+}
diff --git a/.editorconfig b/.editorconfig
@@ -20,3 +20,7 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 tab_size = 2
+
+[*.yml]
+intent_style = space
+indent_size = 2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,12 +6,12 @@ on:
   pull_request:
     branches: [ develop ]
   release:
-    types: [ published ]
+    types: [ released ]
 
 env:
-  DotNetVersion: "3.1.301"
+  DotNetVersion: "5.0.100"
   BuildConfiguration: "Release"
-  BuildParameters: "build/Build.proj /v:Minimal /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
+  BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
 
 jobs:
   build-windows:
@@ -23,6 +23,18 @@ jobs:
       with:
         submodules: true
 
+    # needed for dotnet-t4
+    - name: Setup .NET Core 2.1.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: "2.1.x"
+
+    # Can't use .NET 5 with msbuild until VS is updated to 16.8 in GitHub Actions
+    - name: Setup .NET Core 3.1.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: "3.1.x"
+
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
@@ -32,7 +44,7 @@ jobs:
       uses: microsoft/setup-msbuild@v1
 
     - name: Build
-      run: msbuild ${{ env.BuildParameters }} /p:Platform=Windows /t:Package /bl:artifacts/log/Build.Windows.binlog
+      run: dotnet build ${{ env.BuildParameters }} /p:Platform=Windows /t:Package /bl:artifacts/log/Build.Windows.binlog
 
     - name: Build VS/Win Extension
       run: msbuild ${{ env.BuildParameters }} /t:BuildAddins /bl:artifacts/log/Addin.Windows.binlog
@@ -53,7 +65,9 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: test
-        path: artifacts/test/${{ env.BuildConfiguration }}/**/*
+        path: |
+          artifacts/test/${{ env.BuildConfiguration }}/**/*
+          !artifacts/test/${{ env.BuildConfiguration }}/**/*Mac64.*
 
     - name: Upload sample artifacts
       uses: actions/upload-artifact@v2
@@ -82,17 +96,34 @@ jobs:
       with:
         dotnet-version: ${{ env.DotNetVersion }}
 
-    - name: setup-xamarin
-      uses: maxim-lobanov/setup-xamarin@v1.1
+    - name: Setup Xamarin and XCode
+      uses: maxim-lobanov/setup-xamarin@v1
       with:
         mono-version: latest
         xamarin-mac-version: latest
         xcode-version: latest
 
+    - name: Import code signing certificate
+      if: github.event_name != 'pull_request'
+      uses: apple-actions/import-codesign-certs@v1
+      with:
+        p12-file-base64: ${{ secrets.DEVID_CERTIFICATE_P12 }}
+        p12-password: ${{ secrets.DEVID_CERTIFICATE_P12_PASSWORD }}
+
+    - name: Enable code signing
+      if: github.event_name != 'pull_request'
+      run: echo "BuildParameters=${{ env.BuildParameters }} /p:EnableCodeSignBuild=True" >> $GITHUB_ENV
+
+    - name: Set notarization credentials
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        xcrun altool --store-password-in-keychain-item "AC_PASSWORD" -u "${{ secrets.AC_USERNAME }}" -p "${{ secrets.AC_PASSWORD }}"
+        echo "BuildParameters=${{ env.BuildParameters }} /p:EnableNotarizationBuild=True" >> $GITHUB_ENV
+
     - name: Build
-      run: msbuild ${{ env.BuildParameters }} /p:Platform=Mac /t:Package /bl:artifacts/log/Build.Mac.binlog
+      run: dotnet build ${{ env.BuildParameters }} /p:Platform=Mac /t:Package /bl:artifacts/log/Build.Mac.binlog
 
-    - name: Build VS/Mac Extension
+    - name: Build VS/Mac extension
       run: msbuild ${{ env.BuildParameters }} /t:BuildAddins /bl:artifacts/log/Addin.Mac.binlog
 
     - name: Upload nuget artifacts
@@ -109,12 +140,23 @@ jobs:
         name: addins
         path: artifacts/addin/${{ env.BuildConfiguration }}/net472/Eto.Addin.MonoDevelop*.mpack
 
+    - name: Upload test artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: test
+        path: |
+          artifacts/test/${{ env.BuildConfiguration }}/**/*XamMac2.*
+          artifacts/test/${{ env.BuildConfiguration }}/**/*Mac64.*
+          artifacts/test/${{ env.BuildConfiguration }}/**/*Gtk2.*
+
     - name: Upload log files
       if: ${{ failure() }}
       uses: actions/upload-artifact@v2
       with:
         name: log
-        path: artifacts/log/**/*
+        path: |
+          artifacts/log/**/*
+          lib/monomac/artifacts/generated/**/*.binlog
 
   update-release:
     needs: [ build-windows, build-mac ]

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -17,7 +17,10 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Add Milestone Description
-      run: echo -e "${{ github.event.milestone.description }}\n\n$(cat release_file.md)" > release_file.md
+      run: |
+        echo "${{ github.event.milestone.description }}" > release_file_combined.md
+        echo -e "\n\n" >> release_file_combined.md
+        cat release_file.md >> release_file_combined.md
     
     - name: Create Release
       id: create_release
@@ -27,6 +30,6 @@ jobs:
       with:
         tag_name: ${{ github.event.milestone.title }}
         release_name: ${{ github.event.milestone.title }}
-        body_path: release_file.md
+        body_path: release_file_combined.md
         draft: false
         prerelease: false      
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ AppPackages
 [Tt]humbs.db
 /artifacts
 packages/
+.store
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,19 +6,31 @@
             "type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-mac64",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/netcoreapp3.1/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
         },
-        {
-			// requires mono extension from https://github.com/cwensley/vscode-mono-debug/releases
+		{
+            "name": "Eto.Test.Mac64 - mono",
+            "type": "mono",
+			"request": "launch",
+			"preLaunchTask": "build-mac64",
+			"program": ".",
+			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+			"passDebugOptionsViaEnvironmentVariable": true,
+            "args": [],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+		{
             "name": "Eto.Test.XamMac2",
             "type": "mono",
 			"request": "launch",
 			"preLaunchTask": "build-xammac2",
-			"program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
-			"useRuntime": false,
+			"program": ".",
+			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
+			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -28,18 +40,50 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-gtk",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/netcoreapp3.1/Eto.Test.Gtk.dll",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0/Eto.Test.Gtk.dll",
             "args": [],
             "console": "internalConsole",
             "stopAtEntry": false,
             "internalConsoleOptions": "openOnSessionStart"
         },
+        {
+            "name": "Eto.Test.Gtk - mono",
+			"type": "mono",
+			"request": "launch",
+			"preLaunchTask": "build-gtk",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Gtk.exe",
+			"passDebugOptionsViaEnvironmentVariable": true,
+            "args": [],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "Eto.Test.Gtk2",
+			"type": "mono",
+			"request": "launch",
+			"preLaunchTask": "build-gtk2",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Gtk2.exe",
+			"passDebugOptionsViaEnvironmentVariable": true,
+            "args": [],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
         {
             "name": "Eto.Test.Wpf",
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/netcoreapp3.1/Eto.Test.Wpf.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0-windows/Eto.Test.Wpf.exe",
+            "args": [],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "Eto.Test.Wpf - .NET 4.7.2",
+			"type": "clr",
+			"request": "launch",
+			"preLaunchTask": "build-wpf",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Wpf.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -49,10 +93,44 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-winforms",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/netcoreapp3.1/Eto.Test.WinForms.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0-windows/Eto.Test.WinForms.exe",
+            "args": [],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+		},
+        {
+            "name": "Eto.Test.WinForms - .NET 4.7.2",
+			"type": "clr",
+			"request": "launch",
+			"preLaunchTask": "build-winforms",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.WinForms.exe",
+            "args": [],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+		},
+        {
+            "name": "Eto.Test.Direct2D",
+			"type": "coreclr",
+			"request": "launch",
+			"preLaunchTask": "build-direct2d",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0-windows/Eto.Test.Direct2D.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
-        }
+		},
+		{
+			"name": "Eto.Addin.VisualStudio.Mac",
+			"type": "mono",
+			"request": "launch",
+			"preLaunchTask": "build-addins",
+			"program": ".",
+			"runtimeExecutable": "/Applications/Visual Studio.app/Contents/MacOS/VisualStudio",
+			"passDebugOptionsViaEnvironmentVariable": true,
+			"args": [ "--no-redirect" ],
+			"env": {
+				"MONODEVELOP_CONSOLE_LOG_LEVEL": "All",
+				"MONODEVELOP_DEV_ADDINS": "${workspaceFolder}/artifacts/addin/${config:var.configuration}/net472/"
+			}
+		}
 	]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -3,10 +3,7 @@
 	"tasks": [
 		{
 			"label": "build",
-			"command": "msbuild /t:Build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj",
-			"windows": {
-				"command": "${workspaceFolder}/build/msbuild.cmd /t:Build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj"
-			},
+			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj",
 			"type": "shell",
 			"problemMatcher": "$msCompile",
 			"group": {
@@ -18,7 +15,7 @@
 			}
 		},
 		{
-			"label": "build addins",
+			"label": "build-addins",
 			"command": "msbuild /t:BuildAddins ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj",
 			"windows": {
 				"command": "${workspaceFolder}/build/msbuild.cmd /t:BuildAddins ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj"
@@ -40,6 +37,16 @@
 				"clear": true
 			}
 		},
+		{
+			"label": "build-gtk2",
+			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Gtk/Eto.Test.Gtk2.csproj",
+			"type": "shell",
+			"group": "build",
+			"problemMatcher": "$msCompile",
+			"presentation": {
+				"clear": true
+			}
+		},
 		{
 			"label": "build-mac64",
 			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Mac/Eto.Test.Mac64.csproj",
@@ -52,7 +59,7 @@
 		},
 		{
 			"label": "build-xammac2",
-			"command": "msbuild /restore ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj",
+			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj",
 			"type": "shell",
 			"group": "build",
 			"problemMatcher": "$msCompile",
@@ -80,6 +87,16 @@
 				"clear": true
 			}
 		},
+		{
+			"label": "build-direct2d",
+			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj",
+			"type": "shell",
+			"group": "build",
+			"problemMatcher": "$msCompile",
+			"presentation": {
+				"clear": true
+			}
+		},
 		{
 			"label": "restore",
 			"command": "dotnet restore /v:Minimal ${workspaceFolder}/src/Eto.sln",
@@ -97,7 +114,16 @@
 			"presentation": {
 				"clear": true
 			}
-        },
+		},
+		{
+			"label": "Set Eto version",
+			"type": "shell",
+			"command": "dotnet msbuild ${workspaceFolder}/build/Build.proj /t:UpdateVersion /p:SetVersion=${input:version}",
+			"problemMatcher": "$msCompile",
+			"presentation": {
+				"clear": true
+			}
+		}
 	],
 	"inputs": [
 		{
@@ -108,6 +134,12 @@
 				"No",
 				"Yes"
 			]
+		},
+		{
+			"type": "promptString",
+			"id": "version",
+			"description": "Enter the version to update to",
+			"default": "2.5.x"
 		}
 	]
 }