-
Notifications
You must be signed in to change notification settings - Fork 4
Add comprehensive macOS support to snapx deployment tool #430
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Copilot
wants to merge
6
commits into
develop
Choose a base branch
from
copilot/fix-429
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9fcf2dc
Initial plan
Copilot f53fc0a
Add macOS platform support to C# codebase
Copilot 0c2f067
Add macOS native library support and unit tests
Copilot 2e66342
Merge develop branch - resolve conflicts for macOS support
Copilot 02543b5
Merge branch 'develop' into copilot/fix-429
peters 8e0bbcf
Fix code review feedback - file-scoped namespaces, restore .NET 10.0,…
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| #if PLATFORM_MACOSX | ||
| using Snap.AnyOS; | ||
peters marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| using Snap.AnyOS.MacOS; | ||
| using Snap.Core; | ||
| using Snap.Shared.Tests; | ||
| using Xunit; | ||
|
|
||
| namespace Snap.Tests.AnyOS.MacOS; | ||
|
|
||
| public class SnapOsMacOSTests : IClassFixture<BaseFixture> | ||
| { | ||
| readonly BaseFixture _baseFixture; | ||
| readonly ISnapFilesystem _snapFilesystem; | ||
| readonly ISnapOs _snapOs; | ||
| readonly SnapOsMacOS _snapOsMacOS; | ||
|
|
||
| public SnapOsMacOSTests(BaseFixture baseFixture) | ||
| { | ||
| _baseFixture = baseFixture; | ||
| _snapFilesystem = new SnapFilesystem(); | ||
| _snapOsMacOS = new SnapOsMacOS(_snapFilesystem, new SnapOsProcessManager(), new SnapOsSpecialFoldersMacOS()); | ||
| _snapOs = new SnapOs(_snapOsMacOS); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestOsPlatform() | ||
| { | ||
| Assert.Equal(System.Runtime.InteropServices.OSPlatform.OSX, _snapOs.OsPlatform); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestDistroType() | ||
| { | ||
| Assert.Equal(SnapOsDistroType.MacOS, _snapOs.DistroType); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestSpecialFolders() | ||
| { | ||
| var specialFolders = _snapOs.SpecialFolders; | ||
|
|
||
| Assert.NotNull(specialFolders.ApplicationData); | ||
| Assert.NotNull(specialFolders.LocalApplicationData); | ||
| Assert.NotNull(specialFolders.DesktopDirectory); | ||
| Assert.NotNull(specialFolders.StartupDirectory); | ||
| Assert.NotNull(specialFolders.StartMenu); | ||
| Assert.NotNull(specialFolders.InstallerCacheDirectory); | ||
| Assert.NotNull(specialFolders.NugetCacheDirectory); | ||
|
|
||
| // macOS-specific path checks | ||
| Assert.Contains("Library/LaunchAgents", specialFolders.StartupDirectory); | ||
| Assert.Equal("/Applications", specialFolders.StartMenu); | ||
| Assert.Contains("snapx", specialFolders.InstallerCacheDirectory); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestGetProcesses() | ||
| { | ||
| var processes = _snapOs.GetProcesses(); | ||
| Assert.NotEmpty(processes); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestUsername() | ||
| { | ||
| Assert.NotNull(_snapOsMacOS.Username); | ||
| Assert.NotEmpty(_snapOsMacOS.Username); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestExitSignalHandler() | ||
| { | ||
| var exitSignalHandler = _snapOsMacOS.InstallExitSignalHandler(); | ||
| Assert.NotNull(exitSignalHandler); | ||
| } | ||
| } | ||
| #endif | ||
47 changes: 47 additions & 0 deletions
47
src/Snap.Tests/AnyOS/MacOS/SnapOsSpecialFoldersMacOSTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| #if PLATFORM_MACOSX | ||
peters marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| using Snap.AnyOS; | ||
| using Snap.Shared.Tests; | ||
| using Xunit; | ||
|
|
||
| namespace Snap.Tests.AnyOS.MacOS; | ||
|
|
||
| public class SnapOsSpecialFoldersMacOSTests : IClassFixture<BaseFixture> | ||
| { | ||
| readonly BaseFixture _baseFixture; | ||
|
|
||
| public SnapOsSpecialFoldersMacOSTests(BaseFixture baseFixture) | ||
| { | ||
| _baseFixture = baseFixture; | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestMacOSSpecialFolders() | ||
| { | ||
| var specialFolders = new SnapOsSpecialFoldersMacOS(); | ||
|
|
||
| Assert.NotNull(specialFolders.ApplicationData); | ||
| Assert.NotNull(specialFolders.LocalApplicationData); | ||
| Assert.NotNull(specialFolders.DesktopDirectory); | ||
| Assert.NotNull(specialFolders.StartupDirectory); | ||
| Assert.NotNull(specialFolders.StartMenu); | ||
| Assert.NotNull(specialFolders.InstallerCacheDirectory); | ||
| Assert.NotNull(specialFolders.NugetCacheDirectory); | ||
|
|
||
| // Test macOS-specific paths | ||
| Assert.Contains("Library/LaunchAgents", specialFolders.StartupDirectory); | ||
| Assert.Equal("/Applications", specialFolders.StartMenu); | ||
| Assert.Contains("/snapx", specialFolders.InstallerCacheDirectory); | ||
| Assert.Contains("/temp/nuget", specialFolders.NugetCacheDirectory); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestAnyOsReturnsMacOSOnMacOS() | ||
| { | ||
| if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX)) | ||
| { | ||
| var anyOs = SnapOsSpecialFolders.AnyOs; | ||
| Assert.IsType<SnapOsSpecialFoldersMacOS>(anyOs); | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.