diff --git a/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj b/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj index df46a223e8..5ea3abae9c 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj @@ -1,6 +1,7 @@  + 10.0.22000.0 net6.0-windows$(TargetWindowsVersion) net48 @@ -12,6 +13,7 @@ $(SolutionDir)$(Platform)\$(Configuration)\ $(BuildOutputDirectory)$(MSBuildProjectName) $(BuildOutputDirectory)PowerShell\Microsoft.WinGet.Client + $(PowerShellModuleOutputDirectory)\lib x64;x86;ARM64 $(CoreFramework);$(DesktopFramework) $(OutputPath)\Microsoft.WinGet.Client.xml @@ -102,8 +104,8 @@ - - + + @@ -121,17 +123,17 @@ - - - + + + - - + + diff --git a/src/PowerShell/Microsoft.WinGet.Client/Module/Microsoft.WinGet.Client.psd1 b/src/PowerShell/Microsoft.WinGet.Client/Module/Microsoft.WinGet.Client.psd1 index badf730a06..8bd4dc63e8 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/Module/Microsoft.WinGet.Client.psd1 +++ b/src/PowerShell/Microsoft.WinGet.Client/Module/Microsoft.WinGet.Client.psd1 @@ -12,7 +12,7 @@ RootModule = 'Microsoft.WinGet.Client.psm1' # Version number of this module. -ModuleVersion = '0.0.1' +ModuleVersion = '0.1.0' # Supported PSEditions CompatiblePSEditions = 'Core' @@ -66,11 +66,27 @@ PowerShellVersion = '5.1.0' FormatsToProcess = 'Format.ps1xml' # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess -NestedModules = if ($env:PROCESSOR_ARCHITECTURE -like 'x86') { - "x86\$PSEdition\Microsoft.WinGet.Client.dll" +NestedModules = if ($env:PROCESSOR_ARCHITECTURE -like 'x86') +{ + if ($PSEdition -eq 'Core') + { + "lib\net6.0-windows10.0.22000.0\x86\Microsoft.WinGet.Client.dll" + } + else + { + "lib\net48\x86\Microsoft.WinGet.Client.dll" + } } -else { - "x64\$PSEdition\Microsoft.WinGet.Client.dll" +else +{ + if ($PSEdition -eq 'Core') + { + "lib\net6.0-windows10.0.22000.0\x64\Microsoft.WinGet.Client.dll" + } + else + { + "lib\net48\x64\Microsoft.WinGet.Client.dll" + } } # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.