Skip to content

Commit 9489d1e

Browse files
cwensleycwensley
committed
Remove Xamarin.Mac platform
Fixes picoe#2583
1 parent eec8a8b commit 9489d1e

File tree

161 files changed

+128
-1262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+128
-1262
lines changed

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
## Specifications
3030

3131
- Version:
32-
- Platform(s): <!-- WPF, WinForms, Gtk, Mac64, XamMac2, etc -->
32+
- Platform(s): <!-- WPF, WinForms, Gtk, Mac64, macOS, etc -->
3333
- Operating System(s): <!-- E.g. Windows 10, macOS 10.13, Ubuntu 18.04, etc -->
3434

‎.github/workflows/build.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
types: [ published ]
1010

1111
env:
12-
DotNetVersion: "7.0.108"
12+
DotNetVersion: "7.0.116"
1313
BuildConfiguration: "Release"
1414
BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
1515

@@ -28,9 +28,6 @@ jobs:
2828
with:
2929
dotnet-version: ${{ env.DotNetVersion }}
3030

31-
- name: Setup msbuild
32-
uses: microsoft/setup-msbuild@v1
33-
3431
- name: Build
3532
run: dotnet build ${{ env.BuildParameters }} /p:Platform=Windows /t:Build /bl:artifacts/log/Build.Windows.binlog
3633

@@ -81,13 +78,11 @@ jobs:
8178
- name: Install macos workload
8279
run: sudo dotnet workload install macos --from-rollback-file dotnet-workloads.json
8380

