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 blob storage domain from eng/updater #6152

Merged
merged 1 commit into from
Jan 16, 2025
+3 −4
Merged

Remove blob storage domain from eng/updater #6152

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
Remove blob storage URL
@richlander
richlander committed Jan 16, 2025
commit 36b788be169eb9a91b0b4ae69d86e14abfca79a7
7 changes: 3 additions & 4 deletions eng/update-dependencies/DockerfileShaUpdater.cs
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@ namespace Dotnet.Docker
/// </summary>
public class DockerfileShaUpdater : FileRegexUpdater
{
private const string ReleaseDotnetBaseUrl = $"https://dotnetcli.blob.core.windows.net/dotnet";
private const string ReleaseDotnetBaseCdnUrl = $"https://builds.dotnet.microsoft.com/dotnet";

private const string ShaVariableGroupName = "shaVariable";
@@ -146,7 +145,7 @@ public static IEnumerable<IDependencyUpdater> CreateUpdaters(
protected override string? TryGetDesiredValue(
IEnumerable<IDependencyInfo> dependencyBuildInfos, out IEnumerable<IDependencyInfo> usedBuildInfos)
{
usedBuildInfos = [ dependencyBuildInfos.First(info => info.SimpleName == _productName) ];
usedBuildInfos = [dependencyBuildInfos.First(info => info.SimpleName == _productName)];

string baseUrl = ManifestHelper.GetBaseUrl(_manifestVariables.Value, _options);
// Remove Aspire Dashboard case once https://github.com/dotnet/aspire/issues/2035 is fixed.
@@ -289,7 +288,7 @@ private static string GetArch(string[] variableParts)
// the daily build location, we wouldn't use the release checksums file and instead use the other means of
// retrieving the checksums.
string baseUrl = ManifestHelper.GetBaseUrl(_manifestVariables.Value, _options);
if (baseUrl != ReleaseDotnetBaseUrl && baseUrl != ReleaseDotnetBaseCdnUrl)
if (baseUrl != ReleaseDotnetBaseCdnUrl)
{
return null;
}
@@ -350,7 +349,7 @@ private async Task<IDictionary<string, string>> GetChecksumsFromChecksumsFile()

private async Task<IDictionary<string, string>> GetDotnetReleaseChecksums(string? version)
{
string uri = $"{ReleaseDotnetBaseUrl}/checksums/{version}-sha.txt";
string uri = $"{ReleaseDotnetBaseCdnUrl}/checksums/{version}-sha.txt";

return await GetChecksums(
uri,