diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41262b28d..f73abbaa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -532,8 +532,11 @@ jobs: $DAgentPedmDesktopExecutable = Join-Path $TargetOutputPath "DevolutionsPedmDesktop.exe" echo "dagent-pedm-desktop-executable=$DAgentPedmDesktopExecutable" >> $Env:GITHUB_OUTPUT - $DAgentPedmContextMenuMsix = Join-Path $TargetOutputPath "devolutions-pedm-contextmenu.msix" - echo "dagent-pedm-context-menu-msix=$DAgentPedmContextMenuMsix" >> $Env:GITHUB_OUTPUT + $DAgentPedmShellExtDll = Join-Path $TargetOutputPath "DevolutionsPedmShellExt.dll" + echo "dagent-pedm-shell-ext-dll=$DAgentPedmShellExtDll" >> $Env:GITHUB_OUTPUT + + $DAgentPedmShellExtMsix = Join-Path $TargetOutputPath "DevolutionsPedmShellExt.msix" + echo "dagent-pedm-shell-ext-msix=$DAgentPedmShellExtMsix" >> $Env:GITHUB_OUTPUT $DAgentPedmHook = Join-Path $TargetOutputPath "devolutions_pedm_hook.dll" echo "dagent-pedm-hook=$DAgentPedmHook" >> $Env:GITHUB_OUTPUT @@ -598,7 +601,8 @@ jobs: if ($Env:RUNNER_OS -eq "Windows") { $Env:DAGENT_PEDM_DESKTOP_EXECUTABLE = "${{ steps.load-variables.outputs.dagent-pedm-desktop-executable }}" $Env:DAGENT_PEDM_HOOK = "${{ steps.load-variables.outputs.dagent-pedm-hook }}" - $Env:DAGENT_PEDM_CONTEXT_MENU_MSIX = "${{ steps.load-variables.outputs.dagent-pedm-context-menu-msix }}" + $Env:DAGENT_PEDM_SHELL_EXT_DLL = "${{ steps.load-variables.outputs.dagent-pedm-shell-ext-dll }}" + $Env:DAGENT_PEDM_SHELL_EXT_MSIX = "${{ steps.load-variables.outputs.dagent-pedm-shell-ext-msix }}" } ./ci/tlk.ps1 build -Product agent -Platform ${{ matrix.os }} -Architecture ${{ matrix.arch }} -CargoProfile ${{ needs.preflight.outputs.rust-profile }} @@ -614,7 +618,8 @@ jobs: $Env:DAGENT_PACKAGE = "${{ steps.load-variables.outputs.dagent-package }}" $Env:DAGENT_PEDM_DESKTOP_EXECUTABLE = "${{ steps.load-variables.outputs.dagent-pedm-desktop-executable }}" $Env:DAGENT_PEDM_HOOK = "${{ steps.load-variables.outputs.dagent-pedm-hook }}" - $Env:DAGENT_PEDM_CONTEXT_MENU_MSIX = "${{ steps.load-variables.outputs.dagent-pedm-context-menu-msix }}" + $Env:DAGENT_PEDM_SHELL_EXT_DLL = "${{ steps.load-variables.outputs.dagent-pedm-shell-ext-dll }}" + $Env:DAGENT_PEDM_SHELL_EXT_MSIX = "${{ steps.load-variables.outputs.dagent-pedm-shell-ext-msix }}" } ./ci/tlk.ps1 package -Product agent -Platform ${{ matrix.os }} -Architecture ${{ matrix.arch }} -CargoProfile ${{ needs.preflight.outputs.rust-profile }} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 44fabd8d3..6133eeab7 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -227,13 +227,14 @@ jobs: run: | $IncludePattern = switch ('${{ matrix.project }}') { 'devolutions-gateway' { 'DevolutionsGateway_*.exe' } - 'devolutions-agent' { 'DevolutionsAgent_*.exe', 'devolutions-pedm-contextmenu.msix', 'DevolutionsPedmDesktop.exe', 'devolutions_pedm_hook.dll' } + 'devolutions-agent' { 'DevolutionsAgent_*.exe', 'DevolutionsPedmShellExt.dll', + 'DevolutionsPedmShellExt.msix', 'DevolutionsPedmDesktop.exe', 'devolutions_pedm_hook.dll' } 'jetsocat' { 'jetsocat_*' } } $ExcludePattern = "*.pdb" Get-ChildItem -Path ${{ runner.temp }} -Recurse -Include $IncludePattern -Exclude $ExcludePattern | % { if ('${{ matrix.os }}' -Eq 'windows') { - if ($_.Name -Eq 'devolutions-pedm-contextmenu.msix') { + if ($_.Name -Eq 'DevolutionsPedmShellExt.msix') { $PackagePublisher = '${{ secrets.CODE_SIGNING_APPX_PUBLISHER }}' $UnpackedMsix = Join-Path ${{ runner.temp }} "unpacked-context-menu-msix" $AppxManifest = Join-Path $UnpackedMsix "AppxManifest.xml" @@ -322,7 +323,8 @@ jobs: $PackageRoot = Join-Path ${{ runner.temp }} ${{ matrix.project}} $Env:DAGENT_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include '*DevolutionsAgent*.exe' | Select -First 1 $Env:DAGENT_PEDM_DESKTOP_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmDesktop.exe' | Select -First 1 - $Env:DAGENT_PEDM_CONTEXT_MENU_MSIX = Get-ChildItem -Path $PackageRoot -Recurse -Include 'devolutions-pedm-contextmenu.msix' | Select -First 1 + $Env:DAGENT_PEDM_SHELL_EXT_DLL = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmShellExt.dll' | Select -First 1 + $Env:DAGENT_PEDM_SHELL_EXT_MSIX = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmShellExt.msix' | Select -First 1 $Env:DAGENT_PEDM_HOOK = Get-ChildItem -Path $PackageRoot -Recurse -Include 'devolutions_pedm_hook.dll' | Select -First 1 ./ci/tlk.ps1 package -Product agent -PackageOption generate diff --git a/Cargo.lock b/Cargo.lock index 7d2da40c4..76102f0cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1179,27 +1179,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "devolutions-pedm-contextmenu" -version = "0.0.0" -dependencies = [ - "devolutions-pedm-contextmenu-shell", - "devolutions-pedm-shared", - "fs_extra", -] - -[[package]] -name = "devolutions-pedm-contextmenu-shell" -version = "0.0.0" -dependencies = [ - "devolutions-pedm-shared", - "embed-resource", - "parking_lot", - "tokio 1.38.1", - "win-api-wrappers", - "windows-core 0.58.0", -] - [[package]] name = "devolutions-pedm-hook" version = "0.0.0" @@ -1231,6 +1210,19 @@ dependencies = [ "windows-registry", ] +[[package]] +name = "devolutions-pedm-shell-ext" +version = "0.0.0" +dependencies = [ + "devolutions-pedm-shared", + "embed-resource", + "fs_extra", + "parking_lot", + "tokio 1.38.1", + "win-api-wrappers", + "windows-core 0.58.0", +] + [[package]] name = "digest" version = "0.10.7" diff --git a/ci/tlk.ps1 b/ci/tlk.ps1 index aa8be957f..9f845ca64 100644 --- a/ci/tlk.ps1 +++ b/ci/tlk.ps1 @@ -344,7 +344,7 @@ class TlkRecipe if ($this.Target.IsWindows()) { $agentPackages += [TlkPackage]::new("devolutions-pedm-hook", "crates/devolutions-pedm-hook", $true) - $agentPackages += [TlkPackage]::new("devolutions-pedm-contextmenu", "crates/devolutions-pedm-contextmenu", $true) + $agentPackages += [TlkPackage]::new("devolutions-pedm-shell-ext", "crates/devolutions-pedm-shell-ext", $true) } $agentPackages @@ -429,6 +429,8 @@ class TlkRecipe $Env:DAGENT_EXECUTABLE } elseif ($CargoPackage.Name -Eq "devolutions-pedm-hook" -And (Test-Path Env:DAGENT_PEDM_HOOK)) { $Env:DAGENT_PEDM_HOOK + } elseif ($CargoPackage.Name -Eq "devolutions-pedm-shell-ext" -And (Test-Path Env:DAGENT_PEDM_SHELL_EXT_DLL)) { + $Env:DAGENT_PEDM_SHELL_EXT_DLL } else { $null } @@ -461,7 +463,7 @@ class TlkRecipe Copy-Item -Path $SrcBinaryPath -Destination $DestinationExecutable } - if ($CargoPackage.Name -Eq 'devolutions-pedm-contextmenu') { + if ($CargoPackage.Name -Eq 'devolutions-pedm-shell-ext') { if ($Null -Eq (Get-Command "MakeAppx.exe" -ErrorAction SilentlyContinue)) { throw 'MakeAppx was not found in the PATH' } @@ -471,27 +473,15 @@ class TlkRecipe Push-Location Set-Location $CargoOutputPath - $MakeAppxOutput = & 'MakeAppx.exe' 'pack' '/f' "${CargoPackagePath}/mapping.txt" '/p' "./devolutions-pedm-contextmenu.msix" '/nv' '/o' + $MakeAppxOutput = & 'MakeAppx.exe' 'pack' '/f' "${CargoPackagePath}/mapping.txt" '/p' "./DevolutionsPedmShellExt.msix" '/nv' '/o' if (!$?) { throw "MakeAppx package creation failed: ${MakeAppxOutput}" } - if ($Env:DAGENT_PEDM_PFX -And (Test-Path $Env:DAGENT_PEDM_PFX) -And $Env:DAGENT_PEDM_PFX_PASSWORD -And (Get-Command "SignTool.exe" -ErrorAction SilentlyContinue)) { - $SignToolOutput = & 'SignTool.exe' 'sign' '/fd' 'SHA256' '/a' '/f' "${Env:DAGENT_PEDM_PFX}" '/p' "${Env:DAGENT_PEDM_PFX_PASSWORD}" (Get-Item "./devolutions-pedm-contextmenu.msix").FullName - if (!$?) { - throw "SignTool failed: ${SignToolOutput}" - } - } - Pop-Location - if (Test-Path Env:DAGENT_PEDM_CONTEXT_MENU_MSIX) { - Copy-Item -Path $(Join-Path $CargoOutputPath "devolutions-pedm-contextmenu.msix") -Destination $Env:DAGENT_PEDM_CONTEXT_MENU_MSIX - - $DestinationSymbolsFolder = Split-Path $Env:DAGENT_PEDM_CONTEXT_MENU_MSIX -Parent - Copy-Item "${CargoOutputPath}/devolutions_pedm_contextmenu.pdb" -Destination $DestinationSymbolsFolder - Copy-Item "${CargoOutputPath}/deps/devolutions_pedm_contextmenu_shell.pdb" -Destination $DestinationSymbolsFolder - + if (Test-Path Env:DAGENT_PEDM_SHELL_EXT_MSIX) { + Copy-Item -Path $(Join-Path $CargoOutputPath "DevolutionsPedmShellExt.msix") -Destination $Env:DAGENT_PEDM_SHELL_EXT_MSIX } } @@ -506,7 +496,6 @@ class TlkRecipe $builtDesktopPdb = Get-ChildItem -Recurse -Include 'DevolutionsPedmDesktop.pdb' | Select-Object -First 1 Copy-Item -Path $builtDesktopExe -Destination $Env:DAGENT_PEDM_DESKTOP_EXECUTABLE - Copy-Item -Path $builtDesktopPdb -Destination $(Get-DestinationSymbolFile $Env:DAGENT_PEDM_DESKTOP_EXECUTABLE $this.Target) } diff --git a/crates/devolutions-pedm-contextmenu/Cargo.toml b/crates/devolutions-pedm-contextmenu/Cargo.toml deleted file mode 100644 index bf885f4cf..000000000 --- a/crates/devolutions-pedm-contextmenu/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "devolutions-pedm-contextmenu" -version = "0.0.0" -edition = "2021" -license = "MIT/Apache-2.0" -authors = ["Devolutions Inc. "] -description = "Devolutions PEDM Windows shell extension package" -publish = false - -[dependencies] -devolutions-pedm-contextmenu-shell = { path = "./devolutions-pedm-contextmenu-shell" } - -[build-dependencies] -devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["build"] } -fs_extra = "1.3.0" \ No newline at end of file diff --git a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/build.rs b/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/build.rs deleted file mode 100644 index 87c6e6262..000000000 --- a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/build.rs +++ /dev/null @@ -1,85 +0,0 @@ -fn main() { - #[cfg(target_os = "windows")] - win::embed_version_rc(); -} - -#[cfg(target_os = "windows")] -mod win { - use std::{env, fs}; - - pub(super) fn embed_version_rc() { - let out_dir = env::var("OUT_DIR").unwrap(); - let version_rc_file = format!("{}/version.rc", out_dir); - let version_rc_data = generate_version_rc(); - fs::write(&version_rc_file, version_rc_data).unwrap(); - - embed_resource::compile(&version_rc_file, embed_resource::NONE); - embed_resource::compile("resources.rc", embed_resource::NONE); - } - - fn generate_version_rc() -> String { - let output_name = "devolutions-pedm-contextmenu"; - let filename = format!("{}.exe", output_name); - let company_name = "Devolutions Inc."; - let legal_copyright = format!("Copyright 2020-2024 {}", company_name); - - let version_number = env::var("CARGO_PKG_VERSION").unwrap() + ".0"; - let version_commas = version_number.replace('.', ","); - let file_description = output_name; - let file_version = version_number.clone(); - let internal_name = filename.clone(); - let original_filename = filename; - let product_name = output_name; - let product_version = version_number; - let vs_file_version = version_commas.clone(); - let vs_product_version = version_commas; - - let version_rc = format!( - r#"#include -VS_VERSION_INFO VERSIONINFO - FILEVERSION {vs_file_version} - PRODUCTVERSION {vs_product_version} - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "{company_name}" - VALUE "FileDescription", "{file_description}" - VALUE "FileVersion", "{file_version}" - VALUE "InternalName", "{internal_name}" - VALUE "LegalCopyright", "{legal_copyright}" - VALUE "OriginalFilename", "{original_filename}" - VALUE "ProductName", "{product_name}" - VALUE "ProductVersion", "{product_version}" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END"#, - vs_file_version = vs_file_version, - vs_product_version = vs_product_version, - company_name = company_name, - file_description = file_description, - file_version = file_version, - internal_name = internal_name, - legal_copyright = legal_copyright, - original_filename = original_filename, - product_name = product_name, - product_version = product_version - ); - - version_rc - } -} diff --git a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/resources.rc b/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/resources.rc deleted file mode 100644 index 458ac8da1..000000000 --- a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/resources.rc +++ /dev/null @@ -1 +0,0 @@ -101 ICON "../../../package/AgentWindowsManaged/Resources/DevolutionsAgent.ico" \ No newline at end of file diff --git a/crates/devolutions-pedm-contextmenu/src/main.rs b/crates/devolutions-pedm-contextmenu/src/main.rs deleted file mode 100644 index 28ed6fc1a..000000000 --- a/crates/devolutions-pedm-contextmenu/src/main.rs +++ /dev/null @@ -1,2 +0,0 @@ -// Empty because an executable is needed to bundle the Appx, however we only want a library for the context menu. -fn main() {} diff --git a/crates/devolutions-pedm-contextmenu/AppxManifest.xml b/crates/devolutions-pedm-shell-ext/AppxManifest.xml similarity index 89% rename from crates/devolutions-pedm-contextmenu/AppxManifest.xml rename to crates/devolutions-pedm-shell-ext/AppxManifest.xml index d0de785f2..d285d421a 100644 --- a/crates/devolutions-pedm-contextmenu/AppxManifest.xml +++ b/crates/devolutions-pedm-shell-ext/AppxManifest.xml @@ -1,79 +1,79 @@ - - - - - Devolutions PEDM Context Menu - Devolutions - Assets\Logo.png - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Devolutions PEDM Context Menu + Devolutions + Assets\Logo.png + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/crates/devolutions-pedm-contextmenu/Assets/LockScreenLogo.scale-200.png b/crates/devolutions-pedm-shell-ext/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/LockScreenLogo.scale-200.png rename to crates/devolutions-pedm-shell-ext/Assets/LockScreenLogo.scale-200.png diff --git a/crates/devolutions-pedm-contextmenu/Assets/SplashScreen.scale-200.png b/crates/devolutions-pedm-shell-ext/Assets/SplashScreen.scale-200.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/SplashScreen.scale-200.png rename to crates/devolutions-pedm-shell-ext/Assets/SplashScreen.scale-200.png diff --git a/crates/devolutions-pedm-contextmenu/Assets/Square150x150Logo.scale-200.png b/crates/devolutions-pedm-shell-ext/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/Square150x150Logo.scale-200.png rename to crates/devolutions-pedm-shell-ext/Assets/Square150x150Logo.scale-200.png diff --git a/crates/devolutions-pedm-contextmenu/Assets/Square44x44Logo.scale-200.png b/crates/devolutions-pedm-shell-ext/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/Square44x44Logo.scale-200.png rename to crates/devolutions-pedm-shell-ext/Assets/Square44x44Logo.scale-200.png diff --git a/crates/devolutions-pedm-contextmenu/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/crates/devolutions-pedm-shell-ext/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to crates/devolutions-pedm-shell-ext/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/crates/devolutions-pedm-contextmenu/Assets/StoreLogo.png b/crates/devolutions-pedm-shell-ext/Assets/StoreLogo.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/StoreLogo.png rename to crates/devolutions-pedm-shell-ext/Assets/StoreLogo.png diff --git a/crates/devolutions-pedm-contextmenu/Assets/Wide310x150Logo.scale-200.png b/crates/devolutions-pedm-shell-ext/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from crates/devolutions-pedm-contextmenu/Assets/Wide310x150Logo.scale-200.png rename to crates/devolutions-pedm-shell-ext/Assets/Wide310x150Logo.scale-200.png diff --git a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/Cargo.toml b/crates/devolutions-pedm-shell-ext/Cargo.toml similarity index 61% rename from crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/Cargo.toml rename to crates/devolutions-pedm-shell-ext/Cargo.toml index aa7e17ca9..186b5498d 100644 --- a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/Cargo.toml +++ b/crates/devolutions-pedm-shell-ext/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "devolutions-pedm-contextmenu-shell" +name = "devolutions-pedm-shell-ext" version = "0.0.0" edition = "2021" license = "MIT/Apache-2.0" @@ -13,9 +13,13 @@ crate-type = ["cdylib"] [dependencies] tokio = { version = "1.38.0", features = ["sync"] } windows-core = "0.58.0" # necessary because of macro resolving `windows::core`. Must match `win-api-wrappers` version. -devolutions-pedm-shared = { path = "../../devolutions-pedm-shared", features = ["pedm_client", "desktop"] } -win-api-wrappers = { path = "../../win-api-wrappers" } +devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["pedm_client", "desktop"] } +win-api-wrappers = { path = "../win-api-wrappers" } parking_lot = "0.12.3" +[build-dependencies] +devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["build"] } +fs_extra = "1.3.0" + [target.'cfg(windows)'.build-dependencies] embed-resource = "2.4" diff --git a/crates/devolutions-pedm-contextmenu/build.rs b/crates/devolutions-pedm-shell-ext/build.rs similarity index 100% rename from crates/devolutions-pedm-contextmenu/build.rs rename to crates/devolutions-pedm-shell-ext/build.rs diff --git a/crates/devolutions-pedm-contextmenu/mapping.txt b/crates/devolutions-pedm-shell-ext/mapping.txt similarity index 77% rename from crates/devolutions-pedm-contextmenu/mapping.txt rename to crates/devolutions-pedm-shell-ext/mapping.txt index 3bf3aaff4..68c61b8dc 100644 --- a/crates/devolutions-pedm-contextmenu/mapping.txt +++ b/crates/devolutions-pedm-shell-ext/mapping.txt @@ -1,13 +1,10 @@ -[Files] -"AppxManifest.xml" "AppxManifest.xml" - -"deps\devolutions_pedm_contextmenu_shell.dll" "devolutions_pedm_contextmenu_shell.dll" -"devolutions-pedm-contextmenu.exe" "devolutions-pedm-contextmenu.exe" - -"Assets\StoreLogo.png" "Assets\StoreLogo.png" -"Assets\Wide310x150Logo.scale-200.png" "Assets\Wide310x150Logo.scale-200.png" -"Assets\LockScreenLogo.scale-200.png" "Assets\LockScreenLogo.scale-200.png" -"Assets\SplashScreen.scale-200.png" "Assets\SplashScreen.scale-200.png" -"Assets\Square44x44Logo.scale-200.png" "Assets\Square44x44Logo.scale-200.png" -"Assets\Square44x44Logo.targetsize-24_altform-unplated.png" "Assets\Square44x44Logo.targetsize-24_altform-unplated.png" +[Files] +"AppxManifest.xml" "AppxManifest.xml" + +"Assets\StoreLogo.png" "Assets\StoreLogo.png" +"Assets\Wide310x150Logo.scale-200.png" "Assets\Wide310x150Logo.scale-200.png" +"Assets\LockScreenLogo.scale-200.png" "Assets\LockScreenLogo.scale-200.png" +"Assets\SplashScreen.scale-200.png" "Assets\SplashScreen.scale-200.png" +"Assets\Square44x44Logo.scale-200.png" "Assets\Square44x44Logo.scale-200.png" +"Assets\Square44x44Logo.targetsize-24_altform-unplated.png" "Assets\Square44x44Logo.targetsize-24_altform-unplated.png" "Assets\Square150x150Logo.scale-200.png" "Assets\Square150x150Logo.scale-200.png" \ No newline at end of file diff --git a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/src/lib.rs b/crates/devolutions-pedm-shell-ext/src/lib.rs similarity index 100% rename from crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/src/lib.rs rename to crates/devolutions-pedm-shell-ext/src/lib.rs diff --git a/crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/src/lib_win.rs b/crates/devolutions-pedm-shell-ext/src/lib_win.rs similarity index 100% rename from crates/devolutions-pedm-contextmenu/devolutions-pedm-contextmenu-shell/src/lib_win.rs rename to crates/devolutions-pedm-shell-ext/src/lib_win.rs diff --git a/package/AgentWindowsManaged/Actions/AgentActions.cs b/package/AgentWindowsManaged/Actions/AgentActions.cs index b7287cd94..a3ea736a8 100644 --- a/package/AgentWindowsManaged/Actions/AgentActions.cs +++ b/package/AgentWindowsManaged/Actions/AgentActions.cs @@ -229,7 +229,7 @@ internal static class AgentActions // system install. private static readonly PathFileAction installPedmContextMenu = new( @"$(env.WinDir)\System32\WindowsPowerShell\v1.0\powershell.exe", - "-Command \"{ 0..2 | % { Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath '[#DevolutionsPedmContextMenuMsix]' -ErrorAction Ignore } }\"", + "-Command \"{ 0..2 | % { Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath '[#DevolutionsPedmShellExtMsix]' -ErrorAction Ignore } }\"", "INSTALLDIR" ) { diff --git a/package/AgentWindowsManaged/Program.cs b/package/AgentWindowsManaged/Program.cs index 6dc71f8df..48f2f1680 100644 --- a/package/AgentWindowsManaged/Program.cs +++ b/package/AgentWindowsManaged/Program.cs @@ -115,7 +115,9 @@ private static string ResolveArtifact(string varName, string error) private static string DevolutionsPedmHook => ResolveArtifact("DAGENT_PEDM_HOOK", "The PEDM hook was not found"); - private static string DevolutionsPedmContextMenuMsix => ResolveArtifact("DAGENT_PEDM_CONTEXT_MENU_MSIX", "The PEDM context menu MSIX was not found"); + private static string DevolutionsPedmShellExtDll => ResolveArtifact("DAGENT_PEDM_SHELL_EXT_DLL", "The PEDM shell extension DLL was not found"); + + private static string DevolutionsPedmShellExtMsix => ResolveArtifact("DAGENT_PEDM_SHELL_EXT_MSIX", "The PEDM shell extension MSIX was not found"); private static Version DevolutionsAgentVersion { @@ -278,7 +280,8 @@ static void Main() }, }, new (Includes.PEDM_FEATURE, DevolutionsPedmHook), - new (new Id("DevolutionsPedmContextMenuMsix"), Includes.PEDM_FEATURE, DevolutionsPedmContextMenuMsix) + new (Includes.PEDM_FEATURE, DevolutionsPedmShellExtDll), + new (new Id("DevolutionsPedmShellExtMsix"), Includes.PEDM_FEATURE, DevolutionsPedmShellExtMsix) }, Dirs = new[] {