84-
- name: Setup Xamarin and XCode
85-
uses: maxim-lobanov/setup-xamarin@v1
81+
- name: Setup XCode
82+
uses: maxim-lobanov/setup-xcode@v1
8683
with:
87-
mono-version: latest
88-
xamarin-mac-version: latest
89-
xcode-version: latest
90-
84+
xcode-version: latest-stable
85+
9186
- name: Import code signing certificate
9287
if: github.event_name != 'pull_request'
9388
uses: apple-actions/import-codesign-certs@v1
@@ -113,7 +108,6 @@ jobs:
113108
with:
114109
name: nuget
115110
path: |
116-
artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.XamMac2*.nupkg
117111
artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.macOS*.nupkg
118112
119113
- name: Upload test artifacts
@@ -122,7 +116,6 @@ jobs:
122116
name: test
123117
path: |
124118
artifacts/test/Eto.Test.Mac64/${{ env.BuildConfiguration }}/**/Eto.Test.Mac64.dmg
125-
artifacts/test/Eto.Test.XamMac2/${{ env.BuildConfiguration }}/**/Eto.Test.XamMac2.app
126119
artifacts/test/Eto.Test.macOS/${{ env.BuildConfiguration }}/*/Eto.Test.macOS.app
127120
128121
- name: Upload log files

‎.vscode/launch.json

+6-18
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "build-mac64",
9-
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
9+
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net7.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
1010
// "targetArchitecture": "x86_64", // uncomment to test intel on M1
1111
"args": [],
1212
"console": "internalConsole",
@@ -30,30 +30,18 @@
3030
"type": "coreclr",
3131
"request": "launch",
3232
"preLaunchTask": "build-macos",
33-
"program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net6.0-macos/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
33+
"program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net7.0-macos/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
3434
"args": [],
3535
"console": "internalConsole",
3636
"internalConsoleOptions": "openOnSessionStart",
3737
"justMyCode": false
38-
},
39-
{
40-
"name": "Eto.Test.XamMac2 - mono",
41-
"type": "mono",
42-
"request": "launch",
43-
"preLaunchTask": "build-xammac2",
44-
"program": ".",
45-
"runtimeExecutable": "${workspaceFolder}/artifacts/test/Eto.Test.XamMac2/${config:var.configuration}/net48/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
46-
"passDebugOptionsViaEnvironmentVariable": true,
47-
"args": [],
48-
"console": "internalConsole",
49-
"internalConsoleOptions": "openOnSessionStart"
5038
},
5139
{
5240
"name": "Eto.Test.Gtk",
5341
"type": "coreclr",
5442
"request": "launch",
5543
"preLaunchTask": "build-gtk",
56-
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll",
44+
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net7.0/Eto.Test.Gtk.dll",
5745
"args": [],
5846
"osx": {
5947
"env": {
@@ -97,7 +85,7 @@
9785
"type": "coreclr",
9886
"request": "launch",
9987
"preLaunchTask": "build-wpf",
100-
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
88+
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net7.0-windows/Eto.Test.Wpf.exe",
10189
// "targetArchitecture": "x86_64",
10290
"args": [],
10391
"console": "internalConsole",
@@ -120,7 +108,7 @@
120108
"type": "coreclr",
121109
"request": "launch",
122110
"preLaunchTask": "build-winforms",
123-
"program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe",
111+
"program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net7.0-windows/Eto.Test.WinForms.exe",
124112
"args": [],
125113
"console": "internalConsole",
126114
"internalConsoleOptions": "openOnSessionStart",
@@ -142,7 +130,7 @@
142130
"type": "coreclr",
143131
"request": "launch",
144132
"preLaunchTask": "build-direct2d",
145-
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Direct2D/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe",
133+
"program": "${workspaceFolder}/artifacts/test/Eto.Test.Direct2D/${config:var.configuration}/net7.0-windows/Eto.Test.Direct2D.exe",
146134
"args": [],
147135
"console": "internalConsole",
148136
"internalConsoleOptions": "openOnSessionStart",

‎.vscode/tasks.json

-10
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,6 @@
9898
"clear": true
9999
}
100100
},
101-
{
102-
"label": "build-xammac2",
103-
"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj",
104-
"type": "shell",
105-
"group": "build",
106-
"problemMatcher": "$msCompile",
107-
"presentation": {
108-
"clear": true
109-
}
110-
},
111101
{
112102
"label": "build-wpf",
113103
"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj",

‎README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ Your project only needs to reference Eto.dll, and include the corresponding plat
125125

126126
* Eto.dll - Eto.Forms (UI), Eto.Drawing (Graphics), and platform loading
127127
* Eto.Mac64.dll - Lightweight Mac platform using .NET 6+ or mono
128-
* Eto.XamMac2.dll - Xamarin.Mac Unified platform for Mac to embed mono
129128
* Eto.macOS.dll - .NET 6+ platform for Mac (for use with the net6.0-macos target)
130129
* Eto.WinForms.dll - Windows Forms platform using GDI+ for graphics
131130
* Eto.Direct2D.dll - Windows Forms platform using Direct2D for graphics
@@ -137,7 +136,7 @@ Your project only needs to reference Eto.dll, and include the corresponding plat
137136
Currently supported targets
138137
---------------------------
139138

140-
* OS X: MonoMac, Xamarin.Mac, or net6.0-macos
139+
* OS X: MonoMac or net6.0-macos
141140
* Linux: GTK+ 3
142141
* Windows: Windows Forms (using GDI or Direct2D) or WPF
143142

‎build/Build.proj

+9-26
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,6 @@
203203
<OtherOptions Include="macos" Value="-macos" />
204204
<OtherOptions Include="wf" Value="-wf" />
205205
<OtherOptions Include="wf_macos" Value="-wf -macos" />
206-
<OtherOptions Include="wf_xm" Value="-wf -xm" />
207-
<OtherOptions Include="xm" Value="-xm" />
208206

209207
<CombinedProject1 Include="*" LanguageId="%(Language.Identity)" Language="%(Language.Value)" />
210208
<CombinedProject2 Include="@(CombinedProject1)" CombinedId="%(Combined.Identity)" Combined="%(Combined.Value)" />
@@ -221,33 +219,23 @@
221219
<CombinedProject Update="@(CombinedProject)"
222220
Condition="%(CombinedId) == 'combined'"
223221
BuildCommand="&amp;&amp; dotnet build" />
224-
<!-- Xamarin.Mac doesn't support VB -->
225-
<CombinedProject Remove="@(CombinedProject)"
226-
Condition="%(CombinedId) == 'combined' and %(LanguageId) == 'vb' and (%(OtherId) == 'xm' or %(OtherId) == 'wf_xm')" />
227-
<!-- Xamarin.Mac only supports net4x -->
228-
<CombinedProject Remove="@(CombinedProject)"
229-
Condition="$([MSBuild]::IsOSPlatform(osx)) and %(CombinedId) == 'combined' and (%(OtherId) == 'xm' or %(OtherId) == 'wf_xm') and %(FrameworkId) != 'net48'" />
230-
<!-- Xamarin.Mac can only use dotnet to build in C#, F# requires msbuild -->
231-
<CombinedProject Update="@(CombinedProject)"
232-
Condition="$([MSBuild]::IsOSPlatform(osx)) and %(CombinedId) == 'combined' and (%(LanguageId) != 'cs' and (%(OtherId) == 'xm' or %(OtherId) == 'wf_xm'))"
233-
BuildCommand='&amp;&amp; env -i HOME="$HOME" bash -l -c "msbuild /restore /v:Minimal"' />
234222
<!-- macos doesn't support VB -->
235223
<CombinedProject Remove="@(CombinedProject)"
236224
Condition="%(CombinedId) == 'combined' and %(LanguageId) == 'vb' and (%(OtherId) == 'macos' or %(OtherId) == 'wf_macos')" />
237225
<!-- Wpf doesn't support F# -->
238226
<CombinedProject Remove="@(CombinedProject)"
239-
Condition="$([MSBuild]::IsOSPlatform(Windows)) and %(CombinedId) == 'combined' and %(LanguageId) == 'fs' and (%(OtherId) != 'wf_macos' and %(OtherId) != 'wf' and %(OtherId) != 'wf_xm')" />
227+
Condition="$([MSBuild]::IsOSPlatform(Windows)) and %(CombinedId) == 'combined' and %(LanguageId) == 'fs' and (%(OtherId) != 'wf_macos' and %(OtherId) != 'wf')" />
240228

241229
<!-- Separate Rules -->
242230

243231
<!-- Build Wpf on Windows -->
244232
<CombinedProject Update="@(CombinedProject)"
245-
Condition="%(CombinedId) == 'separate' and $([MSBuild]::IsOSPlatform(Windows))"
233+
Condition="%(CombinedId) == 'separate'"
246234
BuildCommand="&amp;&amp; cd %(ProjectName).Wpf &amp;&amp; dotnet build &amp;&amp; cd .." />
247235

248236
<!-- Build WinForms on Windows -->
249237
<CombinedProject Update="@(CombinedProject)"
250-
Condition="%(CombinedId) == 'separate' and $([MSBuild]::IsOSPlatform(Windows)) and ( %(OtherId) == 'wf_macos' or %(OtherId) == 'wf' or %(OtherId) == 'wf_xm' )"
238+
Condition="%(CombinedId) == 'separate' and ( %(OtherId) == 'wf_macos' or %(OtherId) == 'wf' )"
251239
BuildCommand="%(BuildCommand) &amp;&amp; cd %(ProjectName).WinForms &amp;&amp; dotnet build &amp;&amp; cd .." />
252240

253241
<!-- Build Mac -->
@@ -260,14 +248,9 @@
260248
Condition="%(CombinedId) == 'separate'"
261249
BuildCommand="%(BuildCommand) &amp;&amp; cd %(ProjectName).Gtk &amp;&amp; dotnet build &amp;&amp; cd .." />
262250

263-
<!-- Build Xamarin.Mac with msbuild on Mac only -->
264-
<CombinedProject Update="@(CombinedProject)"
265-
Condition="$([MSBuild]::IsOSPlatform(osx)) and %(CombinedId) == 'separate' and (%(OtherId) == 'xm' or %(OtherId) == 'wf_xm')"
266-
BuildCommand='%(BuildCommand) &amp;&amp;env -i HOME="$HOME" bash -l -c "msbuild /restore /v:Minimal **/*.XamMac.*proj"' />
267-
268-
<!-- Build MacOS on Mac only -->
251+
<!-- Build MacOS -->
269252
<CombinedProject Update="@(CombinedProject)"
270-
Condition="%(CombinedId) == 'separate' and $([MSBuild]::IsOSPlatform(osx)) and (%(OtherId) == 'macos' or %(OtherId) == 'wf_macos')"
253+
Condition="%(CombinedId) == 'separate' and (%(OtherId) == 'macos' or %(OtherId) == 'wf_macos')"
271254
BuildCommand="%(BuildCommand) &amp;&amp; dotnet build **/*.MacOS.*proj" />
272255

