From 5ee3df22311e54e9ad2405c2c2ed9640be3ce224 Mon Sep 17 00:00:00 2001 From: Ryan Fu Date: Fri, 14 Oct 2022 12:07:37 -0700 Subject: [PATCH 1/5] fix release bug and output directories --- .../Common/BaseClientCommand.cs | 4 +- .../Microsoft.WinGet.Client.csproj | 32 +- .../Microsoft.WinGet.Client/README.md | 28 ++ .../UndockedRegFreeWinRT.vcxproj | 420 +++++++++--------- .../detours/detours.vcxproj | 354 +++++++-------- 5 files changed, 447 insertions(+), 391 deletions(-) create mode 100644 src/PowerShell/Microsoft.WinGet.Client/README.md diff --git a/src/PowerShell/Microsoft.WinGet.Client/Common/BaseClientCommand.cs b/src/PowerShell/Microsoft.WinGet.Client/Common/BaseClientCommand.cs index 4961f03965..05376b943e 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/Common/BaseClientCommand.cs +++ b/src/PowerShell/Microsoft.WinGet.Client/Common/BaseClientCommand.cs @@ -69,7 +69,7 @@ protected static IReadOnlyList GetPackageCatalogReferen } } - [DllImport("winrtact.dll", EntryPoint = "winrtact_Initialize", ExactSpelling = true, PreserveSig = false)] + [DllImport("winrtact.dll", EntryPoint = "winrtact_Initialize", ExactSpelling = true, PreserveSig = true)] private static extern void InitializeUndockedRegFreeWinRT(); } -} +} \ No newline at end of file diff --git a/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj b/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj index 05e491c8f4..1cf913eecd 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj @@ -2,14 +2,16 @@ 10.0.22000.0 - net5.0-windows$(TargetWindowsVersion) + net6.0-windows$(TargetWindowsVersion) net461 true 9 - $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(OutputDirectory)\$(MSBuildProjectName)\ + $(OutputPath)\PowerShell x64;x86 $(CoreFramework);$(DesktopFramework) @@ -76,5 +78,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/PowerShell/Microsoft.WinGet.Client/README.md b/src/PowerShell/Microsoft.WinGet.Client/README.md new file mode 100644 index 0000000000..4068016fd5 --- /dev/null +++ b/src/PowerShell/Microsoft.WinGet.Client/README.md @@ -0,0 +1,28 @@ +# Windows Package Manager PowerShell Module + +This project contains the source code for building the Windows Package Manager PowerShell Module. + +## Running the PowerShell Module Locally + +After building the project solution, the `Microsoft.WinGet.Client` PowerShell module can be found in the output directory in the `PowerShell` folder. For example if you built the project as x64 release, you should expect to find the module files in `$(ProjectDirectory)/src/x64/Release/PowerShell`. + +To run the module, make sure you are using the latest version of PowerShell (not Windows PowerShell), then import the module manifest (Microsoft.WinGet.Client.psd1). + +``` +Import-Module +``` + +The following cmdlets and functions are available for you to try: + + Get-WinGetVersion + Enable-WinGetSetting + Disable-WinGetSetting + Add-WinGetSource + Remove-WinGetSource + Reset-WinGetSource + Find-WinGetPackage + Get-WinGetPackage + Get-WinGetSource + Install-WinGetPackage + Uninstall-WinGetPackage + Update-WinGetPackage \ No newline at end of file diff --git a/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj b/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj index 4d4311ee27..378a6052a7 100644 --- a/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj +++ b/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj @@ -1,211 +1,211 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {31ED69A8-5310-45A9-953F-56C351D2C3E1} - Win32Proj - UndockedRegFreeWinRT - 10.0 - - - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - winrtact - true - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - winrtact - true - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - winrtact - false - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - winrtact - false - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - - NotUsing - Level3 - true - WIN32;_DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - NotUsing - Level3 - true - _DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - NotUsing - Level3 - true - true - true - WIN32;NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - true - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - NotUsing - Level3 - true - true - true - NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - true - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - - - - - - - - - - - - - - - - {787ec629-c0fb-4ba9-9746-4a82cd06b73e} - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + {31ED69A8-5310-45A9-953F-56C351D2C3E1} + Win32Proj + UndockedRegFreeWinRT + 10.0 + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + winrtact + true + $(BuildOutDir) + $(OutDir)$(ProjectName) + + + winrtact + true + $(BuildOutDir) + $(OutDir)$(ProjectName) + + + winrtact + false + $(BuildOutDir) + $(OutDir)$(ProjectName) + + + winrtact + false + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + + NotUsing + Level3 + true + WIN32;_DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + NotUsing + Level3 + true + _DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + NotUsing + Level3 + true + true + true + WIN32;NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + true + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + NotUsing + Level3 + true + true + true + NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + true + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + + + + + + + + + + + + + + + + {787ec629-c0fb-4ba9-9746-4a82cd06b73e} + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/UndockedRegFreeWinRT/detours/detours.vcxproj b/src/UndockedRegFreeWinRT/detours/detours.vcxproj index 9cad401431..b1ca1e1000 100644 --- a/src/UndockedRegFreeWinRT/detours/detours.vcxproj +++ b/src/UndockedRegFreeWinRT/detours/detours.vcxproj @@ -1,177 +1,179 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - 16.0 - {787EC629-C0FB-4BA9-9746-4A82CD06B73E} - Win32Proj - detours - 10.0 - Detours - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - $(OutDir)$(ProjectName)\ - $(BuildOutDir) - - - true - - - false - $(OutDir)$(ProjectName)\ - $(BuildOutDir) - - - false - - - - NotUsing - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - - - - - NotUsing - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - - - - - NotUsing - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - true - true - - - - - NotUsing - Level3 - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - true - true - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + 16.0 + {787EC629-C0FB-4BA9-9746-4A82CD06B73E} + Win32Proj + detours + 10.0 + Detours + + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(OutDir)$(ProjectName)\ + $(BuildOutDir) + + + true + + + false + $(OutDir)$(ProjectName)\ + $(BuildOutDir) + + + false + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + + NotUsing + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + + + + + NotUsing + Level3 + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + + + + + NotUsing + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + true + true + + + + + NotUsing + Level3 + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + true + true + + + + + \ No newline at end of file From e88b82bfb10f59f4b652045d70fc88651d293eca Mon Sep 17 00:00:00 2001 From: Ryan Fu Date: Fri, 14 Oct 2022 12:49:33 -0700 Subject: [PATCH 2/5] fix output path --- .../Microsoft.WinGet.Client.csproj | 24 +- .../UndockedRegFreeWinRT.vcxproj | 420 +++++++++--------- .../detours/detours.vcxproj | 358 +++++++-------- 3 files changed, 402 insertions(+), 400 deletions(-) diff --git a/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj b/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj index 1cf913eecd..9e5d04ad19 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client/Microsoft.WinGet.Client.csproj @@ -9,9 +9,9 @@ true 9 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(OutputDirectory)\$(MSBuildProjectName)\ - $(OutputPath)\PowerShell + $(SolutionDir)$(Platform)\$(Configuration)\ + $(BuildOutputDirectory)$(MSBuildProjectName) + $(BuildOutputDirectory)PowerShell x64;x86 $(CoreFramework);$(DesktopFramework) @@ -80,27 +80,27 @@ - - - - - + + + + + - - + + - - + + \ No newline at end of file diff --git a/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj b/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj index 378a6052a7..dc96f1d896 100644 --- a/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj +++ b/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj @@ -1,211 +1,211 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {31ED69A8-5310-45A9-953F-56C351D2C3E1} - Win32Proj - UndockedRegFreeWinRT - 10.0 - - - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - winrtact - true - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - winrtact - true - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - winrtact - false - $(BuildOutDir) - $(OutDir)$(ProjectName) - - - winrtact - false - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - NotUsing - Level3 - true - WIN32;_DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - NotUsing - Level3 - true - _DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - NotUsing - Level3 - true - true - true - WIN32;NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - true - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - NotUsing - Level3 - true - true - true - NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) - stdcpp17 - - - Windows - true - true - true - false - comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; - winrtact.def - - - - - - - - - - - - - - - - - - - - {787ec629-c0fb-4ba9-9746-4a82cd06b73e} - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + {31ED69A8-5310-45A9-953F-56C351D2C3E1} + Win32Proj + UndockedRegFreeWinRT + 10.0 + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + winrtact + true + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + winrtact + true + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + winrtact + false + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + winrtact + false + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + + NotUsing + Level3 + true + WIN32;_DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + NotUsing + Level3 + true + _DEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + NotUsing + Level3 + true + true + true + WIN32;NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + true + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + NotUsing + Level3 + true + true + true + NDEBUG;UNDOCKEDREGFREEWINRT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + $(PorjectDir)\..\detours\include;%(AdditionalUsingDirectories) + stdcpp17 + + + Windows + true + true + true + false + comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib; + winrtact.def + + + + + + + + + + + + + + + + + + + + {787ec629-c0fb-4ba9-9746-4a82cd06b73e} + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/UndockedRegFreeWinRT/detours/detours.vcxproj b/src/UndockedRegFreeWinRT/detours/detours.vcxproj index b1ca1e1000..232d24bc92 100644 --- a/src/UndockedRegFreeWinRT/detours/detours.vcxproj +++ b/src/UndockedRegFreeWinRT/detours/detours.vcxproj @@ -1,179 +1,181 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - 16.0 - {787EC629-C0FB-4BA9-9746-4A82CD06B73E} - Win32Proj - detours - 10.0 - Detours - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - $(OutDir)$(ProjectName)\ - $(BuildOutDir) - - - true - - - false - $(OutDir)$(ProjectName)\ - $(BuildOutDir) - - - false - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ - - - - NotUsing - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - - - - - NotUsing - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - - - - - NotUsing - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - true - true - - - - - NotUsing - Level3 - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - $(ProjectDir);%(AdditionalUsingDirectories) - - - Windows - true - true - true - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + 16.0 + {787EC629-C0FB-4BA9-9746-4A82CD06B73E} + Win32Proj + detours + 10.0 + Detours + + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + $(Platform)\$(Configuration)\ + + + + NotUsing + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + + + + + NotUsing + Level3 + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + + + + + NotUsing + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + true + true + + + + + NotUsing + Level3 + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + pch.h + $(ProjectDir);%(AdditionalUsingDirectories) + + + Windows + true + true + true + + + + + \ No newline at end of file From 16380db14ebc9580ef3870c1ca8bcddfe1f3dbec Mon Sep 17 00:00:00 2001 From: Ryan Fu Date: Fri, 14 Oct 2022 15:07:26 -0700 Subject: [PATCH 3/5] address PR feedback --- .../Copy-PlatformBinaries.ps1 | 4 ++-- src/PowerShell/Microsoft.WinGet.Client/README.md | 2 +- .../UndockedRegFreeWinRT.vcxproj | 16 ++++++++-------- src/UndockedRegFreeWinRT/detours/detours.vcxproj | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/PowerShell/Microsoft.WinGet.Client/Copy-PlatformBinaries.ps1 b/src/PowerShell/Microsoft.WinGet.Client/Copy-PlatformBinaries.ps1 index e52d290d92..647da5d1e0 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/Copy-PlatformBinaries.ps1 +++ b/src/PowerShell/Microsoft.WinGet.Client/Copy-PlatformBinaries.ps1 @@ -31,12 +31,12 @@ param ( ) # src\x64\Release\Project\net461\Library.Desktop.dll -# src\x64\Release\Project\net5.0-windows10.0.22000.0\Library.Core.dll +# src\x64\Release\Project\net6.0-windows10.0.22000.0\Library.Core.dll # build\Module\x64\Desktop\Library.Desktop.dll # build\Module\x64\Core\Library.Core.dll -$CoreFramework = 'net5.0-windows10.0.22000.0' +$CoreFramework = 'net6.0-windows10.0.22000.0' $CoreFolderName = 'Core' $DesktopFramework = 'net461' $DesktopFolderName = 'Desktop' diff --git a/src/PowerShell/Microsoft.WinGet.Client/README.md b/src/PowerShell/Microsoft.WinGet.Client/README.md index 4068016fd5..8a26754c07 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/README.md +++ b/src/PowerShell/Microsoft.WinGet.Client/README.md @@ -4,7 +4,7 @@ This project contains the source code for building the Windows Package Manager P ## Running the PowerShell Module Locally -After building the project solution, the `Microsoft.WinGet.Client` PowerShell module can be found in the output directory in the `PowerShell` folder. For example if you built the project as x64 release, you should expect to find the module files in `$(ProjectDirectory)/src/x64/Release/PowerShell`. +After building the project solution, the `Microsoft.WinGet.Client` PowerShell module can be found in the output directory in the `PowerShell` folder. For example if you built the project as x64 release, you should expect to find the module files in `$(SolutionDirectory)/src/x64/Release/PowerShell`. To run the module, make sure you are using the latest version of PowerShell (not Windows PowerShell), then import the module manifest (Microsoft.WinGet.Client.psd1). diff --git a/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj b/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj index dc96f1d896..7265755eaa 100644 --- a/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj +++ b/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj @@ -73,26 +73,26 @@ winrtact true - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ winrtact true - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ winrtact false - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ winrtact false - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ diff --git a/src/UndockedRegFreeWinRT/detours/detours.vcxproj b/src/UndockedRegFreeWinRT/detours/detours.vcxproj index 232d24bc92..8233c715c7 100644 --- a/src/UndockedRegFreeWinRT/detours/detours.vcxproj +++ b/src/UndockedRegFreeWinRT/detours/detours.vcxproj @@ -89,23 +89,23 @@ true - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ true - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ false - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ false - $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ From 91368c9109fd2988c0a3da5e9244e2574b8d3431 Mon Sep 17 00:00:00 2001 From: Ryan Fu Date: Tue, 18 Oct 2022 10:03:48 -0700 Subject: [PATCH 4/5] update localhostwebserver to net6 --- src/LocalhostWebServer/LocalhostWebServer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LocalhostWebServer/LocalhostWebServer.csproj b/src/LocalhostWebServer/LocalhostWebServer.csproj index 7454989c37..90f2342421 100644 --- a/src/LocalhostWebServer/LocalhostWebServer.csproj +++ b/src/LocalhostWebServer/LocalhostWebServer.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 $(SolutionDir)$(Platform)\$(Configuration)\LocalhostWebServer\ x64;x86 From 078dd1ada337a7b1e4e7545bc571346ab1f36e7e Mon Sep 17 00:00:00 2001 From: Ryan Fu Date: Tue, 18 Oct 2022 12:32:16 -0700 Subject: [PATCH 5/5] update indexcreationtool to dotnet6 --- src/IndexCreationTool/IndexCreationTool.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IndexCreationTool/IndexCreationTool.csproj b/src/IndexCreationTool/IndexCreationTool.csproj index d226521a52..05b04b2b03 100644 --- a/src/IndexCreationTool/IndexCreationTool.csproj +++ b/src/IndexCreationTool/IndexCreationTool.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 $(SolutionDir)$(Platform)\$(Configuration)\IndexCreationTool\ x64;x86