Change to official DNS (#2026)

microsoft · Mar 24, 2022 · 69ba781 · 69ba781
1 parent 0f4d66e
commit 69ba781
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -48,6 +48,7 @@ bugfix
 BUILDNUMBER
 bytearray
 cdecl
+cdn
 cer
 certutil
 cguid

diff --git a/src/AppInstallerCLIE2ETests/SourceCommand.cs b/src/AppInstallerCLIE2ETests/SourceCommand.cs
@@ -7,6 +7,12 @@ namespace AppInstallerCLIE2ETests
 
     public class SourceCommand : BaseCommand
     {
+        [SetUp]
+        public void Setup()
+        {
+            ResetTestSource();
+        }
+
         [Test]
         public void SourceAdd()
         {
@@ -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();
         }
     }
 }
diff --git a/src/AppInstallerCLITests/Sources.cpp b/src/AppInstallerCLITests/Sources.cpp
@@ -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;
@@ -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);
@@ -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);
         }
     }

diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -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;
 
@@ -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;