273256
</ItemGroup>
@@ -303,10 +286,10 @@
303286
<Config Include="debug" Value="-c Debug" />
304287

305288
<Build Include="build-net4" Create="-f net48" Build="build" />
306-
<Build Include="build-net5" Create="-f net6.0" Build="build" />
307-
<Build Include="build-rid-net5" Create="-f net6.0" Build="build -r osx-x64" />
308-
<Build Include="publish-net5" Create="-f net6.0" Build="publish" />
309-
<Build Include="publish-rid-net5" Create="-f net6.0" Build="publish -r osx-x64" />
289+
<Build Include="build-net6" Create="-f net6.0" Build="build" />
290+
<Build Include="build-rid-net6" Create="-f net6.0" Build="build -r osx-x64" />
291+
<Build Include="publish-net6" Create="-f net6.0" Build="publish" />
292+
<Build Include="publish-rid-net6" Create="-f net6.0" Build="publish -r osx-x64" />
310293

311294
<Combined Include="combined" Value="-c" />
312295
<Combined Include="separate" Value="" Build="**/*.Mac.csproj" />

‎build/Common.props

-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
<OSPlatform Condition="$(OSPlatform) == '' and '$(OS)' == 'Unix' and Exists('/Library/Frameworks')">Mac</OSPlatform>
1010
<OSPlatform Condition="$(OSPlatform) == '' and '$(OS)' != 'Unix'">Windows</OSPlatform>
1111

