Skip to content

Commit cda5e02

Browse files
Copilotwaldekmastykarz
Copilot
and
waldekmastykarz
committed
Upgrade all projects to .NET 10
Co-authored-by: waldekmastykarz <[email protected]>
1 parent a4ef9be commit cda5e02

File tree

8 files changed

+46
-361
lines changed

8 files changed

+46
-361
lines changed

‎.github/workflows/create-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup .NET
3535
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
3636
with:
37-
dotnet-version: 9.0.x
37+
dotnet-version: 10.0.x
3838
- name: Rename executable for beta
3939
if: contains(github.ref_name, '-beta')
4040
run: |
@@ -59,7 +59,7 @@ jobs:
5959
if: matrix.architecture == 'win-x64'
6060
run: dotnet build ./DevProxy.Abstractions/DevProxy.Abstractions.csproj -p:InformationalVersion=$("${{ github.ref_name }}".Substring(1)) -c Release --no-self-contained
6161
- name: Add plugins to output
62-
run: cp ./DevProxy/bin/Release/net9.0/${{ matrix.architecture }}/plugins ./${{ env.release }} -r
62+
run: cp ./DevProxy/bin/Release/net10.0/${{ matrix.architecture }}/plugins ./${{ env.release }} -r
6363
- name: Remove unnecessary files
6464
run: |
6565
pushd
@@ -112,7 +112,7 @@ jobs:
112112
shell: pwsh
113113
run: >
114114
./sign code azure-key-vault
115-
./DevProxy.Abstractions/bin/Release/net9.0/DevProxy.Abstractions.dll
115+
./DevProxy.Abstractions/bin/Release/net10.0/DevProxy.Abstractions.dll
116116
--publisher-name "${{ env.APP_PUBLISHER }}"
117117
--description "${{ env.APP_DESCRIPTION }}"
118118
--description-url "${{ env.APP_DESCRIPTION_URL }}"
@@ -127,7 +127,7 @@ jobs:
127127
uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # master
128128
with:
129129
filename: '../../../../DevProxy.Abstractions-${{ github.ref_name }}.zip'
130-
directory: './DevProxy.Abstractions/bin/Release/net9.0'
130+
directory: './DevProxy.Abstractions/bin/Release/net10.0'
131131
exclusions: '*.json'
132132
- name: Upload abstractions
133133
if: matrix.architecture == 'win-x64'

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/DevProxy/bin/Debug/net9.0/devproxy.dll",
13+
"program": "${workspaceFolder}/DevProxy/bin/Debug/net10.0/devproxy.dll",
1414
"args": [],
15-
"cwd": "${workspaceFolder}/DevProxy/bin/Debug/net9.0",
15+
"cwd": "${workspaceFolder}/DevProxy/bin/Debug/net10.0",
1616
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
1717
"console": "integratedTerminal",
1818
"stopAtEntry": false,

‎DevProxy.Abstractions/DevProxy.Abstractions.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>DevProxy.Abstractions</RootNamespace>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
@@ -10,6 +10,7 @@
1010
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
13+
<NoWarn>CA1873</NoWarn>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

‎DevProxy.Abstractions/packages.lock.json‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net9.0": {
4+
"net10.0": {
55
"Markdig": {
66
"type": "Direct",
77
"requested": "[0.41.3, )",
@@ -20,8 +20,7 @@
2020
"Microsoft.Extensions.DependencyModel": "9.0.4",
2121
"Microsoft.Extensions.Logging": "9.0.4",
2222
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.10",
23-
"SQLitePCLRaw.core": "2.1.10",
24-
"System.Text.Json": "9.0.4"
23+
"SQLitePCLRaw.core": "2.1.10"
2524
}
2625
},
2726
"Microsoft.Extensions.Configuration": {
@@ -102,8 +101,7 @@
102101
"contentHash": "HiICGm0e44+i4aVHpLn+aphmSC2eQnDvlTttw1rE0hntOZKoLGRy37sydqqbRP1ZokMf3Mt0GEgSWxDwnucKGg==",
103102
"dependencies": {
104103
"BouncyCastle.Cryptography": "2.4.0",
105-
"Microsoft.Extensions.Logging.Abstractions": "8.0.1",
106-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
104+
"Microsoft.Extensions.Logging.Abstractions": "8.0.1"
107105
}
108106
},
109107
"YamlDotNet": {
@@ -168,8 +166,7 @@
168166
"Microsoft.Extensions.Configuration.Abstractions": "9.0.4",
169167
"Microsoft.Extensions.DependencyModel": "9.0.4",
170168
"Microsoft.Extensions.Logging": "9.0.4",
171-
"SQLitePCLRaw.core": "2.1.10",
172-
"System.Text.Json": "9.0.4"
169+
"SQLitePCLRaw.core": "2.1.10"
173170
}
174171
},
175172
"Microsoft.Extensions.Caching.Abstractions": {
@@ -304,10 +301,7 @@
304301
"SQLitePCLRaw.core": {
305302
"type": "Transitive",
306303
"resolved": "2.1.10",
307-
"contentHash": "Ii8JCbC7oiVclaE/mbDEK000EFIJ+ShRPwAvvV89GOZhQ+ZLtlnSWl6ksCNMKu/VGXA4Nfi2B7LhN/QFN9oBcw==",
308-
"dependencies": {
309-
"System.Memory": "4.5.3"
310-
}
304+
"contentHash": "Ii8JCbC7oiVclaE/mbDEK000EFIJ+ShRPwAvvV89GOZhQ+ZLtlnSWl6ksCNMKu/VGXA4Nfi2B7LhN/QFN9oBcw=="
311305
},
312306
"SQLitePCLRaw.lib.e_sqlite3": {
313307
"type": "Transitive",
@@ -321,21 +315,6 @@
321315
"dependencies": {
322316
"SQLitePCLRaw.core": "2.1.10"
323317
}
324-
},
325-
"System.Memory": {
326-
"type": "Transitive",
327-
"resolved": "4.5.3",
328-
"contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
329-
},
330-
"System.Runtime.CompilerServices.Unsafe": {
331-
"type": "Transitive",
332-
"resolved": "6.0.0",
333-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
334-
},
335-
"System.Text.Json": {
336-
"type": "Transitive",
337-
"resolved": "9.0.4",
338-
"contentHash": "pYtmpcO6R3Ef1XilZEHgXP2xBPVORbYEzRP7dl0IAAbN8Dm+kfwio8aCKle97rAWXOExr292MuxWYurIuwN62g=="
339318
}
340319
}
341320
}

