ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-13 17:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to .Net Core 6.0 SDK (#1344)

Browse Source 
* Bump to SDK 6.0

* Additional .Net 6.0 changes
This commit is contained in:
Karl Burtram
2022-01-05 13:14:21 -08:00
committed by GitHub
parent 740dbe5b02
commit 3a18cb6fc1
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -10,7 +10,7 @@
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path. // If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Microsoft.SqlTools.ServiceLayer/bin/Debug/net5.0/MicrosoftSqlToolsServiceLayer.dll", "program": "${workspaceFolder}/src/Microsoft.SqlTools.ServiceLayer/bin/Debug/net6.0/MicrosoftSqlToolsServiceLayer.dll",
"args": [], "args": [],
"cwd": "${workspaceFolder}/src/Microsoft.SqlTools.ServiceLayer", "cwd": "${workspaceFolder}/src/Microsoft.SqlTools.ServiceLayer",
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
@@ -24,7 +24,7 @@
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path. // If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Microsoft.Kusto.ServiceLayer/bin/Debug/net5.0/MicrosoftKustoServiceLayer.dll", "program": "${workspaceFolder}/src/Microsoft.Kusto.ServiceLayer/bin/Debug/net6.0/MicrosoftKustoServiceLayer.dll",
"args": [], "args": [],
"cwd": "${workspaceFolder}/src/Microsoft.Kusto.ServiceLayer", "cwd": "${workspaceFolder}/src/Microsoft.Kusto.ServiceLayer",
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

6
Directory.Build.props
View File

@@ -5,8 +5,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManagedBatchParserTargetFramework>netstandard2.1</ManagedBatchParserTargetFramework> <ManagedBatchParserTargetFramework>netstandard2.1</ManagedBatchParserTargetFramework>
<CredentialsTargetFramework>net5.0</CredentialsTargetFramework> <CredentialsTargetFramework>net6.0</CredentialsTargetFramework>
<ServiceLayerTargetFramework>net5.0</ServiceLayerTargetFramework> <ServiceLayerTargetFramework>net6.0</ServiceLayerTargetFramework>
<ResourceProviderTargetFramework>net5.0</ResourceProviderTargetFramework> <ResourceProviderTargetFramework>net6.0</ResourceProviderTargetFramework>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
RefreshDllsForTestRun.cmd
View File

@@ -5,8 +5,8 @@ IF [%_BuildConfiguration%] NEQ [] GOTO Start
SET _BuildConfiguration=Debug SET _BuildConfiguration=Debug
:Start :Start
SET _PerfTestSourceLocation="%WORKINGDIR%\test\Microsoft.SqlTools.ServiceLayer.PerfTests\bin\%_BuildConfiguration%\net5.0\win-x64\publish" SET _PerfTestSourceLocation="%WORKINGDIR%\test\Microsoft.SqlTools.ServiceLayer.PerfTests\bin\%_BuildConfiguration%\net6.0\win-x64\publish"
SET _ServiceSourceLocation="%WORKINGDIR%\src\Microsoft.SqlTools.ServiceLayer\bin\%_BuildConfiguration%\net5.0\win-x64\publish" SET _ServiceSourceLocation="%WORKINGDIR%\src\Microsoft.SqlTools.ServiceLayer\bin\%_BuildConfiguration%\net6.0\win-x64\publish"

24
azure-pipelines/build.yml
View File

@@ -149,46 +149,46 @@ steps:
- task: ArchiveFiles@1 - task: ArchiveFiles@1
displayName: 'Archive osx build' displayName: 'Archive osx build'
inputs: inputs:
rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/osx.10.11-x64/net5.0' rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/osx.10.11-x64/net6.0'
includeRootFolder: false includeRootFolder: false
archiveType: tar archiveType: tar
archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-osx-x64-net5.0.tar.gz' archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-osx-x64-net6.0.tar.gz'
- task: ArchiveFiles@1 - task: ArchiveFiles@1
displayName: 'Archive rhel build' displayName: 'Archive rhel build'
inputs: inputs:
rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/rhel.7.2-x64/net5.0' rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/rhel.7.2-x64/net6.0'
includeRootFolder: false includeRootFolder: false
archiveType: tar archiveType: tar
archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-rhel-x64-net5.0.tar.gz' archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-rhel-x64-net6.0.tar.gz'
- task: ArchiveFiles@1 - task: ArchiveFiles@1
displayName: 'Archive windows 64 bit build' displayName: 'Archive windows 64 bit build'
inputs: inputs:
rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win-x64/net5.0' rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win-x64/net6.0'
includeRootFolder: false includeRootFolder: false
archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win-x64-net5.0.zip' archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win-x64-net6.0.zip'
# - task: ArchiveFiles@1 # - task: ArchiveFiles@1
# displayName: 'Archive windows 32 bit build' # displayName: 'Archive windows 32 bit build'
# inputs: # inputs:
# rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win7-x86/net5.0' # rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win7-x86/net6.0'
# includeRootFolder: false # includeRootFolder: false
# archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win-x86-net5.0.zip' # archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win-x86-net6.0.zip'
# - task: ArchiveFiles@1 # - task: ArchiveFiles@1
# displayName: 'Archive windows10 arm 32 bit build' # displayName: 'Archive windows10 arm 32 bit build'
# inputs: # inputs:
# rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win10-arm/net5.0' # rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win10-arm/net6.0'
# includeRootFolder: false # includeRootFolder: false
# archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win10-arm-net5.0.zip' # archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win10-arm-net6.0.zip'
# - task: ArchiveFiles@1 # - task: ArchiveFiles@1
# displayName: 'Archive windows10 arm 64 bit build' # displayName: 'Archive windows10 arm 64 bit build'
# inputs: # inputs:
# rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win10-arm64/net5.0' # rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/win10-arm64/net6.0'
# includeRootFolder: false # includeRootFolder: false
# archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win10-arm64-net5.0.zip' # archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-win10-arm64-net6.0.zip'
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: build archives' displayName: 'Publish Artifact: build archives'

2
azure-pipelines/integrationtests.yml
View File

@@ -31,7 +31,7 @@ steps:
inputs: inputs:
SourceFolder: '$(Agent.TempDirectory)' SourceFolder: '$(Agent.TempDirectory)'
Contents: '**\testsettings.json' Contents: '**\testsettings.json'
TargetFolder: '$(Build.SourcesDirectory)\test\Microsoft.SqlTools.ServiceLayer.IntegrationTests\bin\Debug\net5.0' TargetFolder: '$(Build.SourcesDirectory)\test\Microsoft.SqlTools.ServiceLayer.IntegrationTests\bin\Debug\net6.0'
- task: DotNetCoreCLI@2 - task: DotNetCoreCLI@2
displayName: 'Run integration tests' displayName: 'Run integration tests'

6
build.json
View File

@@ -9,14 +9,14 @@
"PackageName": "Microsoft.SqlTools.ServiceLayer", "PackageName": "Microsoft.SqlTools.ServiceLayer",
"TestProjects": { "TestProjects": {
"Microsoft.SqlTools.ServiceLayer.UnitTests": [ "Microsoft.SqlTools.ServiceLayer.UnitTests": [
"net5.0" "net6.0"
], ],
"Microsoft.Kusto.ServiceLayer.UnitTests": [ "Microsoft.Kusto.ServiceLayer.UnitTests": [
"net5.0" "net6.0"
] ]
}, },
"Frameworks": [ "Frameworks": [
"net5.0" "net6.0"
], ],
"MainProjects": [ "MainProjects": [
"Microsoft.SqlTools.Credentials", "Microsoft.SqlTools.Credentials",

2
docs/samples/jsonrpc/netcore/executequery/jsonrpc.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
global.json
View File

@@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "5.0.301" "version": "6.0.101"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.2.9" "Microsoft.Build.NoTargets": "3.2.9"

2
test/CodeCoverage/codecoverage.bat
View File

@@ -1,6 +1,6 @@
SET WORKINGDIR=%~dp0 SET WORKINGDIR=%~dp0
SET REPOROOT=%WORKINGDIR%..\.. SET REPOROOT=%WORKINGDIR%..\..
SET NET5DIR=net5.0 SET NET5DIR=net6.0
SET SQLTOOLSSERVICE_EXE=%REPOROOT%\src\Microsoft.SqlTools.ServiceLayer\bin\Integration\%NET5DIR%\win-x64\MicrosoftSqlToolsServiceLayer.exe SET SQLTOOLSSERVICE_EXE=%REPOROOT%\src\Microsoft.SqlTools.ServiceLayer\bin\Integration\%NET5DIR%\win-x64\MicrosoftSqlToolsServiceLayer.exe

2
test/Directory.Build.props
View File

@@ -2,6 +2,6 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup> <PropertyGroup>
<TestProjectsTargetFramework>net5.0</TestProjectsTargetFramework> <TestProjectsTargetFramework>net6.0</TestProjectsTargetFramework>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/ServiceTestDriver.cs
View File

@@ -52,7 +52,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Driver
// Include a fallback value to for running tests within visual studio // Include a fallback value to for running tests within visual studio
serviceHostExecutable = serviceHostExecutable =
@"..\..\..\..\..\src\Microsoft.SqlTools.ServiceLayer\bin\Debug\net5.0\win-x64\MicrosoftSqlToolsServiceLayer.exe"; @"..\..\..\..\..\src\Microsoft.SqlTools.ServiceLayer\bin\Debug\net6.0\win-x64\MicrosoftSqlToolsServiceLayer.exe";
if (!File.Exists(serviceHostExecutable)) if (!File.Exists(serviceHostExecutable))
{ {
serviceHostExecutable = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "MicrosoftSqlToolsServiceLayer.exe"); serviceHostExecutable = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "MicrosoftSqlToolsServiceLayer.exe");