12-
<XamarinMacPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\</XamarinMacPath>
13-
<XamarinMacLibPath>$(XamarinMacPath)lib\mono\</XamarinMacLibPath>
14-
<XamarinMacTargetsPath>$(XamarinMacPath)lib\msbuild\</XamarinMacTargetsPath>
15-
<HasXamarinMac Condition="!Exists('$(XamarinMacTargetsPath)Xamarin.Mac.CSharp.targets')">False</HasXamarinMac>
16-
<HasXamarinMac Condition="$(HasXamarinMac) == ''">True</HasXamarinMac> <!-- VS for Mac needs this, Exists isn't evaluated -->
17-
1812
<ArtifactsDir Condition="$(BuildOutoutDir) == ''">$(BasePath)artifacts\</ArtifactsDir>
1913
<BaseIntermediateOutputPath Condition="$(BaseIntermediateOutputPath) == ''">$(ArtifactsDir)obj\$(OSPlatform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
2014
<SourceDir Condition="$(SourceDir) == ''">$(BasePath)src\</SourceDir>

‎build/Xamarin.Mac.targets

-116
This file was deleted.

‎samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs ‎samples/MacOS/EmbedEtoInMacOS/AppDelegate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using AppKit;
22
using Foundation;
33

4-
namespace EmbedEtoInXamarinMac
4+
namespace EmbedEtoInMacOS
55
{
66
[Register("AppDelegate")]
77
public class AppDelegate : NSApplicationDelegate

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/[email protected] ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/[email protected] ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/[email protected] ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/[email protected] ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/[email protected] ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/Contents.json ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

‎samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/Contents.json ‎samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/Contents.json

File renamed without changes.

0 commit comments

Comments
 (0)