Skip to content

Commit 85e2682

Browse files
authored
update dockerfile to install net80 (Azure#47872)
1 parent 85ffc83 commit 85e2682

File tree

9 files changed

+19
-9
lines changed

9 files changed

+19
-9
lines changed

eng/containers/UbuntuNetCoreKeyring/Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENV \
88
# Do not generate certificate
99
DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
1010
# SDK version
11+
DOTNET_SDK_VERSION_8_0=8.0.405\
1112
DOTNET_SDK_VERSION_6_0=6.0.413 \
1213
DOTNET_SDK_VERSION_3_1=3.1.416 \
1314
# Enable correct mode for dotnet watch (only mode supported in a container)
@@ -37,6 +38,17 @@ RUN apt-add-repository ppa:git-core/ppa \
3738

3839
# Install .NET SDK
3940

41+
# https://builds.dotnet.microsoft.com/dotnet/release-metadata/8.0/releases.json
42+
RUN curl -fSL --output dotnet.tar.gz https://download.visualstudio.microsoft.com/download/pr/a91ddad4-a3c2-4303-9efc-1ca6b7af850c/be1763df9211599df1cf1c6f504b3c41/dotnet-sdk-$DOTNET_SDK_VERSION_8_0-linux-x64.tar.gz \
43+
&& dotnet_sha512='2499faa1520e8fd9a287a6798755de1a3ffef31c0dc3416213c8a9bec64861419bfc818f1c1c410b86bb72848ce56d4b6c74839afd8175a922345fc649063ec6' \
44+
&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
45+
&& mkdir -p /usr/share/dotnet \
46+
&& tar -ozxf dotnet.tar.gz -C /usr/share/dotnet \
47+
&& rm dotnet.tar.gz \
48+
&& if [ ! -e /usr/bin/dotnet ]; then ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet; fi \
49+
# Trigger first run experience by running arbitrary cmd
50+
&& dotnet help
51+
4052
# Below adapated from https://hub.docker.com/_/microsoft-dotnet-sdk
4153
# https://github.com/dotnet/dotnet-docker/blob/b20c03e0644b42167d66a85fe6077ec2428a47fa/src/sdk/5.0/focal/amd64/Dockerfile
4254
RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/$DOTNET_SDK_VERSION_6_0/dotnet-sdk-$DOTNET_SDK_VERSION_6_0-linux-x64.tar.gz \
@@ -45,7 +57,7 @@ RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/
4557
&& mkdir -p /usr/share/dotnet \
4658
&& tar -ozxf dotnet.tar.gz -C /usr/share/dotnet \
4759
&& rm dotnet.tar.gz \
48-
&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \
60+
&& if [ ! -e /usr/bin/dotnet ]; then ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet; fi \
4961
# Trigger first run experience by running arbitrary cmd
5062
&& dotnet help
5163

sdk/identity/Azure.Identity/integration/Integration.Identity.Common/Integration.Identity.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Azure.Storage.Blobs" />
9+
<PackageReference Include="Azure.Storage.Blobs" Version="[12.23.0,)"/>
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\..\src\Azure.Identity.csproj" />

sdk/identity/Azure.Identity/integration/Integration.Identity.Container/Integration.Identity.Container.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net461;net6.0;net8.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

sdk/identity/Azure.Identity/integration/Integration.Identity.Func/Function1.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public static async Task<IActionResult> Run(
2323
try
2424
{
2525
ManagedIdentityTests.AuthToStorage();
26+
await Task.Yield();
2627
return new OkObjectResult("Successfully acquired a token from ManagedIdentityCredential");
2728
}
2829
catch (Exception ex)

sdk/identity/Azure.Identity/integration/Integration.Identity.Func/Integration.Identity.Func.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.1" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
88
</ItemGroup>
99
<ItemGroup>
1010
<None Update="host.json">

sdk/identity/Azure.Identity/integration/WebApp/Controllers/TestController.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Linq;
33
using Azure.Core;
44
using Azure.Identity;
5-
using Azure.Storage.Blobs;
65
using Microsoft.AspNetCore.Mvc;
76
using Integration.Identity.Common;
87

sdk/identity/Azure.Identity/integration/WebApp/Integration.Identity.WebApp.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Azure.Storage.Blobs" />
11-
</ItemGroup>
129
<ItemGroup>
1310
<ProjectReference Include="..\Integration.Identity.Common\Integration.Identity.Common.csproj" />
1411
</ItemGroup>

sdk/identity/Azure.Identity/tests/MultiTenantLiveTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public MultiTenantLiveTests(bool isAsync) : base(isAsync)
1919
private IdentityTestClient _client;
2020

2121
[RecordedTest]
22+
[PlaybackOnly("Requires ephemeral tenant")]
2223
public async Task CallGraphWithClientSecret()
2324
{
2425
var tenantId = TestEnvironment.MultiTenantAppTenantId;

sdk/identity/test-resources-post.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ az functionapp deployment source config-zip -g $DeploymentOutputs['IDENTITY_RESO
2828
# clean up
2929
Remove-Item -Force -Recurse "$workingFolder/Pub"
3030

31-
$containerImage = 'azsdkengsys.azurecr.io/dotnet/ubuntu_netcore_keyring:3080193'
31+
$containerImage = 'azsdkengsys.azurecr.io/dotnet/ubuntu_netcore_keyring:4484670'
3232
$MIClientId = $DeploymentOutputs['IDENTITY_USER_DEFINED_IDENTITY_CLIENT_ID']
3333
$MIName = $DeploymentOutputs['IDENTITY_USER_DEFINED_IDENTITY_NAME']
3434
$SaAccountName = 'workload-identity-sa'

0 commit comments

Comments
 (0)