Skip to content

Commit

Permalink
Remove Edgio CDN usage to release/dev17.6 (#76606)
Browse files Browse the repository at this point in the history
The changes are copied over from
#76431
  • Loading branch information
dibarbet authored Jan 7, 2025
2 parents 73c58d3 + 533a48b commit 5072136
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
10 changes: 8 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
<MicrosoftVisualStudioTelemetryVersion>17.6.46</MicrosoftVisualStudioTelemetryVersion>
<MicrosoftVisualStudioTelemetryVersion>17.6.61</MicrosoftVisualStudioTelemetryVersion>
<MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
<MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
<MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
Expand All @@ -218,7 +218,7 @@
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftBuildLocatorVersion>1.6.10</MicrosoftBuildLocatorVersion>
<MSBuildStructuredLoggerVersion>2.2.155</MSBuildStructuredLoggerVersion>
<MSBuildStructuredLoggerVersion>2.2.386</MSBuildStructuredLoggerVersion>
<MDbgVersion>0.1.0</MDbgVersion>
<MonoOptionsVersion>6.6.0.161</MonoOptionsVersion>
<MoqVersion>4.10.1</MoqVersion>
Expand Down Expand Up @@ -317,6 +317,12 @@
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftBclAsyncInterfacesVersion>7.0.0</MicrosoftBclAsyncInterfacesVersion>
<!--
Temporary, servicing branch only version for use with build boss.
MSBuildLocator must be updated to work with updated VS on CI machines, but it requires
at least SCI version 8.0.0. We cannot update the
-->
<RefOnlySystemCollectionsImmutableVersion>8.0.0</RefOnlySystemCollectionsImmutableVersion>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
<UsingToolVSSDK>true</UsingToolVSSDK>
Expand Down
3 changes: 2 additions & 1 deletion src/Tools/BuildBoss/BuildBoss.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<!-- -->
<PackageReference Include="System.Collections.Immutable" Version="$(RefOnlySystemCollectionsImmutableVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="MSBuild.StructuredLogger" Version="$(MSBuildStructuredLoggerVersion)" />
<PackageReference Include="Mono.Options" Version="$(MonoOptionsVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/Core/Def/Storage/FileDownloader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public IFileDownloader CreateClient(string hostId, string serverPath, int pollin
{
// BaseUrl provided by the VS RemoteControl client team. This is URL we are supposed
// to use to publish and access data from.
const string BaseUrl = "https://az700632.vo.msecnd.net/pub";
const string BaseUrl = "https://aka.ms/vssettings/pub";

return new FileDownloader(new RemoteControlClient(hostId, BaseUrl, serverPath, pollingMinutes));
}
Expand Down

0 comments on commit 5072136

Please sign in to comment.