Skip to content

Commit 11b03bd

Browse files
committed
merge 'main'
2 parents f7f38ae + 4331fa3 commit 11b03bd

27 files changed

+1456
-778
lines changed

.azure/pipelines/azure-pipelines-external-release.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,13 @@ jobs:
4343
workingDirectory: .azure/pipelines
4444

4545
- task: UseDotNet@2
46-
displayName: Use .NET Core sdk 6.0.x - needed for code signing
46+
displayName: Use .NET 6 SDK - needed for code signing
4747
inputs:
4848
version: 6.0.x
4949
- task: UseDotNet@2
50-
displayName: Use .NET Core sdk 8.0.x
50+
displayName: Use .NET 10 SDK
5151
inputs:
52-
version: 8.0.x
53-
- task: UseDotNet@2
54-
displayName: Use .NET Core sdk 9.0.x
55-
inputs:
56-
version: 9.0.x
52+
version: 10.0.x
5753

5854
- task: DotNetCoreCLI@2
5955
displayName: dotnet build

.azure/pipelines/azure-pipelines-internal-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
submodules: recursive
2323
persistCredentials: True
2424
- task: UseDotNet@2
25-
displayName: Use .NET Core sdk 8.0.x
25+
displayName: Use .NET 10 SDK
2626
inputs:
27-
version: 8.0.x
27+
version: 10.0.x
2828
- task: NuGetToolInstaller@1
2929
displayName: Nuget Tool Installer
3030
inputs:

.azure/pipelines/azure-pipelines-nightly.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,10 @@ jobs:
4040

4141
steps:
4242
- task: UseDotNet@2
43-
displayName: Use .NET 8.0
43+
displayName: Use .NET 10 SDK
4444
inputs:
4545
packageType: 'sdk'
46-
version: '8.0.x'
47-
48-
- task: UseDotNet@2
49-
displayName: Use .NET 9.0
50-
inputs:
51-
packageType: 'sdk'
52-
version: '9.0.x'
46+
version: '10.0.x'
5347

5448
- task: NodeTool@0
5549
displayName: Node Tool
@@ -162,16 +156,10 @@ jobs:
162156

163157
steps:
164158
- task: UseDotNet@2
165-
displayName: Use .NET 8.0
166-
inputs:
167-
packageType: 'sdk'
168-
version: '8.0.x'
169-
170-
- task: UseDotNet@2
171-
displayName: Use .NET 9.0
159+
displayName: Use .NET 10 SDK
172160
inputs:
173161
packageType: 'sdk'
174-
version: '9.0.x'
162+
version: '10.0.x'
175163

176164
- bash: |
177165
sudo npm install -g azurite

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
ARG TARGETARCH
33
WORKDIR /src
44

Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
22
ARG TARGETARCH
33
WORKDIR /src
44

Dockerfile.cbl-mariner

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
ARG TARGETARCH
33
WORKDIR /src
44

Dockerfile.chiseled

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
ARG TARGETARCH
33

44
RUN mkdir /data \

Dockerfile.nanoserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG TAG=ltsc2022
2-
FROM mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-$TAG AS build
2+
FROM mcr.microsoft.com/dotnet/sdk:10.0-nanoserver-$TAG AS build
33

44
ENV NUGET_PACKAGES=/src/pkg
55

Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
ARG TARGETARCH
33
WORKDIR /src
44

Version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<!-- VersionPrefix property for builds and packages -->
33
<PropertyGroup>
4-
<VersionPrefix>1.0.89</VersionPrefix>
4+
<VersionPrefix>1.0.91</VersionPrefix>
55
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)