Skip to content

Commit 2b65714

Browse files
BenjinBenjin
authored
Upgrading to .NET 10 (.NET 8 for SqlCore) (#2634)
* First swing at project updates * updating pipeline * Bumping to v6 * Fixing logging issue and build errors after moving to .NET 10 * adding suppression * Configuring IDE0270 * Fixing tests * Additional cleanup * Additional cleanup * Missed the ManagedBatchParser nuspec * Bumping referenced .NET packages * Resetting minor version
1 parent fd7a519 commit 2b65714

File tree

62 files changed

+166
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+166
-174
lines changed

‎.editorconfig‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,18 @@ csharp_style_prefer_top_level_statements = true:silent
395395
# IDE0251: Make member 'readonly'
396396
dotnet_diagnostic.IDE0251.severity = warning
397397

398+
# IDE0350: Use implicitly typed lambda
399+
dotnet_diagnostic.IDE0350.severity = suggestion
400+
401+
# CA1872: Prefer 'Convert.ToHexString' and 'Convert.ToHexStringLower' over call chains based on 'BitConverter.ToString'
402+
dotnet_diagnostic.CA1872.severity = warning
403+
404+
# IDE0330: Use 'System.Threading.Lock'
405+
dotnet_diagnostic.IDE0330.severity = warning
406+
407+
# IDE0370: Remove unnecessary suppression
408+
dotnet_diagnostic.IDE0370.severity = warning
409+
398410
[*.{cs,vb}]
399411
dotnet_style_coalesce_expression = true:suggestion
400412
dotnet_style_null_propagation = true:suggestion
@@ -411,4 +423,10 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
411423
tab_width = 4
412424
indent_size = 4
413425
end_of_line = crlf
414-
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
426+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
427+
428+
# IDE0306: Simplify collection initialization
429+
dotnet_diagnostic.IDE0306.severity = suggestion
430+
431+
# IDE0270: Use coalesce expression
432+
dotnet_diagnostic.IDE0270.severity = suggestion

‎Packages.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PackageReference Update="System.Data.SqlClient" Version="4.8.6" />
66
<PackageReference Update="System.Reactive.Core" Version="6.0.0" />
77

8+
<PackageReference Update="Azure.Core" Version="1.41.0" />
89
<!-- Deprecated: TODO Migrate to Azure.Core -->
910
<PackageReference Update="Microsoft.Rest.ClientRuntime" Version="2.3.21" />
1011
<!-- Deprecated: TODO Migrate to Azure.Core -->
@@ -74,18 +75,17 @@
7475

7576
<!-- The following packages always need to be updated to the current .NET SDK version. -->
7677
<ItemGroup>
77-
<PackageReference Update="Azure.Core" Version="1.41.0" />
78-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
79-
<PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
80-
<PackageReference Update="System.Composition" Version="8.0.0" />
81-
<PackageReference Update="System.Configuration.ConfigurationManager" Version="9.0.4" />
82-
<PackageReference Update="System.Drawing.Common" Version="5.0.3" />
83-
<PackageReference Update="System.IO.Packaging" Version="9.0.5" />
84-
<PackageReference Update="System.Runtime.Caching" Version="9.0.4" />
85-
<PackageReference Update="System.Security.Permissions" Version="8.0.0" />
86-
<PackageReference Update="System.Text.Encoding.CodePages" Version="8.0.0" />
87-
<PackageReference Update="System.Text.Encodings.Web" Version="9.0.5" />
88-
<PackageReference Update="System.Text.Json" Version="9.0.5" />
78+
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="10.0.5" />
79+
<PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.5" />
80+
<PackageReference Update="System.Composition" Version="10.0.5" />
81+
<PackageReference Update="System.Configuration.ConfigurationManager" Version="10.0.5" />
82+
<PackageReference Update="System.Drawing.Common" Version="10.0.5" />
83+
<PackageReference Update="System.IO.Packaging" Version="10.0.5" />
84+
<PackageReference Update="System.Runtime.Caching" Version="10.0.5" />
85+
<PackageReference Update="System.Security.Permissions" Version="10.0.5" />
86+
<PackageReference Update="System.Text.Encoding.CodePages" Version="10.0.5" />
87+
<PackageReference Update="System.Text.Encodings.Web" Version="10.0.5" />
88+
<PackageReference Update="System.Text.Json" Version="10.0.5" />
8989
</ItemGroup>
9090

9191
<ItemGroup>

‎azure-pipelines/build-and-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ pr: none
44
variables:
55
# Major version number for the release
66
- name: Major
7-
value: '5'
7+
value: '6'
88
# Minor version number for the release (should be incremented post a stable release)
99
- name: Minor
10-
value: '8'
10+
value: '0'
1111
# Patch version number for the release (should be incremented in release branch once one is created)
1212
- name: Patch
1313
value: '0'

‎azure-pipelines/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ steps:
201201
- task: ArchiveFiles@1
202202
displayName: 'Archive ${{ platform.displayName }} ${{ project }} build'
203203
inputs:
204-
rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/${{ project }}/${{ platform.name }}/net8.0'
204+
rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/${{ project }}/${{ platform.name }}/net10.0'
205205
includeRootFolder: false
206206
archiveType: ${{ platform.archiveType }}
207-
archiveFile: '$(Build.SourcesDirectory)/artifacts/package/${{ project }}-${{ platform.archiveName }}-net8.0.${{ platform.archiveFileFormat }}'
207+
archiveFile: '$(Build.SourcesDirectory)/artifacts/package/${{ project }}-${{ platform.archiveName }}-net10.0.${{ platform.archiveFileFormat }}'
208208

209209
- task: PublishBuildArtifacts@1
210210
displayName: 'Publish Artifact: build archives'

‎azure-pipelines/osx-arm64-signing.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ steps:
44
inputs:
55
downloadType: specific
66
itemPattern: |
7-
drop/Microsoft.SqlTools.ServiceLayer-osx-arm64-unsigned-net8.0.tar.gz
8-
drop/Microsoft.SqlTools.Migration-osx-arm64-unsigned-net8.0.tar.gz
7+
drop/Microsoft.SqlTools.ServiceLayer-osx-arm64-unsigned-net10.0.tar.gz
8+
drop/Microsoft.SqlTools.Migration-osx-arm64-unsigned-net10.0.tar.gz
99
downloadPath: '$(Agent.TempDirectory)'
1010

1111
- script: |
1212
cd $(Agent.TempDirectory)/drop
1313
mkdir sts
14-
tar -xzvf Microsoft.SqlTools.ServiceLayer-osx-arm64-unsigned-net8.0.tar.gz -C sts
14+
tar -xzvf Microsoft.SqlTools.ServiceLayer-osx-arm64-unsigned-net10.0.tar.gz -C sts
1515
mkdir migration
16-
tar -xzvf Microsoft.SqlTools.Migration-osx-arm64-unsigned-net8.0.tar.gz -C migration
16+
tar -xzvf Microsoft.SqlTools.Migration-osx-arm64-unsigned-net10.0.tar.gz -C migration
1717
displayName: 'Extract files'
1818
1919
- script: |
@@ -28,14 +28,14 @@ steps:
2828
2929
- script: |
3030
cd $(Agent.TempDirectory)/drop/sts
31-
tar -czvf Microsoft.SqlTools.ServiceLayer-osx-arm64-net8.0.tar.gz *
31+
tar -czvf Microsoft.SqlTools.ServiceLayer-osx-arm64-net10.0.tar.gz *
3232
cd $(Agent.TempDirectory)/drop/migration
33-
tar -czvf Microsoft.SqlTools.Migration-osx-arm64-net8.0.tar.gz *
33+
tar -czvf Microsoft.SqlTools.Migration-osx-arm64-net10.0.tar.gz *
3434
displayName: 'Archive files'
3535
3636
- script: |
37-
cp $(Agent.TempDirectory)/drop/sts/Microsoft.SqlTools.ServiceLayer-osx-arm64-net8.0.tar.gz $(Build.ArtifactStagingDirectory)
38-
cp $(Agent.TempDirectory)/drop/migration/Microsoft.SqlTools.Migration-osx-arm64-net8.0.tar.gz $(Build.ArtifactStagingDirectory)
37+
cp $(Agent.TempDirectory)/drop/sts/Microsoft.SqlTools.ServiceLayer-osx-arm64-net10.0.tar.gz $(Build.ArtifactStagingDirectory)
38+
cp $(Agent.TempDirectory)/drop/migration/Microsoft.SqlTools.Migration-osx-arm64-net10.0.tar.gz $(Build.ArtifactStagingDirectory)
3939
displayName: 'Copy files to drop folder'
4040
4141
- task: PublishBuildArtifacts@1

‎azure-pipelines/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ steps:
1616

1717
- script: |
1818
cd $(Build.ArtifactStagingDirectory)
19-
rm Microsoft.SqlTools.ServiceLayer-osx-arm64-unsigned-net8.0.tar.gz
20-
rm Microsoft.SqlTools.Migration-osx-arm64-unsigned-net8.0.tar.gz
19+
rm Microsoft.SqlTools.ServiceLayer-osx-arm64-unsigned-net10.0.tar.gz
20+
rm Microsoft.SqlTools.Migration-osx-arm64-unsigned-net10.0.tar.gz
2121
displayName: 'Delete the unsigned arm64-osx packages'
2222

2323
- task: GitHubRelease@1

‎build.cake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,16 +228,16 @@ Task("BuildTest")
228228
var project = pair.Key;
229229
var projectFolder = System.IO.Path.Combine(testFolder, project);
230230
var logPath = System.IO.Path.Combine(logFolder, $"{project}-{framework}-build.log");
231+
ExitStatus exitStatus;
231232
using (var logWriter = new StreamWriter(logPath)) {
232-
var exitStatus = Run(dotnetcli, $"build --framework {framework} --configuration {testConfiguration} \"{projectFolder}\"",
233+
exitStatus = Run(dotnetcli, $"build --framework {framework} --configuration {testConfiguration} \"{projectFolder}\"",
233234
new RunOptions
234235
{
235236
StandardOutputWriter = logWriter,
236237
StandardErrorWriter = logWriter
237238
});
238-
239-
ExceptionOnErrorWithLog(exitStatus, $"Building test {project} failed for {framework}. See {logPath} for more details.", logPath);
240239
}
240+
ExceptionOnErrorWithLog(exitStatus, $"Building test project {project} failed for {framework}. See {logPath} for more details.", logPath);
241241

242242
}
243243
}
@@ -257,16 +257,16 @@ Task("BuildFx")
257257
{
258258
var projectFolder = System.IO.Path.Combine(sourceFolder, project.Name);
259259
var logPath = System.IO.Path.Combine(logFolder, $"{project.Name}-{framework}-build.log");
260+
ExitStatus exitStatus;
260261
using (var logWriter = new StreamWriter(logPath)) {
261-
var exitStatus = Run(dotnetcli, $"build --framework {framework} --configuration {configuration} \"{projectFolder}\"",
262+
exitStatus = Run(dotnetcli, $"build --framework {framework} --configuration {configuration} \"{projectFolder}\"",
262263
new RunOptions
263264
{
264265
StandardOutputWriter = logWriter,
265266
StandardErrorWriter = logWriter
266267
});
267-
268-
ExceptionOnErrorWithLog(exitStatus, $"Building test {project.Name} failed for {framework}. See {logPath} for more details.", logPath);
269268
}
269+
ExceptionOnErrorWithLog(exitStatus, $"Building project {project.Name} failed for {framework}. See {logPath} for more details.", logPath);
270270
}
271271
}
272272
});

