From ac2ed7f34ae0375e2fd2ac5f9bfd28094a3e6806 Mon Sep 17 00:00:00 2001 From: JohnMcPMS Date: Wed, 20 May 2026 16:00:17 -0700 Subject: [PATCH 1/3] /await:strict and fixes for it --- .../HttpStream/HttpClientWrapper.cpp | 21 +++++++------------ .../HttpStream/HttpClientWrapper.h | 11 +++++----- .../HttpStream/HttpLocalCache.cpp | 6 +++--- .../HttpStream/HttpLocalCache.h | 5 +++-- .../HttpStream/HttpRandomAccessStream.cpp | 4 +++- src/Directory.Build.props | 4 ++++ .../ConfigurationStaticFunctions.cpp | 2 +- 7 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.cpp b/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.cpp index d5e1401965..780fce2247 100644 --- a/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.cpp +++ b/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.cpp @@ -20,7 +20,7 @@ using namespace winrt::Windows::Web::Http::Filters; // The HRESULTs will be mapped to UI error code by the appropriate component namespace AppInstaller::Utility::HttpStream { - std::future> HttpClientWrapper::CreateAsync(const Uri& uri) + std::shared_ptr HttpClientWrapper::Create(const Uri& uri) { // TODO: Use proxy info. HttpClient does not support using a custom proxy, only using the system-wide one. std::shared_ptr instance = std::make_shared(); @@ -37,13 +37,11 @@ namespace AppInstaller::Utility::HttpStream instance->m_httpClient.DefaultRequestHeaders().Append(L"Connection", L"Keep-Alive"); instance->m_httpClient.DefaultRequestHeaders().UserAgent().ParseAdd(Utility::ConvertToUTF16(Runtime::GetDefaultUserAgent().get())); - co_await instance->PopulateInfoAsync(); - - co_return instance; + return instance; } // this function will issue a HEAD request to determine the size of the file and the redirect URI - std::future HttpClientWrapper::PopulateInfoAsync() + IAsyncAction HttpClientWrapper::PopulateInfoAsync() { HttpRequestMessage request(HttpMethod::Head(), m_requestUri); @@ -93,7 +91,7 @@ namespace AppInstaller::Utility::HttpStream #pragma warning( disable : 4714) // HRESULT_FROM_WIN32 marked as forceinline not inlined #endif - std::future HttpClientWrapper::SendHttpRequestAsync( + IAsyncOperation HttpClientWrapper::SendHttpRequestAsync( _In_ ULONG64 startPosition, _In_ UINT32 requestedSizeInBytes) { @@ -177,14 +175,11 @@ namespace AppInstaller::Utility::HttpStream #pragma warning( pop ) #endif - std::future HttpClientWrapper::DownloadRangeAsync( + IAsyncOperation HttpClientWrapper::DownloadRangeAsync( const ULONG64 startPosition, const UINT32 requestedSizeInBytes, - const InputStreamOptions& options) + const InputStreamOptions&) { - std::vector byteArray(requestedSizeInBytes); - IBuffer buffer = CryptographicBuffer::CreateFromByteArray(byteArray); - - co_return co_await SendHttpRequestAsync(startPosition, requestedSizeInBytes); + return SendHttpRequestAsync(startPosition, requestedSizeInBytes); } -} \ No newline at end of file +} diff --git a/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.h b/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.h index 599c171224..c9d3f92684 100644 --- a/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.h +++ b/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.h @@ -11,9 +11,12 @@ namespace AppInstaller::Utility::HttpStream class HttpClientWrapper { public: - static std::future> CreateAsync(const winrt::Windows::Foundation::Uri& uri); + // Create returns an uninitialized wrapper. Callers must co_await PopulateInfoAsync() before use. + static std::shared_ptr Create(const winrt::Windows::Foundation::Uri& uri); - std::future DownloadRangeAsync( + winrt::Windows::Foundation::IAsyncAction PopulateInfoAsync(); + + winrt::Windows::Foundation::IAsyncOperation DownloadRangeAsync( const ULONG64 startPosition, const UINT32 requestedSizeInBytes, const winrt::Windows::Storage::Streams::InputStreamOptions& options); @@ -42,9 +45,7 @@ namespace AppInstaller::Utility::HttpStream std::wstring m_etagHeader; std::wstring m_lastModifiedHeader; - std::future PopulateInfoAsync(); - - std::future SendHttpRequestAsync( + winrt::Windows::Foundation::IAsyncOperation SendHttpRequestAsync( _In_ ULONG64 startPosition, _In_ UINT32 requestedSizeInBytes); }; diff --git a/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp b/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp index 55cc639792..9b87e4e42f 100644 --- a/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp +++ b/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp @@ -13,7 +13,7 @@ using namespace winrt::Windows::Security::Cryptography; // The HRESULTs will be mapped to UI error code by the appropriate component namespace AppInstaller::Utility::HttpStream { - std::future HttpLocalCache::ReadFromCacheAndDownloadIfNecessaryAsync( + winrt::Windows::Foundation::IAsyncOperation HttpLocalCache::ReadFromCacheAndDownloadIfNecessaryAsync( const ULONG64 requestedPosition, const UINT32 requestedSize, HttpClientWrapper* httpClientWrapper, @@ -145,7 +145,7 @@ namespace AppInstaller::Utility::HttpStream // Downloads a chunk of the file, saves it to the cache, and returns the corresponding buffer // If the requested size is 0, this method returns an empty buffer without making HTTP calls - std::future HttpLocalCache::DownloadAndSaveToCacheAsync( + winrt::Windows::Foundation::IAsyncAction HttpLocalCache::DownloadAndSaveToCacheAsync( const std::vector unsatisfiablePages, HttpClientWrapper* httpClientWrapper, InputStreamOptions httpInputStreamOptions) @@ -243,4 +243,4 @@ namespace AppInstaller::Utility::HttpStream writer.WriteBuffer(buffer2); return writer.DetachBuffer(); } -} \ No newline at end of file +} diff --git a/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.h b/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.h index e7fab8a318..6338a86661 100644 --- a/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.h +++ b/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.h @@ -3,6 +3,7 @@ #pragma once +#include #include "HttpClientWrapper.h" namespace AppInstaller::Utility::HttpStream @@ -23,7 +24,7 @@ namespace AppInstaller::Utility::HttpStream // Returns a buffer matching the requested range by reading the parts of the range that are cached // and downloading the rest using the provided httpClientWrapper object - std::future ReadFromCacheAndDownloadIfNecessaryAsync( + winrt::Windows::Foundation::IAsyncOperation ReadFromCacheAndDownloadIfNecessaryAsync( const ULONG64 requestedPosition, const UINT32 requestedSize, HttpClientWrapper* httpClientWrapper, @@ -47,7 +48,7 @@ namespace AppInstaller::Utility::HttpStream void VacateStaleEntriesFromCache(); - std::future DownloadAndSaveToCacheAsync( + winrt::Windows::Foundation::IAsyncAction DownloadAndSaveToCacheAsync( const std::vector unsatisfiablePages, HttpClientWrapper* httpClientWrapper, const winrt::Windows::Storage::Streams::InputStreamOptions httpInputStreamOptions); diff --git a/src/AppInstallerCommonCore/HttpStream/HttpRandomAccessStream.cpp b/src/AppInstallerCommonCore/HttpStream/HttpRandomAccessStream.cpp index a2ab0a7821..f352618e2e 100644 --- a/src/AppInstallerCommonCore/HttpStream/HttpRandomAccessStream.cpp +++ b/src/AppInstallerCommonCore/HttpStream/HttpRandomAccessStream.cpp @@ -19,7 +19,9 @@ namespace AppInstaller::Utility::HttpStream try { - strong_this->m_httpHelper = co_await HttpClientWrapper::CreateAsync(uri); + auto httpHelper = HttpClientWrapper::Create(uri); + co_await httpHelper->PopulateInfoAsync(); + strong_this->m_httpHelper = std::move(httpHelper); strong_this->m_size = strong_this->m_httpHelper->GetFullFileSize(); strong_this->m_httpLocalCache = std::make_unique(); } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ec7737aa4f..39a56536fa 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,6 +17,8 @@ v143 v145 Unicode + + false @@ -26,6 +28,8 @@ true + + %(AdditionalOptions) /await:strict diff --git a/src/WindowsPackageManager/ConfigurationStaticFunctions.cpp b/src/WindowsPackageManager/ConfigurationStaticFunctions.cpp index 54aa42531b..e904c39101 100644 --- a/src/WindowsPackageManager/ConfigurationStaticFunctions.cpp +++ b/src/WindowsPackageManager/ConfigurationStaticFunctions.cpp @@ -194,7 +194,7 @@ namespace ConfigurationShim if (IsConfigurationAvailable()) { - return; + co_return; } auto strong_this{ get_strong() }; From d82bfbd93b81e67cd1665bcc60d064ea18a0c8d4 Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Fri, 10 Jul 2026 17:46:27 -0700 Subject: [PATCH 2/3] Update to cppwinrt3 --- src/AppInstallerCLI/AppInstallerCLI.vcxproj | 10 +++++----- src/AppInstallerCLI/packages.config | 2 +- .../AppInstallerCLICore.vcxproj | 16 ++++++++++------ src/AppInstallerCLICore/packages.config | 2 +- .../AppInstallerCLITests.vcxproj | 10 +++++----- src/AppInstallerCLITests/packages.config | 2 +- .../AppInstallerCommonCore.vcxproj | 10 +++++----- src/AppInstallerCommonCore/packages.config | 2 +- .../AppInstallerRepositoryCore.vcxproj | 8 ++++---- src/AppInstallerRepositoryCore/packages.config | 2 +- .../AppInstallerSharedLib.vcxproj | 11 +++++------ .../AppInstallerSharedLib.vcxproj.filters | 1 + src/AppInstallerSharedLib/packages.config | 2 +- src/ComInprocTestbed/ComInprocTestbed.vcxproj | 14 +++++++------- .../ComInprocTestbed.vcxproj.filters | 6 +++--- src/ComInprocTestbed/packages.config | 2 +- src/Directory.Build.props | 4 ---- ...ft.Management.Configuration.OutOfProc.vcxproj | 11 +++++------ ...ement.Configuration.OutOfProc.vcxproj.filters | 1 + .../packages.config | 2 +- .../Microsoft.Management.Configuration.vcxproj | 10 +++++----- ...soft.Management.Configuration.vcxproj.filters | 1 + .../packages.config | 2 +- ...icrosoft.Management.Deployment.InProc.vcxproj | 11 +++++------ ....Management.Deployment.InProc.vcxproj.filters | 1 + .../packages.config | 2 +- ...osoft.Management.Deployment.OutOfProc.vcxproj | 11 +++++------ ...nagement.Deployment.OutOfProc.vcxproj.filters | 1 + .../packages.config | 2 +- .../Microsoft.Management.Deployment.vcxproj | 8 ++++---- .../packages.config | 2 +- src/WinGetUtil/WinGetUtil.vcxproj | 11 +++++------ src/WinGetUtil/packages.config | 2 +- src/WinGetYamlFuzzing/WinGetYamlFuzzing.vcxproj | 10 +++++----- src/WinGetYamlFuzzing/packages.config | 2 +- .../WindowsPackageManager.vcxproj | 11 +++++------ src/WindowsPackageManager/packages.config | 2 +- 37 files changed, 103 insertions(+), 104 deletions(-) diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj index d818f0e343..52e9f4ab96 100644 --- a/src/AppInstallerCLI/AppInstallerCLI.vcxproj +++ b/src/AppInstallerCLI/AppInstallerCLI.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -247,13 +247,13 @@ - + 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/AppInstallerCLI/packages.config b/src/AppInstallerCLI/packages.config index f32f48b009..0495acb040 100644 --- a/src/AppInstallerCLI/packages.config +++ b/src/AppInstallerCLI/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index 9d92771cc6..fc0db4d46f 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -480,15 +480,19 @@ - + 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}. - - - - + + + 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/AppInstallerCLICore/packages.config b/src/AppInstallerCLICore/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/AppInstallerCLICore/packages.config +++ b/src/AppInstallerCLICore/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj index ba0ced5853..4bc7051f23 100644 --- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj +++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -1137,14 +1137,14 @@ - + 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/AppInstallerCLITests/packages.config b/src/AppInstallerCLITests/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/AppInstallerCLITests/packages.config +++ b/src/AppInstallerCLITests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj index 302805976d..d63e68789a 100644 --- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj +++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -466,14 +466,14 @@ - + 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/AppInstallerCommonCore/packages.config b/src/AppInstallerCommonCore/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/AppInstallerCommonCore/packages.config +++ b/src/AppInstallerCommonCore/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj index 34cc155a46..1d58afec51 100644 --- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj +++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -514,14 +514,14 @@ - + 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/AppInstallerRepositoryCore/packages.config b/src/AppInstallerRepositoryCore/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/AppInstallerRepositoryCore/packages.config +++ b/src/AppInstallerRepositoryCore/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj index adf3c4c6c6..22329e730e 100644 --- a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj +++ b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -410,15 +410,14 @@ - + 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/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj.filters b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj.filters index 61457db664..142e046444 100644 --- a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj.filters +++ b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj.filters @@ -248,5 +248,6 @@ + \ No newline at end of file diff --git a/src/AppInstallerSharedLib/packages.config b/src/AppInstallerSharedLib/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/AppInstallerSharedLib/packages.config +++ b/src/AppInstallerSharedLib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/ComInprocTestbed/ComInprocTestbed.vcxproj b/src/ComInprocTestbed/ComInprocTestbed.vcxproj index b95fad10ff..91e232c838 100644 --- a/src/ComInprocTestbed/ComInprocTestbed.vcxproj +++ b/src/ComInprocTestbed/ComInprocTestbed.vcxproj @@ -1,6 +1,6 @@ - + 15.0 {E5BCFF58-7D0C-4770-ABB9-AECE1027CD94} @@ -169,9 +169,6 @@ - - - {9ac3c6a4-1875-4d3e-bf9c-c31e81eff6b4} @@ -209,15 +206,18 @@ + + + - + 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/ComInprocTestbed/ComInprocTestbed.vcxproj.filters b/src/ComInprocTestbed/ComInprocTestbed.vcxproj.filters index fab38937e9..3fba5fb97e 100644 --- a/src/ComInprocTestbed/ComInprocTestbed.vcxproj.filters +++ b/src/ComInprocTestbed/ComInprocTestbed.vcxproj.filters @@ -28,9 +28,6 @@ Source Files - - - @@ -48,4 +45,7 @@ Header Files + + + \ No newline at end of file diff --git a/src/ComInprocTestbed/packages.config b/src/ComInprocTestbed/packages.config index f32f48b009..0495acb040 100644 --- a/src/ComInprocTestbed/packages.config +++ b/src/ComInprocTestbed/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 39a56536fa..ec7737aa4f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,8 +17,6 @@ v143 v145 Unicode - - false @@ -28,8 +26,6 @@ true - - %(AdditionalOptions) /await:strict diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj index d52da7bcf5..6c7e1404f1 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -413,15 +413,14 @@ - + 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/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj.filters b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj.filters index 15c52c8a46..20e2b09d55 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj.filters +++ b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj.filters @@ -56,5 +56,6 @@ + \ No newline at end of file diff --git a/src/Microsoft.Management.Configuration.OutOfProc/packages.config b/src/Microsoft.Management.Configuration.OutOfProc/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/packages.config +++ b/src/Microsoft.Management.Configuration.OutOfProc/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj index 53dfe11d66..b96262fccf 100644 --- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj +++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -312,15 +312,15 @@ - + 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/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj.filters b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj.filters index 3901ba8f1b..a20087bd56 100644 --- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj.filters +++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj.filters @@ -382,5 +382,6 @@ + \ No newline at end of file diff --git a/src/Microsoft.Management.Configuration/packages.config b/src/Microsoft.Management.Configuration/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/Microsoft.Management.Configuration/packages.config +++ b/src/Microsoft.Management.Configuration/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj index 25367bc4b5..da95005d3f 100644 --- a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj +++ b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -370,19 +370,18 @@ - + 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/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj.filters b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj.filters index 94cb824253..d9b8b2a279 100644 --- a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj.filters +++ b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj.filters @@ -39,5 +39,6 @@ + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment.InProc/packages.config b/src/Microsoft.Management.Deployment.InProc/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/Microsoft.Management.Deployment.InProc/packages.config +++ b/src/Microsoft.Management.Deployment.InProc/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj index 292dc22273..6043186d32 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -411,15 +411,14 @@ - + 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/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj.filters b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj.filters index 0a8e916016..ad773990ff 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj.filters +++ b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj.filters @@ -54,5 +54,6 @@ + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment.OutOfProc/packages.config b/src/Microsoft.Management.Deployment.OutOfProc/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/packages.config +++ b/src/Microsoft.Management.Deployment.OutOfProc/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj index 5eb84d2782..2894e42bac 100644 --- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj +++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -272,15 +272,15 @@ - + 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/Microsoft.Management.Deployment/packages.config b/src/Microsoft.Management.Deployment/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/Microsoft.Management.Deployment/packages.config +++ b/src/Microsoft.Management.Deployment/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj index 12066a2a3b..4e4d707f75 100644 --- a/src/WinGetUtil/WinGetUtil.vcxproj +++ b/src/WinGetUtil/WinGetUtil.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -269,15 +269,14 @@ - + 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/WinGetUtil/packages.config b/src/WinGetUtil/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/WinGetUtil/packages.config +++ b/src/WinGetUtil/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/WinGetYamlFuzzing/WinGetYamlFuzzing.vcxproj b/src/WinGetYamlFuzzing/WinGetYamlFuzzing.vcxproj index f47a72e910..30a25c1a78 100644 --- a/src/WinGetYamlFuzzing/WinGetYamlFuzzing.vcxproj +++ b/src/WinGetYamlFuzzing/WinGetYamlFuzzing.vcxproj @@ -1,6 +1,6 @@ - + Fuzzing @@ -98,14 +98,14 @@ - + 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/WinGetYamlFuzzing/packages.config b/src/WinGetYamlFuzzing/packages.config index f83207db21..132d149574 100644 --- a/src/WinGetYamlFuzzing/packages.config +++ b/src/WinGetYamlFuzzing/packages.config @@ -1,5 +1,5 @@  + - \ No newline at end of file diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj index f8ab04be8e..ad65971af0 100644 --- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj +++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -431,15 +431,14 @@ - + 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/WindowsPackageManager/packages.config b/src/WindowsPackageManager/packages.config index 3a8e0698a3..132d149574 100644 --- a/src/WindowsPackageManager/packages.config +++ b/src/WindowsPackageManager/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file From ad0e766c6b5ed8db252db39de9b90d8a5fed1d50 Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Fri, 10 Jul 2026 18:13:04 -0700 Subject: [PATCH 3/3] Merge error targets --- src/AppInstallerCLICore/AppInstallerCLICore.vcxproj | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index fc0db4d46f..d14e4c5cac 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -487,12 +487,7 @@ 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}. - - - - 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