Skip to content

Commit e2683ad

Browse files
authored
Merge pull request #1576 from chief-micco/dotnet10
Dotnet10
2 parents f199800 + bcf5d2c commit e2683ad

File tree

24 files changed

+77
-83
lines changed

24 files changed

+77
-83
lines changed

.github/workflows/cross-language-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
141141
with:
142142
dotnet-version: |
143-
9.0.x
143+
10.0.x
144144
145145
- name: Set up Go
146146
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0

.github/workflows/csharp-appencryption-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
outputs:
4242
artifact: ${{ steps.upload-artifact.outputs.artifact_id }}
4343
container:
44-
image: mcr.microsoft.com/dotnet/sdk:9.0
44+
image: mcr.microsoft.com/dotnet/sdk:10.0
4545
options: --ulimit core=-1 --ulimit memlock=-1:-1
4646
steps:
4747
- name: Checkout repository
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-latest
8383
needs: build
8484
container:
85-
image: mcr.microsoft.com/dotnet/sdk:9.0
85+
image: mcr.microsoft.com/dotnet/sdk:10.0
8686
options: --ulimit core=-1 --ulimit memlock=-1:-1
8787
services:
8888
dynamodb:

.github/workflows/csharp-appencryption-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: 'Run Integration Tests'
2424
runs-on: ubuntu-latest
2525
container:
26-
image: mcr.microsoft.com/dotnet/sdk:9.0
26+
image: mcr.microsoft.com/dotnet/sdk:10.0
2727
options: --ulimit core=-1 --ulimit memlock=-1:-1
2828
services:
2929
dynamodb:

.github/workflows/csharp-appencryption-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
2424
with:
2525
dotnet-version: |
26-
9.0.x
26+
10.0.x
2727
2828
- name: Fetch all tags
2929
run: git fetch --prune --unshallow --tags

.github/workflows/csharp-logging-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
outputs:
2626
artifact: ${{ steps.upload-artifact.outputs.artifact_id }}
2727
container:
28-
image: mcr.microsoft.com/dotnet/sdk:9.0
28+
image: mcr.microsoft.com/dotnet/sdk:10.0
2929
options: --ulimit core=-1 --ulimit memlock=-1:-1
3030
steps:
3131
- name: Checkout repository

.github/workflows/csharp-logging-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
2424
with:
2525
dotnet-version: |
26-
9.0.x
26+
10.0.x
2727
2828
- name: Fetch all tags
2929
run: git fetch --prune --unshallow --tags

.github/workflows/csharp-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: 'Reference App: Build'
2727
runs-on: ubuntu-latest
2828
container:
29-
image: mcr.microsoft.com/dotnet/sdk:9.0
29+
image: mcr.microsoft.com/dotnet/sdk:10.0
3030
options: --ulimit core=-1 --ulimit memlock=-1:-1
3131
steps:
3232
- name: Checkout repository

.github/workflows/csharp-securememory-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
outputs:
3030
artifact: ${{ steps.upload-artifact.outputs.artifact_id }}
3131
container:
32-
image: mcr.microsoft.com/dotnet/sdk:9.0
32+
image: mcr.microsoft.com/dotnet/sdk:10.0
3333
options: --ulimit core=-1 --ulimit memlock=-1:-1
3434
steps:
3535
- name: Checkout repository
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969
needs: build
7070
container:
71-
image: mcr.microsoft.com/dotnet/sdk:9.0
71+
image: mcr.microsoft.com/dotnet/sdk:10.0
7272
options: --ulimit core=-1 --ulimit memlock=-1:-1
7373
steps:
7474
- name: Checkout repository

.github/workflows/csharp-securememory-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
2424
with:
2525
dotnet-version: |
26-
9.0.x
26+
10.0.x
2727
2828
- name: Fetch all tags
2929
run: git fetch --prune --unshallow --tags

csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
<RootNamespace>GoDaddy.Asherah.AppEncryption.IntegrationTests</RootNamespace>
66
<EnableNETAnalyzers>true</EnableNETAnalyzers>
77
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
88
<AnalysisMode>Recommended</AnalysisMode>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<NoWarn>$(NoWarn);CA1873</NoWarn>
1011
</PropertyGroup>
1112
<ItemGroup Label="Package References">
12-
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.2.1" />
13+
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.4" />
1314
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
1415
<PrivateAssets>all</PrivateAssets>
1516
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1617
</PackageReference>
17-
<PackageReference Include="MySql.Data" Version="9.4.0" />
18+
<PackageReference Include="MySql.Data" Version="9.5.0" />
1819
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2122
<PackageReference Include="Moq" Version="4.20.72" />
2223
<PackageReference Include="xunit" Version="2.9.3" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
24+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2425
<PrivateAssets>all</PrivateAssets>
2526
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2627
</PackageReference>

0 commit comments

Comments
 (0)