‎build.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
"PackageName": "Microsoft.SqlTools.ServiceLayer",
88
"TestProjects": {
99
"Microsoft.SqlTools.ServiceLayer.UnitTests": [
10-
"net8.0"
10+
"net10.0"
1111
],
1212
"Microsoft.SqlTools.Authentication.UnitTests": [
13-
"net8.0"
13+
"net10.0"
1414
],
1515
"Microsoft.SqlTools.ServiceLayer.TestEnvConfig": [
16-
"net8.0"
16+
"net10.0"
1717
],
1818
"Microsoft.SqlTools.ServiceLayer.IntegrationTests": [
19-
"net8.0"
19+
"net10.0"
2020
]
2121
},
2222
"Frameworks": [
23-
"net8.0"
23+
"net10.0"
2424
],
2525
"MainProjects": [
2626
"Microsoft.SqlTools.Credentials",
@@ -34,7 +34,7 @@
3434
"Name": "Microsoft.SqlTools.ManagedBatchParser",
3535
"Frameworks": [
3636
"net472",
37-
"net8.0"
37+
"net10.0"
3838
]
3939
}
4040
],

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.419",
3+
"version": "10.0.105",
44
"rollForward": "latestFeature"
55
},
66
"msbuild-sdks": {

‎packages/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.nuspec‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency id="Newtonsoft.Json" version="13.0.3" />
2020
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" />
2121
</group>
22-
<group targetFramework="net8.0">
22+
<group targetFramework="net10.0">
2323
<dependency id="Azure.Identity" version="1.17.1" />
2424
<dependency id="Microsoft.Data.SqlClient" version="6.1.4" />
2525
<dependency id="Microsoft.SqlServer.SqlManagementObjects" version="181.15.0" />
@@ -44,19 +44,19 @@
4444
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net472\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net472" />
4545
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net472\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net472" />
4646

47-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\de\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\de" />
48-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\es\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\es" />
49-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\fr\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\fr" />
50-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\it\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\it" />
51-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\ja\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\ja" />
52-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\ko\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\ko" />
53-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\pt-br\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\pt-br" />
54-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\ru\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\ru" />
55-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\zh-hans\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\zh-hans" />
56-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\zh-hant\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net8.0\zh-hant" />
47+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\de\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\de" />
48+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\es\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\es" />
49+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\fr\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\fr" />
50+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\it\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\it" />
51+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\ja\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\ja" />
52+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\ko\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\ko" />
53+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\pt-br\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\pt-br" />
54+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\ru\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\ru" />
55+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\zh-hans\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\zh-hans" />
56+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\zh-hant\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net10.0\zh-hant" />
5757

58-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\Microsoft.SqlTools.ManagedBatchParser.dll" target="lib\net8.0" />
59-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net8.0" />
60-
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net8.0\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net8.0" />
58+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\Microsoft.SqlTools.ManagedBatchParser.dll" target="lib\net10.0" />
59+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net10.0" />
60+
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net10.0\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net10.0" />
6161
</files>
6262
</package>

0 commit comments

Comments
 (0)