mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-02-01 01:25:43 -05:00
Upgrade to .Net Core 6.0 SDK (#1344)
* Bump to SDK 6.0 * Additional .Net 6.0 changes
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
SET WORKINGDIR=%~dp0
|
||||
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
|
||||
|
||||
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TestProjectsTargetFramework>net5.0</TestProjectsTargetFramework>
|
||||
<TestProjectsTargetFramework>net6.0</TestProjectsTargetFramework>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -52,7 +52,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Driver
|
||||
|
||||
// Include a fallback value to for running tests within visual studio
|
||||
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))
|
||||
{
|
||||
serviceHostExecutable = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "MicrosoftSqlToolsServiceLayer.exe");
|
||||
|
||||
Reference in New Issue
Block a user