Skip to content

Update projects to .NET 10 #2199

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

Open
lbussell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update projects to .NET 10 #2199

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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/dotnet/sdk:9.0-noble",
"image": "mcr.microsoft.com/dotnet/sdk:10.0-noble",
"features": {
"ghcr.io/devcontainers/features/common-utils": {
"username": "app",
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/steps/bootstrap-imagebuilder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ steps:
displayName: Bootstrap ImageBuilder from source (Linux)
condition: eq(variables['Agent.OS'], 'Linux')

- powershell: $(engDockerToolsPath)/Install-DotNetSdk.ps1 -InstallPath "$(Build.SourcesDirectory)/.dotnet"
- powershell: $(engDockerToolsPath)/Install-DotNetSdk.ps1 -Channel "10.0" -InstallPath "$(Build.SourcesDirectory)/.dotnet"
displayName: Install .NET SDK (Windows)
condition: eq(variables['Agent.OS'], 'Windows_NT')

Expand Down
3 changes: 1 addition & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"dotnet": "11.0.100-preview.5.26227.104",
"runtimes": {
"dotnet": [
"9.0.11",
"10.0.1"
"10.0.10"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v <local path to build>:/repo -w /repo image-builder <image-build args>

# build Microsoft.DotNet.ImageBuilder
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0 AS build-env
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-azurelinux3.0 AS build-env
ARG TARGETARCH

# download root CA certificates for signature verification
Expand Down Expand Up @@ -31,7 +31,7 @@ RUN dotnet publish -r linux-$TARGETARCH ./ImageBuilder/Microsoft.DotNet.ImageBui


# build runtime image
FROM mcr.microsoft.com/dotnet/runtime:9.0-azurelinux3.0
FROM mcr.microsoft.com/dotnet/runtime:10.0-azurelinux3.0

# install tooling
RUN tdnf install -y \
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG WINDOWS_BASE
ARG WINDOWS_SDK

# build Microsoft.DotNet.ImageBuilder
FROM mcr.microsoft.com/dotnet/sdk:9.0-$WINDOWS_SDK AS build-env
FROM mcr.microsoft.com/dotnet/sdk:10.0-$WINDOWS_SDK AS build-env
WORKDIR /image-builder

# Work around Windows path length limitations by moving NuGet package cache to
Expand Down
4 changes: 2 additions & 2 deletions src/GitAutomation.Tests/Microsoft.DotNet.GitAutomation.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="CsCheck" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/GitAutomation/Microsoft.DotNet.GitAutomation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup Label="Project Settings">
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -28,10 +28,10 @@

<ItemGroup>
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.8.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.10" />
<PackageReference Include="Octokit" Version="14.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.22.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ImageBuilder.Models/Microsoft.DotNet.ImageBuilder.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup Label="Project Settings">
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<!-- Explicit Nullable setting required for Docker builds from src/ context (won't see root Directory.Build.props).
Tracking issue for fixing context directory: https://github.com/dotnet/docker-tools/issues/1592 -->
Expand Down
2 changes: 1 addition & 1 deletion src/ImageBuilder.Tests/Microsoft.DotNet.ImageBuilder.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
4 changes: 2 additions & 2 deletions src/ImageBuilder.Updater/ImageBuilder.Updater.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.17.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.17" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/ImageBuilder/Commands/CleanAcrImagesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ private async Task ProcessManifestsAsync(
int manifestCount = 0;
int batchNumber = 0;

var batches = manifests.Buffer(ManifestBatchSize).WithCancellation(cancellationToken);
var batches = manifests.Chunk(ManifestBatchSize).WithCancellation(cancellationToken);
await foreach (var batch in batches)
{
long batchStartTimestamp = Stopwatch.GetTimestamp();
batchNumber++;
manifestCount += batch.Count;
manifestCount += batch.Length;

ConcurrentBag<string> digestsToDelete = await FindManifestsToDeleteAsync(batch, canDeleteManifest, cancellationToken);
await DeleteManifestsAsync(acrContentClient, repository, digestsToDelete);
Expand All @@ -208,7 +208,7 @@ private async Task ProcessManifestsAsync(
+ " {ManifestCount} manifests, {DeletionCount} deleted, Duration={Duration}. DryRun={DryRun}",
batchNumber,
repository.Name,
batch.Count,
batch.Length,
digestsToDelete.Count,
Stopwatch.GetElapsedTime(batchStartTimestamp),
Options.IsDryRun);
Expand Down
27 changes: 12 additions & 15 deletions src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<PublishTrimmed>False</PublishTrimmed>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>Microsoft.DotNet.ImageBuilder</RootNamespace>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down Expand Up @@ -32,11 +32,11 @@
<PackageReference Include="Cottle" Version="2.1.0" />
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
<PackageReference Include="Microsoft.Azure.Kusto.Ingest" Version="14.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.18" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.8.0" />
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="9.0.0-beta.25255.5" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="20.256.2" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
Expand All @@ -45,21 +45,18 @@
<PackageReference Include="Polly" Version="8.7.0" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageReference Include="Polly.RateLimiting" Version="8.7.0" />
<PackageReference Include="System.CommandLine" Version="2.0.7" />
<PackageReference Include="System.Formats.Cbor" Version="9.0.18" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
<PackageReference Include="System.Threading.RateLimiting" Version="9.0.18" />
<PackageReference Include="System.Linq.Async" Version="7.0.1" />
<PackageReference Include="System.CommandLine" Version="2.0.10" />
<PackageReference Include="System.Formats.Cbor" Version="10.0.10" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.22.0" />
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.10" />
<PackageReference Include="YamlDotNet" Version="18.0.0" />

<!-- Resolve diamond dependency: Microsoft.TeamFoundationServer.Client transitively requires >= 8.0.0 -->
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.10" />

<!-- CVE-2021-24112: Upgrade version of System.Drawing.Common implicitly referenced by Microsoft.TeamFoundationServer.Client -->
<PackageReference Include="System.Drawing.Common" Version="5.0.3" />
<PackageReference Include="System.Drawing.Common" Version="10.0.10" />

<!-- CVE-2024-38095: Upgrade version of System.Formats.Asn1 implicitly referenced by Microsoft.DotNet.VersionTools -->
<PackageReference Include="System.Formats.Asn1" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Content/Install-DotNetSdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ param(
[string]
$InstallPath,
[string]
$Channel = "9.0"
$Channel = "10.0"
)

Set-StrictMode -Version Latest
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Content/templates/jobs/cg-build-projects.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:
# See https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#options for possible Channel values
- name: dotnetVersionChannel
type: string
default: '9.0'
default: '10.0'
displayName: .NET Version
# Additional steps to run before building projects (e.g. custom SDK installation).
- name: initSteps
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Microsoft.DotNet.DockerTools.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>Microsoft.DotNet.DockerTools.Infrastructure</RootNamespace>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Expand Down
9 changes: 6 additions & 3 deletions src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
{
"buildArgs": {
"WINDOWS_BASE": "servercore:ltsc2016-amd64",
"WINDOWS_SDK": "nanoserver-1809"
"WINDOWS_SDK": "nanoserver-ltsc2025"
},
"buildOsVersion": "windowsservercore-ltsc2025",
"dockerfile": "Dockerfile.windows",
"os": "windows",
"osVersion": "windowsservercore-ltsc2019",
Expand All @@ -51,8 +52,9 @@
{
"buildArgs": {
"WINDOWS_BASE": "nanoserver:1809-amd64",
"WINDOWS_SDK": "nanoserver-1809"
"WINDOWS_SDK": "nanoserver-ltsc2025"
},
"buildOsVersion": "windowsservercore-ltsc2025",
"dockerfile": "Dockerfile.windows",
"os": "windows",
"osVersion": "nanoserver-1809",
Expand All @@ -64,8 +66,9 @@
{
"buildArgs": {
"WINDOWS_BASE": "nanoserver:ltsc2022-amd64",
"WINDOWS_SDK": "nanoserver-ltsc2022"
"WINDOWS_SDK": "nanoserver-ltsc2025"
},
"buildOsVersion": "windowsservercore-ltsc2025",
"dockerfile": "Dockerfile.windows",
"os": "windows",
"osVersion": "nanoserver-ltsc2022",
Expand Down
Loading