Skip to content

Commit ca6937e

Browse files
authored
fix(dotnet): use new cdn url (#3867)
1 parent 6a63cbe commit ca6937e

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

docs/custom-registries.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz
104104

105105
Dotnet releases are downloaded from:
106106

107-
- `https://dotnetcli.azureedge.net/dotnet/Sdk`
107+
- `https://builds.dotnet.microsoft.com/dotnet/Sdk`
108108

109109
Samples:
110110

111111
```txt
112-
https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
113-
https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz
112+
https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
113+
https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz
114114
```
115115

116116
## `erlang`

src/cli/tools/dotnet.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ export class DotnetInstallService extends BaseInstallService {
117117
override async install(version: string): Promise<void> {
118118
const toolPath = this.pathSvc.toolPath(this.name);
119119

120-
// https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
121-
const url = `https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-${this.arch}.tar.gz`;
120+
// https://github.com/dotnet/core/issues/9671
121+
// https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
122+
const url = `https://builds.dotnet.microsoft.com/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-${this.arch}.tar.gz`;
122123
const file = await this.http.download({ url });
123124

124125
await this.compress.extract({

test/dotnet/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ RUN set -ex; \
6969
#--------------------------------------
7070
FROM base AS testb
7171

72-
# Do not change
73-
RUN install-tool dotnet 6.0.416
74-
7572
# renovate: datasource=dotnet packageName=dotnet-sdk
7673
RUN install-tool dotnet 8.0.404
7774

@@ -122,8 +119,8 @@ FROM build AS testd
122119

123120
# only patch updates
124121
# renovate: datasource=dotnet packageName=dotnet-sdk
125-
RUN install-tool dotnet 8.0.404
126-
RUN set -ex; dotnet --version | grep 8.0.
122+
RUN install-tool dotnet 9.0.101
123+
RUN set -ex; dotnet --version | grep 9.0.
127124

128125
RUN set -ex; \
129126
dotnet restore --use-lock-file
@@ -140,5 +137,4 @@ FROM base
140137
COPY --from=testa /.dummy /.dummy
141138
COPY --from=testb /.dummy /.dummy
142139
COPY --from=testc /.dummy /.dummy
143-
# TODO: enable for net 9.0
144-
# COPY --from=testd /.dummy /.dummy
140+
COPY --from=testd /.dummy /.dummy

0 commit comments

Comments
 (0)