diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82de036e92..d6ea75b577 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,14 @@ on:
types: [ published ]
env:
- DotNetVersion: "6.0.201"
+ DotNetVersion: "6.0.202"
BuildConfiguration: "Release"
BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
jobs:
build-windows:
- runs-on: windows-2019
+ runs-on: windows-2022
steps:
- uses: actions/checkout@v2
@@ -111,6 +111,7 @@ jobs:
name: nuget
path: |
artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.XamMac2*.nupkg
+ artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.macOS*.nupkg
artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.Gtk2*.nupkg
- name: Upload test artifacts
diff --git a/.vscode/launch.json b/.vscode/launch.json
index aa036acff7..6acacfc3a1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,7 +6,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-mac64",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
// "targetArchitecture": "x86_64", // uncomment to test intel on M1
"args": [],
"console": "internalConsole",
@@ -19,7 +19,7 @@
"request": "launch",
"preLaunchTask": "build-mac64",
"program": ".",
- "runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+ "runtimeExecutable": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net48/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
"passDebugOptionsViaEnvironmentVariable": true,
"args": [],
"console": "internalConsole",
@@ -31,7 +31,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-macos",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-macos/osx-x64/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net6.0-macos/osx-x64/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
"args": [],
"console": "internalConsole",
"internalConsoleOptions": "openOnSessionStart",
@@ -43,7 +43,7 @@
"request": "launch",
"preLaunchTask": "build-xammac2",
"program": ".",
- "runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
+ "runtimeExecutable": "${workspaceFolder}/artifacts/test/Eto.Test.XamMac2/${config:var.configuration}/net48/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
"passDebugOptionsViaEnvironmentVariable": true,
"args": [],
"console": "internalConsole",
@@ -55,7 +55,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-gtk",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll",
"args": [],
"osx": {
"env": {
@@ -72,7 +72,7 @@
"type": "mono",
"request": "launch",
"preLaunchTask": "build-gtk",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Gtk.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net48/Eto.Test.Gtk.exe",
"passDebugOptionsViaEnvironmentVariable": true,
"args": [],
"osx": {
@@ -89,7 +89,7 @@
"type": "mono",
"request": "launch",
"preLaunchTask": "build-gtk2",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Gtk2.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk2/${config:var.configuration}/net48/Eto.Test.Gtk2.exe",
"passDebugOptionsViaEnvironmentVariable": true,
"args": [],
"console": "internalConsole",
@@ -101,7 +101,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-wpf",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
"targetArchitecture": "x86_64",
"args": [],
"console": "internalConsole",
@@ -113,7 +113,7 @@
"type": "clr",
"request": "launch",
"preLaunchTask": "build-wpf",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Wpf.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net48/Eto.Test.Wpf.exe",
"args": [],
"console": "internalConsole",
"internalConsoleOptions": "openOnSessionStart",
@@ -124,7 +124,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-winforms",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe",
"args": [],
"console": "internalConsole",
"internalConsoleOptions": "openOnSessionStart",
@@ -135,7 +135,7 @@
"type": "clr",
"request": "launch",
"preLaunchTask": "build-winforms",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.WinForms.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net48/Eto.Test.WinForms.exe",
"args": [],
"console": "internalConsole",
"internalConsoleOptions": "openOnSessionStart",
@@ -146,7 +146,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-direct2d",
- "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe",
+ "program": "${workspaceFolder}/artifacts/test/Eto.Test.Direct2D/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe",
"args": [],
"console": "internalConsole",
"internalConsoleOptions": "openOnSessionStart",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 600a35de5e..83a5701650 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -3,7 +3,7 @@
"tasks": [
{
"label": "build",
- "command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj",
+ "command": "dotnet build ${config:var.buildProperties} /p:Configuration=${input:configuration} ${workspaceFolder}/build/Build.proj",
"type": "shell",
"problemMatcher": "$msCompile",
"group": {
@@ -187,6 +187,15 @@
"Yes"
]
},
+ {
+ "type": "pickString",
+ "id": "configuration",
+ "description": "Build Configuration",
+ "options": [
+ "Debug",
+ "Release"
+ ]
+ },
{
"type": "promptString",
"id": "version",
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 923fe25e88..3887e5d85e 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -3,6 +3,6 @@
false
- $(BasePath)artifacts\samples\
+ $(BasePath)artifacts\samples\$(MSBuildProjectName)\
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 40c281af25..4a3bb4f4ed 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,6 +2,6 @@
- $(BasePath)artifacts\core\
+ $(BasePath)artifacts\core\$(MSBuildProjectName)\
\ No newline at end of file
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index fd8a5270b9..1f3a787b85 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -3,6 +3,6 @@
False
- $(BasePath)artifacts\test\
+ $(BasePath)artifacts\test\$(MSBuildProjectName)\
\ No newline at end of file