Skip to content
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.

Sign up for GitHub

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

WIP: Feature/arm64 #63

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

WIP: Feature/arm64 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59bb129
working on arm64
Nov 2, 2024
e91bbaa
adding mongo arch
Nov 2, 2024
d15947b
adding more runtimes
Nov 2, 2024
a851425
removing 4
Nov 2, 2024
5deba70
5 doesn't support osx arm64
Nov 2, 2024
8cb8a28
adding osx to meta package
Nov 2, 2024
057e7d1
wip
Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified build.sh
100644 → 100755
View file
Open in desktop
Empty file.
9 changes: 3 additions & 6 deletions build/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,21 @@ public sealed class DownloadMongoTask : AsyncFrostingTask<BuildContext>
// MongoDB 7.x
new ProjectInfo("EphemeralMongo7.runtime.win-x64", "windows", "x86_64", "base", 7, "win-x64"),
new ProjectInfo("EphemeralMongo7.runtime.osx-x64", "macos", "x86_64", "base", 7, "osx-x64"),
new ProjectInfo("EphemeralMongo7.runtime.osx-arm64", "macos", "arm64", "base", 7, "osx-arm64"),
new ProjectInfo("EphemeralMongo7.runtime.linux-x64", "ubuntu2004", "x86_64", "targeted", 7, "linux-x64"),
new ProjectInfo("EphemeralMongo7.runtime.ubuntu.22.04-x64", "ubuntu2204", "x86_64", "targeted", 7, "ubuntu.22.04-x64"),

// MongoDB 6.x
new ProjectInfo("EphemeralMongo6.runtime.win-x64", "windows", "x86_64", "base", 6, "win-x64"),
new ProjectInfo("EphemeralMongo6.runtime.osx-x64", "macos", "x86_64", "base", 6, "osx-x64"),
new ProjectInfo("EphemeralMongo6.runtime.osx-arm64", "macos", "arm64", "base", 6, "osx-arm64"),
new ProjectInfo("EphemeralMongo6.runtime.linux-x64", "ubuntu1804", "x86_64", "targeted", 6, "linux-x64"),
new ProjectInfo("EphemeralMongo6.runtime.ubuntu.22.04-x64", "ubuntu2204", "x86_64", "targeted", 6, "ubuntu.22.04-x64"),

// MongoDB 5.x
new ProjectInfo("EphemeralMongo5.runtime.win-x64", "windows", "x86_64", "base", 5, "win-x64"),
new ProjectInfo("EphemeralMongo5.runtime.osx-x64", "macos", "x86_64", "base", 5, "osx-x64"),
new ProjectInfo("EphemeralMongo5.runtime.linux-x64", "ubuntu1804", "x86_64", "targeted", 5, "linux-x64"),

// MongoDB 4.x
new ProjectInfo("EphemeralMongo4.runtime.win-x64", "windows", "x86_64", "base", 4, "win-x64"),
new ProjectInfo("EphemeralMongo4.runtime.osx-x64", "macos", "x86_64", "base", 4, "osx-x64"),
new ProjectInfo("EphemeralMongo4.runtime.linux-x64", "ubuntu1804", "x86_64", "targeted", 4, "linux-x64"),
new ProjectInfo("EphemeralMongo5.runtime.linux-x64", "ubuntu1804", "x86_64", "targeted", 5, "linux-x64")
};

