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

Change to official DNS #2026

Merged
merged 4 commits into from
Mar 24, 2022
Merged

Change to official DNS #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27cc7ea
Change to official dns
JohnMcPMS Mar 17, 2022
29d13cf
Spelling
JohnMcPMS Mar 17, 2022
551470a
Spelling??? and test fix
JohnMcPMS Mar 17, 2022
a4a7bbc
Update test URL and fix test interdependence
JohnMcPMS Mar 24, 2022
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
1 change: 1 addition & 0 deletions .github/actions/spelling/allow.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ bugfix
BUILDNUMBER
bytearray
cdecl
cdn
cer
certutil
cguid
Expand Down
9 changes: 7 additions & 2 deletions src/AppInstallerCLIE2ETests/SourceCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ namespace AppInstallerCLIE2ETests

public class SourceCommand : BaseCommand
{
[SetUp]
public void Setup()
{
ResetTestSource();
}

[Test]
public void SourceAdd()
{
Expand Down Expand Up @@ -125,10 +131,9 @@ public void SourceForceReset()
//Verify sources have been reset
result = TestCommon.RunAICLICommand("source list", "");
Assert.True(result.StdOut.Contains("winget"));
Assert.True(result.StdOut.Contains("https://winget.azureedge.net/cache"));
Assert.True(result.StdOut.Contains("https://cdn.winget.microsoft.com/cache"));
Assert.False(result.StdOut.Contains(Constants.TestSourceName));
Assert.False(result.StdOut.Contains(Constants.TestSourceUrl));
ResetTestSource();
}
}
}
6 changes: 3 additions & 3 deletions src/AppInstallerCLITests/Sources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ constexpr std::string_view s_DefaultSourceAsUserSource = R"(
Sources:
- Name: not-winget
Type: Microsoft.PreIndexed.Package
Arg: https://winget.azureedge.net/cache
Arg: https://cdn.winget.microsoft.com/cache
Data: Microsoft.Winget.Source_8wekyb3d8bbwe
IsTombstone: false
)"sv;
Expand Down Expand Up @@ -693,7 +693,7 @@ TEST_CASE("RepoSources_GroupPolicy_DefaultSource", "[sources][groupPolicy]")
SourceDetails details;
details.Name = "winget";
details.Type = "Microsoft.PreIndexed.Package";
details.Arg = "https://winget.azureedge.net/cache";
details.Arg = "https://cdn.winget.microsoft.com/cache";
REQUIRE_POLICY_EXCEPTION(
AddSource(details, progress),
TogglePolicy::Policy::DefaultSource);
Expand Down Expand Up @@ -790,7 +790,7 @@ TEST_CASE("RepoSources_GroupPolicy_DefaultSource", "[sources][groupPolicy]")
REQUIRE(sources.size() == c_DefaultSourceCount);

REQUIRE(sources[1].Name == "winget");
REQUIRE(sources[1].Arg == "https://winget.azureedge.net/cache");
REQUIRE(sources[1].Arg == "https://cdn.winget.microsoft.com/cache");
REQUIRE(sources[1].Origin == SourceOrigin::Default);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerRepositoryCore/SourceList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace AppInstaller::Repository
constexpr std::string_view s_MetadataYaml_Source_AcceptedAgreementFields = "AcceptedAgreementFields"sv;

constexpr std::string_view s_Source_WingetCommunityDefault_Name = "winget"sv;
constexpr std::string_view s_Source_WingetCommunityDefault_Arg = "https://winget.azureedge.net/cache"sv;
constexpr std::string_view s_Source_WingetCommunityDefault_Arg = "https://cdn.winget.microsoft.com/cache"sv;
constexpr std::string_view s_Source_WingetCommunityDefault_Data = "Microsoft.Winget.Source_8wekyb3d8bbwe"sv;
constexpr std::string_view s_Source_WingetCommunityDefault_Identifier = "Microsoft.Winget.Source_8wekyb3d8bbwe"sv;

Expand All @@ -37,7 +37,7 @@ namespace AppInstaller::Repository
constexpr std::string_view s_Source_MSStoreDefault_Identifier = "StoreEdgeFD"sv;

constexpr std::string_view s_Source_DesktopFrameworks_Name = "microsoft.builtin.desktop.frameworks"sv;
constexpr std::string_view s_Source_DesktopFrameworks_Arg = "https://winget.azureedge.net/platform"sv;
constexpr std::string_view s_Source_DesktopFrameworks_Arg = "https://cdn.winget.microsoft.com/platform"sv;
constexpr std::string_view s_Source_DesktopFrameworks_Data = "Microsoft.Winget.Platform.Source_8wekyb3d8bbwe"sv;
constexpr std::string_view s_Source_DesktopFrameworks_Identifier = "Microsoft.Winget.Platform.Source_8wekyb3d8bbwe"sv;

Expand Down