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

fix(dotnet): use new cdn url #3867

Merged
merged 1 commit into from
Dec 27, 2024
Merged

fix(dotnet): use new cdn url #3867

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions docs/custom-registries.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz

Dotnet releases are downloaded from:

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

Samples:

```txt
https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz
https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz
```

## `erlang`
Expand Down
5 changes: 3 additions & 2 deletions src/cli/tools/dotnet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@
override async install(version: string): Promise<void> {
const toolPath = this.pathSvc.toolPath(this.name);

// https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
const url = `https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-${this.arch}.tar.gz`;
// https://github.com/dotnet/core/issues/9671
// https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz
const url = `https://builds.dotnet.microsoft.com/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-${this.arch}.tar.gz`;

Check warning on line 122 in src/cli/tools/dotnet.ts

View check run for this annotation

Codecov / codecov/patch

src/cli/tools/dotnet.ts#L122 

Added line #L122 was not covered by tests
const file = await this.http.download({ url });

await this.compress.extract({
Expand Down
10 changes: 3 additions & 7 deletions test/dotnet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ RUN set -ex; \
#--------------------------------------
FROM base AS testb

# Do not change
RUN install-tool dotnet 6.0.416

# renovate: datasource=dotnet packageName=dotnet-sdk
RUN install-tool dotnet 8.0.404

Expand Down Expand Up @@ -122,8 +119,8 @@ FROM build AS testd

# only patch updates
# renovate: datasource=dotnet packageName=dotnet-sdk
RUN install-tool dotnet 8.0.404
RUN set -ex; dotnet --version | grep 8.0.
RUN install-tool dotnet 9.0.101
RUN set -ex; dotnet --version | grep 9.0.

RUN set -ex; \
dotnet restore --use-lock-file
Expand All @@ -140,5 +137,4 @@ FROM base
COPY --from=testa /.dummy /.dummy
COPY --from=testb /.dummy /.dummy
COPY --from=testc /.dummy /.dummy
# TODO: enable for net 9.0
# COPY --from=testd /.dummy /.dummy
COPY --from=testd /.dummy /.dummy
Loading