public override async Task RunAsync(BuildContext context)
Expand Down
9 changes: 0 additions & 9 deletions src/EphemeralMongo.Runtimes/EphemeralMongo4.runtime.win-x64.csproj
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...es/EphemeralMongo4.runtime.osx-x64.csproj → .../EphemeralMongo6.runtime.osx-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<MongoVersion>4</MongoVersion>
<FullMongoVersion>PLACEHOLDER</FullMongoVersion>
<MongoVersion>6</MongoVersion>
<FullMongoVersion>6.0.19</FullMongoVersion>
<FullMongoVersion Condition=" '$(FullMongoVersion)' == 'PLACEHOLDER' ">$(MongoVersion)</FullMongoVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion .../EphemeralMongo4.runtime.linux-x64.csproj → .../EphemeralMongo7.runtime.osx-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<MongoVersion>4</MongoVersion>
<MongoVersion>7</MongoVersion>
<FullMongoVersion>PLACEHOLDER</FullMongoVersion>
<FullMongoVersion Condition=" '$(FullMongoVersion)' == 'PLACEHOLDER' ">$(MongoVersion)</FullMongoVersion>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/EphemeralMongo.Runtimes/build/copy-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<PropertyGroup>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('Windows'))">win-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('OSX') And $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64')">osx-x64</_EphemeralMongoRid>
<_EphemeralMongoRid Condition="$([MSBuild]::IsOSPlatform('OSX') And $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64')">osx-arm64</_EphemeralMongoRid>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework.TrimEnd(`0123456789`))' == 'net' Or '$(TargetFrameworkVersion)' != '' ">
Expand Down
41 changes: 14 additions & 27 deletions src/EphemeralMongo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo5.runtime.lin
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo5.runtime.osx-x64", "EphemeralMongo.Runtimes\EphemeralMongo5.runtime.osx-x64.csproj", "{2FE78276-0B9B-4B76-9648-73AF4F409160}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo4.runtime.win-x64", "EphemeralMongo.Runtimes\EphemeralMongo4.runtime.win-x64.csproj", "{35D46C11-286E-4EA4-A937-A285E4E2CC89}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo4.runtime.linux-x64", "EphemeralMongo.Runtimes\EphemeralMongo4.runtime.linux-x64.csproj", "{A9B30B5B-5F6D-4404-BE6D-5B398775E2EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo4.runtime.osx-x64", "EphemeralMongo.Runtimes\EphemeralMongo4.runtime.osx-x64.csproj", "{8E6946D1-0F1A-4C9A-BF3B-B37D4D8DAB32}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.osx-x64", "EphemeralMongo.Runtimes\EphemeralMongo6.runtime.osx-x64.csproj", "{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.linux-x64", "EphemeralMongo.Runtimes\EphemeralMongo6.runtime.linux-x64.csproj", "{6D723CAC-6C36-432B-AF82-FED039080D40}"
Expand All @@ -36,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo5", "Ephemera
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6", "EphemeralMongo6\EphemeralMongo6.csproj", "{9BA549AC-C09B-4913-B5ED-981BE389F0BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo4", "EphemeralMongo4\EphemeralMongo4.csproj", "{8C870B89-8E0C-47CE-9041-D04E2244045F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7", "EphemeralMongo7\EphemeralMongo7.csproj", "{D6CB0731-201C-4561-85F8-93DD0109CE43}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.linux-x64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.linux-x64.csproj", "{14EB9AE5-8BED-4C4F-A8FA-B1CAA7CDDB31}"
Expand All @@ -50,6 +42,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.ubu
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.ubuntu.22.04-x64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.ubuntu.22.04-x64.csproj", "{0E319BF3-C59F-48B7-8B6B-20F9179C89E8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo7.runtime.osx-arm64", "EphemeralMongo.Runtimes\EphemeralMongo7.runtime.osx-arm64.csproj", "{DA46DF1E-ADE6-4066-B074-F40E5345CC89}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EphemeralMongo6.runtime.osx-arm64", "EphemeralMongo.Runtimes\EphemeralMongo6.runtime.osx-arm64.csproj", "{0311783D-0642-4DAD-98B2-508272475670}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -76,18 +72,6 @@ Global
{2FE78276-0B9B-4B76-9648-73AF4F409160}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FE78276-0B9B-4B76-9648-73AF4F409160}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{2FE78276-0B9B-4B76-9648-73AF4F409160}.Release|Any CPU.Build.0 = Debug|Any CPU
{35D46C11-286E-4EA4-A937-A285E4E2CC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35D46C11-286E-4EA4-A937-A285E4E2CC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35D46C11-286E-4EA4-A937-A285E4E2CC89}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{35D46C11-286E-4EA4-A937-A285E4E2CC89}.Release|Any CPU.Build.0 = Debug|Any CPU
{A9B30B5B-5F6D-4404-BE6D-5B398775E2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9B30B5B-5F6D-4404-BE6D-5B398775E2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9B30B5B-5F6D-4404-BE6D-5B398775E2EB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{A9B30B5B-5F6D-4404-BE6D-5B398775E2EB}.Release|Any CPU.Build.0 = Debug|Any CPU
{8E6946D1-0F1A-4C9A-BF3B-B37D4D8DAB32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E6946D1-0F1A-4C9A-BF3B-B37D4D8DAB32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E6946D1-0F1A-4C9A-BF3B-B37D4D8DAB32}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{8E6946D1-0F1A-4C9A-BF3B-B37D4D8DAB32}.Release|Any CPU.Build.0 = Debug|Any CPU
{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B}.Release|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -108,10 +92,6 @@ Global
{9BA549AC-C09B-4913-B5ED-981BE389F0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BA549AC-C09B-4913-B5ED-981BE389F0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BA549AC-C09B-4913-B5ED-981BE389F0BF}.Release|Any CPU.Build.0 = Release|Any CPU
{8C870B89-8E0C-47CE-9041-D04E2244045F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C870B89-8E0C-47CE-9041-D04E2244045F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C870B89-8E0C-47CE-9041-D04E2244045F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C870B89-8E0C-47CE-9041-D04E2244045F}.Release|Any CPU.Build.0 = Release|Any CPU
{D6CB0731-201C-4561-85F8-93DD0109CE43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6CB0731-201C-4561-85F8-93DD0109CE43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6CB0731-201C-4561-85F8-93DD0109CE43}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -136,14 +116,19 @@ Global
{0E319BF3-C59F-48B7-8B6B-20F9179C89E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E319BF3-C59F-48B7-8B6B-20F9179C89E8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{0E319BF3-C59F-48B7-8B6B-20F9179C89E8}.Release|Any CPU.Build.0 = Debug|Any CPU
{DA46DF1E-ADE6-4066-B074-F40E5345CC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA46DF1E-ADE6-4066-B074-F40E5345CC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA46DF1E-ADE6-4066-B074-F40E5345CC89}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{DA46DF1E-ADE6-4066-B074-F40E5345CC89}.Release|Any CPU.Build.0 = Debug|Any CPU
{0311783D-0642-4DAD-98B2-508272475670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0311783D-0642-4DAD-98B2-508272475670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0311783D-0642-4DAD-98B2-508272475670}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{0311783D-0642-4DAD-98B2-508272475670}.Release|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1C2D8B41-77A2-46EB-A74B-D8B3BE91250E} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{31ECE2A4-65CA-49F7-BEF8-31E97AA0438C} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{2FE78276-0B9B-4B76-9648-73AF4F409160} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{35D46C11-286E-4EA4-A937-A285E4E2CC89} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{A9B30B5B-5F6D-4404-BE6D-5B398775E2EB} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{8E6946D1-0F1A-4C9A-BF3B-B37D4D8DAB32} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{CC4B9A52-C0D0-4652-B75F-62A5F1524E9B} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{6D723CAC-6C36-432B-AF82-FED039080D40} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{1A20E788-4D1C-4E42-862A-FD3E49F7DA84} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
Expand All @@ -152,5 +137,7 @@ Global
{CDDDD084-72FE-4BBB-9239-4B9D038C8F16} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{72697062-45A5-4E4E-B0F7-E76C8E01A49D} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{0E319BF3-C59F-48B7-8B6B-20F9179C89E8} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{DA46DF1E-ADE6-4066-B074-F40E5345CC89} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
{0311783D-0642-4DAD-98B2-508272475670} = {819E3828-0328-4F38-BDB3-5825B4913AAB}
EndGlobalSection
EndGlobal
26 changes: 0 additions & 26 deletions src/EphemeralMongo4/EphemeralMongo4.csproj
View file
Open in desktop

This file was deleted.

Empty file removed src/EphemeralMongo4/_._
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions src/EphemeralMongo6/EphemeralMongo6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<ProjectReference Include="..\EphemeralMongo.Core\EphemeralMongo.Core.csproj" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.linux-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-arm64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.win-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions src/EphemeralMongo7/EphemeralMongo7.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<ProjectReference Include="..\EphemeralMongo.Core\EphemeralMongo.Core.csproj" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.linux-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.osx-arm64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
<ProjectReference Include="..\EphemeralMongo.Runtimes\EphemeralMongo$(MongoVersion).runtime.win-x64.csproj" IncludeAssets="all" ExcludeAssets="none" PrivateAssets="contentfiles;analyzers" />
</ItemGroup>

Expand Down