‎DevProxy.Plugins/DevProxy.Plugins.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<RootNamespace>DevProxy.Plugins</RootNamespace>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
@@ -11,9 +11,10 @@
1111
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
14+
<NoWarn>CA1873</NoWarn>
1415
</PropertyGroup>
1516
<PropertyGroup Condition="'$(Configuration)'=='Release'">
16-
<NoWarn>CS1998</NoWarn>
17+
<NoWarn>CS1998;CA1873</NoWarn>
1718
</PropertyGroup>
1819
<ItemGroup>
1920
<PackageReference Include="Azure.Identity" Version="1.13.2">

‎DevProxy.Plugins/packages.lock.json‎

Lines changed: 11 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net9.0": {
4+
"net10.0": {
55
"Azure.Identity": {
66
"type": "Direct",
77
"requested": "[1.13.2, )",
@@ -10,9 +10,7 @@
1010
"dependencies": {
1111
"Azure.Core": "1.44.1",
1212
"Microsoft.Identity.Client": "4.67.2",
13-
"Microsoft.Identity.Client.Extensions.Msal": "4.67.2",
14-
"System.Memory": "4.5.5",
15-
"System.Threading.Tasks.Extensions": "4.5.4"
13+
"Microsoft.Identity.Client.Extensions.Msal": "4.67.2"
1614
}
1715
},
1816
"Microsoft.EntityFrameworkCore.Sqlite": {
@@ -27,8 +25,7 @@
2725
"Microsoft.Extensions.DependencyModel": "9.0.4",
2826
"Microsoft.Extensions.Logging": "9.0.4",
2927
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.10",
30-
"SQLitePCLRaw.core": "2.1.10",
31-
"System.Text.Json": "9.0.4"
28+
"SQLitePCLRaw.core": "2.1.10"
3229
}
3330
},
3431
"Microsoft.Extensions.Configuration": {
@@ -112,8 +109,7 @@
112109
"contentHash": "HiICGm0e44+i4aVHpLn+aphmSC2eQnDvlTttw1rE0hntOZKoLGRy37sydqqbRP1ZokMf3Mt0GEgSWxDwnucKGg==",
113110
"dependencies": {
114111
"BouncyCastle.Cryptography": "2.4.0",
115-
"Microsoft.Extensions.Logging.Abstractions": "8.0.1",
116-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
112+
"Microsoft.Extensions.Logging.Abstractions": "8.0.1"
117113
}
118114
},
119115
"Azure.Core": {
@@ -123,12 +119,7 @@
123119
"dependencies": {
124120
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
125121
"System.ClientModel": "1.1.0",
126-
"System.Diagnostics.DiagnosticSource": "6.0.1",
127-
"System.Memory.Data": "6.0.0",
128-
"System.Numerics.Vectors": "4.5.0",
129-
"System.Text.Encodings.Web": "6.0.0",
130-
"System.Text.Json": "6.0.10",
131-
"System.Threading.Tasks.Extensions": "4.5.4"
122+
"System.Memory.Data": "6.0.0"
132123
}
133124
},
134125
"BouncyCastle.Cryptography": {
@@ -197,8 +188,7 @@
197188
"Microsoft.Extensions.Configuration.Abstractions": "9.0.4",
198189
"Microsoft.Extensions.DependencyModel": "9.0.4",
199190
"Microsoft.Extensions.Logging": "9.0.4",
200-
"SQLitePCLRaw.core": "2.1.10",
201-
"System.Text.Json": "9.0.4"
191+
"SQLitePCLRaw.core": "2.1.10"
202192
}
203193
},
204194
"Microsoft.Extensions.Caching.Abstractions": {
@@ -369,8 +359,7 @@
369359
"resolved": "4.67.2",
370360
"contentHash": "37t0TfekfG6XM8kue/xNaA66Qjtti5Qe1xA41CK+bEd8VD76/oXJc+meFJHGzygIC485dCpKoamG/pDfb9Qd7Q==",
371361
"dependencies": {
372-
"Microsoft.IdentityModel.Abstractions": "6.35.0",
373-
"System.Diagnostics.DiagnosticSource": "6.0.1"
362+
"Microsoft.IdentityModel.Abstractions": "6.35.0"
374363
}
375364
},
376365
"Microsoft.Identity.Client.Extensions.Msal": {
@@ -440,10 +429,7 @@
440429
"OpenTelemetry.Api": {
441430
"type": "Transitive",
442431
"resolved": "1.12.0",
443-
"contentHash": "Xt0qldi+iE2szGrM3jAqzEMEJd48YBtqI6mge0+ArXTZg3aTpRmyhL6CKKl3bLioaFSSVbBpEbPin8u6Z46Yrw==",
444-
"dependencies": {
445-
"System.Diagnostics.DiagnosticSource": "9.0.0"
446-
}
432+
"contentHash": "Xt0qldi+iE2szGrM3jAqzEMEJd48YBtqI6mge0+ArXTZg3aTpRmyhL6CKKl3bLioaFSSVbBpEbPin8u6Z46Yrw=="
447433
},
448434
"OpenTelemetry.Api.ProviderBuilderExtensions": {
449435
"type": "Transitive",
@@ -476,10 +462,7 @@
476462
"SQLitePCLRaw.core": {
477463
"type": "Transitive",
478464
"resolved": "2.1.10",
479-
"contentHash": "Ii8JCbC7oiVclaE/mbDEK000EFIJ+ShRPwAvvV89GOZhQ+ZLtlnSWl6ksCNMKu/VGXA4Nfi2B7LhN/QFN9oBcw==",
480-
"dependencies": {
481-
"System.Memory": "4.5.3"
482-
}
465+
"contentHash": "Ii8JCbC7oiVclaE/mbDEK000EFIJ+ShRPwAvvV89GOZhQ+ZLtlnSWl6ksCNMKu/VGXA4Nfi2B7LhN/QFN9oBcw=="
483466
},
484467
"SQLitePCLRaw.lib.e_sqlite3": {
485468
"type": "Transitive",
@@ -499,61 +482,19 @@
499482
"resolved": "1.1.0",
500483
"contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==",
501484
"dependencies": {
502-
"System.Memory.Data": "1.0.2",
503-
"System.Text.Json": "6.0.9"
485+
"System.Memory.Data": "1.0.2"
504486
}
505487
},
506-
"System.Diagnostics.DiagnosticSource": {
507-
"type": "Transitive",
508-
"resolved": "9.0.0",
509-
"contentHash": "ddppcFpnbohLWdYKr/ZeLZHmmI+DXFgZ3Snq+/E7SwcdW4UnvxmaugkwGywvGVWkHPGCSZjCP+MLzu23AL5SDw=="
510-
},
511-
"System.Memory": {
512-
"type": "Transitive",
513-
"resolved": "4.5.5",
514-
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
515-
},
516488
"System.Memory.Data": {
517489
"type": "Transitive",
518490
"resolved": "6.0.0",
519-
"contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==",
520-
"dependencies": {
521-
"System.Text.Json": "6.0.0"
522-
}
523-
},
524-
"System.Numerics.Vectors": {
525-
"type": "Transitive",
526-
"resolved": "4.5.0",
527-
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
528-
},
529-
"System.Runtime.CompilerServices.Unsafe": {
530-
"type": "Transitive",
531-
"resolved": "6.0.0",
532-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
491+
"contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ=="
533492
},
534493
"System.Security.Cryptography.ProtectedData": {
535494
"type": "Transitive",
536495
"resolved": "4.5.0",
537496
"contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q=="
538497
},
539-
"System.Text.Encodings.Web": {
540-
"type": "Transitive",
541-
"resolved": "6.0.0",
542-
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
543-
"dependencies": {
544-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
545-
}
546-
},
547-
"System.Text.Json": {
548-
"type": "Transitive",
549-
"resolved": "9.0.4",
550-
"contentHash": "pYtmpcO6R3Ef1XilZEHgXP2xBPVORbYEzRP7dl0IAAbN8Dm+kfwio8aCKle97rAWXOExr292MuxWYurIuwN62g=="
551-
},
552-
"System.Threading.Tasks.Extensions": {
553-
"type": "Transitive",
554-
"resolved": "4.5.4",
555-
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
556-
},
557498
"YamlDotNet": {
558499
"type": "Transitive",
559500
"resolved": "16.3.0",

‎DevProxy/DevProxy.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace>DevProxy</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
@@ -17,6 +17,7 @@
1717
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1919
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
20+
<NoWarn>CA1873</NoWarn>
2021
</PropertyGroup>
2122

2223
<ItemGroup>

0 commit comments

Comments
 (0)