Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove correlation blocker for remote->local in some cases #2362

Merged
merged 1 commit into from
Jul 22, 2022
Merged

Remove correlation blocker for remote->local in some cases #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@
<ClCompile Include="Archive.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="Filesystem.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FolderFileWatcher.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="Filesystem.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="PropertySheet.props" />
Expand Down Expand Up @@ -482,7 +482,7 @@
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\TestZip.zip">
<Filter>TestData</Filter>
</CopyFileToFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_NoApplicableArchitecture.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
Expand Down Expand Up @@ -527,7 +527,7 @@
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_Zip_MultipleNonPortableNestedInstallers.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallerArgTest_Msi_WithSwitches.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
Expand Down Expand Up @@ -569,7 +569,7 @@
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\UpdateFlowTest_ZipWithExe.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\ImportFile-Good.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
Expand Down
4 changes: 4 additions & 0 deletions src/AppInstallerCLITests/FolderFileWatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,12 @@ TEST_CASE("FolderFileWatcher_CreateNewFilesAndDelete", "[FolderFileWatcher]")
TempFile tempFile3(dirToWatch.GetPath(), "file3_", ".txt");
tempFile3Path = tempFile3.GetPath();
WriteText(tempFile3Path);
std::filesystem::remove(tempFile3Path);

TempFile tempFile4(newTestDir, "file4_", ".txt");
tempFile4Path = tempFile4.GetPath();
WriteText(tempFile4Path);
std::filesystem::remove(tempFile4Path);
}

std::this_thread::sleep_for(100ms);
Expand Down Expand Up @@ -358,10 +360,12 @@ TEST_CASE("FolderFileWatcher_Extension_CreateNewFilesAndDelete", "[FolderFileWat
TempFile tempFile3(dirToWatch.GetPath(), "file3_", ".txt");
tempFile3Path = tempFile3.GetPath();
WriteText(tempFile3Path);
std::filesystem::remove(tempFile3Path);

TempFile tempFile4(newTestDir, "file4_", ".txt");
tempFile4Path = tempFile4.GetPath();
WriteText(tempFile4Path);
std::filesystem::remove(tempFile4Path);
}

std::this_thread::sleep_for(100ms);
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <vector>

#pragma warning( push )
#pragma warning ( disable : 6001 6285 6287 6340 6388 )
#pragma warning ( disable : 6001 6285 6287 6340 6387 6388 28196 )
#include <wil/resource.h>
#include <wil/result.h>
#include <wil/result_macros.h>
Expand Down
6 changes: 0 additions & 6 deletions src/AppInstallerRepositoryCore/CompositeSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,12 +1054,6 @@ namespace AppInstaller::Repository
}
}

// Do not attempt to correlate local packages against this source.
if (m_searchBehavior == CompositeSearchBehavior::Installed && !source.GetDetails().SupportInstalledSearchCorrelation)
{
continue;
}

SearchResult availableResult = result.SearchAndHandleFailures(source, request);

for (auto&& match : availableResult.Matches)
Expand Down