From ad5ba3e65bf21931d0e2a46869d99ec8a15dacfd Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Wed, 31 Jul 2024 11:27:46 -0700 Subject: [PATCH 1/4] Fix downloader selection --- src/AppInstallerCommonCore/NetworkSettings.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/AppInstallerCommonCore/NetworkSettings.cpp b/src/AppInstallerCommonCore/NetworkSettings.cpp index 625df53f12..ec0bcec35a 100644 --- a/src/AppInstallerCommonCore/NetworkSettings.cpp +++ b/src/AppInstallerCommonCore/NetworkSettings.cpp @@ -29,9 +29,13 @@ namespace AppInstaller::Settings // We only use WinINet if specified by settings, or if we want to use proxy (as DO does not support that) InstallerDownloader setting = User().Get(); - if (setting != InstallerDownloader::WinInet && m_proxyUri) - { - AICLI_LOG(Core, Info, << "Forcing use of wininet for download as DO does not support proxy"); + if (setting == InstallerDownloader::WinInet || m_proxyUri) + { + if (setting != InstallerDownloader::WinInet) + { + AICLI_LOG(Core, Info, << "Forcing use of wininet for download as DO does not support proxy"); + } + return InstallerDownloader::WinInet; } else // Default or DO From 0a2b1908828999c715652d518fae96cbb028342d Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Wed, 31 Jul 2024 13:38:31 -0700 Subject: [PATCH 2/4] PR comment --- src/AppInstallerCommonCore/NetworkSettings.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/AppInstallerCommonCore/NetworkSettings.cpp b/src/AppInstallerCommonCore/NetworkSettings.cpp index ec0bcec35a..2cf8e24b7d 100644 --- a/src/AppInstallerCommonCore/NetworkSettings.cpp +++ b/src/AppInstallerCommonCore/NetworkSettings.cpp @@ -26,21 +26,21 @@ namespace AppInstaller::Settings InstallerDownloader NetworkSettings::GetInstallerDownloader() const { // The default is DeliveryOptimization. - // We only use WinINet if specified by settings, or if we want to use proxy (as DO does not support that) + // We use WinINet if specified by settings, or if we want to use proxy (as DO does not support that) InstallerDownloader setting = User().Get(); - if (setting == InstallerDownloader::WinInet || m_proxyUri) - { - if (setting != InstallerDownloader::WinInet) - { - AICLI_LOG(Core, Info, << "Forcing use of wininet for download as DO does not support proxy"); - } - + if (m_proxyUri && setting != InstallerDownloader::WinInet) + { + AICLI_LOG(Core, Info, << "Forcing use of wininet for download as DO does not support proxy"); return InstallerDownloader::WinInet; } - else // Default or DO + else if (setting == InstallerDownloader::Default) { return InstallerDownloader::DeliveryOptimization; + } + else + { + return setting; } } From aea570f9609708e3319b2c511a64d8e9d0823050 Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Wed, 31 Jul 2024 13:48:21 -0700 Subject: [PATCH 3/4] spelling --- .github/actions/spelling/allow.txt | 1 + .github/actions/spelling/expect.txt | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index b3aa0806e9..42e78079ac 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -17,6 +17,7 @@ appxsdk APSTUDIO ARRAYSIZE artifactstagingdirectory +Asn aspirational AUTOLISTEN azureedge diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 5542cb8220..65624c1a3b 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -69,7 +69,6 @@ CLIE CLOSEAPP cloudapp clsctx -clsid cobertura CODEOWNERS COINIT @@ -119,7 +118,6 @@ EFGH EFile efileresource EMalicious -endregion ENDSESSION EPester epth @@ -127,7 +125,6 @@ EQU ERRORONEXIT ESource ESRB -ests etest etl execustom @@ -227,7 +224,6 @@ learnxinyminutes libfuzzer libsolv libyaml -Linq liv liwpx localizationpriority @@ -292,12 +288,10 @@ myinstalldir mylog mysilent mysilentwithprogress -nameof Nami nativehandle NBLGGH NESTEDINSTALLER -netfx netlify NETSDK Newtonsoft @@ -317,7 +311,6 @@ NOSEARCH NOSEPARATOR notalostreference NOTAPROPERTY -notmatch NOTRACK NOUPDATE npmjs @@ -328,7 +321,6 @@ objidl ofile omus onefuzz -ools oop OPTOUT OVERLAPPEDWINDOW @@ -336,7 +328,6 @@ packageinuse packageinusebyapplication PACL PARAMETERMAP -paramref pathparts Patil PCCERT @@ -398,7 +389,6 @@ roblox ronomon rosoft Roronoa -rowids roy runspace runtimeclass @@ -457,7 +447,6 @@ taskhostw TCpp tcs TEMPDIRECTORY -Templating temppath testdata testexampleinstaller @@ -474,7 +463,6 @@ TReturn trimstart TState TStatus -typeparam UCase ucasemap UChars @@ -486,7 +474,6 @@ uninstallation uninstaller uninstallprevious uninstalls -Unk unknwn Unknwnbase UNMARSHALING @@ -511,7 +498,6 @@ vstest wcex webpages Webserver -websites WERSJA wesome wfsopen From d8011fdbb388a0befff7a7f00e45e6765996c684 Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Wed, 31 Jul 2024 13:54:50 -0700 Subject: [PATCH 4/4] Undo changes to expected words --- .github/actions/spelling/expect.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 65624c1a3b..5542cb8220 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -69,6 +69,7 @@ CLIE CLOSEAPP cloudapp clsctx +clsid cobertura CODEOWNERS COINIT @@ -118,6 +119,7 @@ EFGH EFile efileresource EMalicious +endregion ENDSESSION EPester epth @@ -125,6 +127,7 @@ EQU ERRORONEXIT ESource ESRB +ests etest etl execustom @@ -224,6 +227,7 @@ learnxinyminutes libfuzzer libsolv libyaml +Linq liv liwpx localizationpriority @@ -288,10 +292,12 @@ myinstalldir mylog mysilent mysilentwithprogress +nameof Nami nativehandle NBLGGH NESTEDINSTALLER +netfx netlify NETSDK Newtonsoft @@ -311,6 +317,7 @@ NOSEARCH NOSEPARATOR notalostreference NOTAPROPERTY +notmatch NOTRACK NOUPDATE npmjs @@ -321,6 +328,7 @@ objidl ofile omus onefuzz +ools oop OPTOUT OVERLAPPEDWINDOW @@ -328,6 +336,7 @@ packageinuse packageinusebyapplication PACL PARAMETERMAP +paramref pathparts Patil PCCERT @@ -389,6 +398,7 @@ roblox ronomon rosoft Roronoa +rowids roy runspace runtimeclass @@ -447,6 +457,7 @@ taskhostw TCpp tcs TEMPDIRECTORY +Templating temppath testdata testexampleinstaller @@ -463,6 +474,7 @@ TReturn trimstart TState TStatus +typeparam UCase ucasemap UChars @@ -474,6 +486,7 @@ uninstallation uninstaller uninstallprevious uninstalls +Unk unknwn Unknwnbase UNMARSHALING @@ -498,6 +511,7 @@ vstest wcex webpages Webserver +websites WERSJA wesome wfsopen