🏃

hlaueriksson · Jun 30, 2024 · a097087 · a097087
1 parent 3d307df
commit a097087
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 23 deletions.
diff --git a/src/GEmojiSharp.PowerToysRun/GEmojiSharp.PowerToysRun.csproj b/src/GEmojiSharp.PowerToysRun/GEmojiSharp.PowerToysRun.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <Platforms>x64</Platforms>
-    <PlatformTarget>x64</PlatformTarget>
+    <Platforms>x64;ARM64</Platforms>
+    <PlatformTarget>$(Platform)</PlatformTarget>
     <IsPackable>false</IsPackable>
     <Version>3.1.3</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -16,26 +16,27 @@
     <ProjectReference Include="..\GEmojiSharp\GEmojiSharp.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="PowerToys.Common.UI">
-      <HintPath>libs\PowerToys.Common.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="PowerToys.ManagedCommon">
-      <HintPath>libs\PowerToys.ManagedCommon.dll</HintPath>
-    </Reference>
-    <Reference Include="Wox.Plugin">
-      <HintPath>libs\Wox.Plugin.dll</HintPath>
-    </Reference>
+  <ItemGroup Condition="'$(Platform)' == 'x64'">
+    <Reference Include="libs\x64\PowerToys.Common.UI.dll" />
+    <Reference Include="libs\x64\PowerToys.ManagedCommon.dll" />
+    <Reference Include="libs\x64\PowerToys.Settings.UI.Lib.dll" />
+    <Reference Include="libs\x64\Wox.Infrastructure.dll" />
+    <Reference Include="libs\x64\Wox.Plugin.dll" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Platform)' == 'ARM64'">
+    <Reference Include="libs\ARM64\PowerToys.Common.UI.dll" />
+    <Reference Include="libs\ARM64\PowerToys.ManagedCommon.dll" />
+    <Reference Include="libs\ARM64\PowerToys.Settings.UI.Lib.dll" />
+    <Reference Include="libs\ARM64\Wox.Infrastructure.dll" />
+    <Reference Include="libs\ARM64\Wox.Plugin.dll" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Images\gemojisharp.dark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\gemojisharp.light.png">
+    <None Include="plugin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="plugin.json">
+    <None Include="Images/*.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/src/GEmojiSharp.PowerToysRun/libs/ARM64/PowerToys.Common.UI.dll b/src/GEmojiSharp.PowerToysRun/libs/ARM64/PowerToys.Common.UI.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/ARM64/PowerToys.ManagedCommon.dll b/src/GEmojiSharp.PowerToysRun/libs/ARM64/PowerToys.ManagedCommon.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/ARM64/PowerToys.Settings.UI.Lib.dll b/src/GEmojiSharp.PowerToysRun/libs/ARM64/PowerToys.Settings.UI.Lib.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/ARM64/Wox.Infrastructure.dll b/src/GEmojiSharp.PowerToysRun/libs/ARM64/Wox.Infrastructure.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/ARM64/Wox.Plugin.dll b/src/GEmojiSharp.PowerToysRun/libs/ARM64/Wox.Plugin.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/PowerToys.ManagedCommon.dll b/src/GEmojiSharp.PowerToysRun/libs/PowerToys.ManagedCommon.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/Wox.Plugin.dll b/src/GEmojiSharp.PowerToysRun/libs/Wox.Plugin.dll
diff --git a/...PowerToysRun/libs/PowerToys.Common.UI.dll → ...rToysRun/libs/x64/PowerToys.Common.UI.dll b/...PowerToysRun/libs/PowerToys.Common.UI.dll → ...rToysRun/libs/x64/PowerToys.Common.UI.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/x64/PowerToys.ManagedCommon.dll b/src/GEmojiSharp.PowerToysRun/libs/x64/PowerToys.ManagedCommon.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/x64/PowerToys.Settings.UI.Lib.dll b/src/GEmojiSharp.PowerToysRun/libs/x64/PowerToys.Settings.UI.Lib.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/x64/Wox.Infrastructure.dll b/src/GEmojiSharp.PowerToysRun/libs/x64/Wox.Infrastructure.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/x64/Wox.Plugin.dll b/src/GEmojiSharp.PowerToysRun/libs/x64/Wox.Plugin.dll
diff --git a/tests/GEmojiSharp.PowerToysRun.Tests/GEmojiSharp.PowerToysRun.Tests.csproj b/tests/GEmojiSharp.PowerToysRun.Tests/GEmojiSharp.PowerToysRun.Tests.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
-    <Platforms>x64</Platforms>
-    <PlatformTarget>x64</PlatformTarget>
+    <Platforms>x64;ARM64</Platforms>
+    <PlatformTarget>$(Platform)</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,10 +21,14 @@
     <ProjectReference Include="..\..\src\GEmojiSharp.PowerToysRun\GEmojiSharp.PowerToysRun.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Wox.Plugin">
-      <HintPath>..\..\src\GEmojiSharp.PowerToysRun\libs\Wox.Plugin.dll</HintPath>
-    </Reference>
+  <ItemGroup Condition="'$(Platform)' == 'x64'">
+    <Reference Include="..\..\src\GEmojiSharp.PowerToysRun\libs\x64\Wox.Plugin.dll" />
+    <Reference Include="..\..\src\GEmojiSharp.PowerToysRun\libs\x64\PowerToys.Settings.UI.Lib.dll" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Platform)' == 'ARM64'">
+    <Reference Include="..\..\src\GEmojiSharp.PowerToysRun\libs\ARM64\Wox.Plugin.dll" />
+    <Reference Include="..\..\src\GEmojiSharp.PowerToysRun\libs\ARM64\PowerToys.Settings.UI.Lib.dll" />
   </ItemGroup>
 
 </Project>