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

Update to .NET 7 SDK (#1792)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-02-07 17:53:36 -08:00
committed by GitHub
parent 51892519ef
commit 8d119876d9
62 changed files with 169 additions and 147 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/net6.0/MicrosoftSqlToolsServiceLayer.dll", "program": "${workspaceFolder}/src/Microsoft.SqlTools.ServiceLayer/bin/Debug/net7.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/net6.0/MicrosoftKustoServiceLayer.dll", "program": "${workspaceFolder}/src/Microsoft.Kusto.ServiceLayer/bin/Debug/net7.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

2
Directory.Build.props
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<HighEntropyVA>true</HighEntropyVA> <HighEntropyVA>true</HighEntropyVA>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootDir>$(MSBuildThisFileDirectory)</RootDir> <RootDir>$(MSBuildThisFileDirectory)</RootDir>
<!-- Defaults--> <!-- Defaults-->

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%\net6.0\win-x64\publish" SET _PerfTestSourceLocation="%WORKINGDIR%\test\Microsoft.SqlTools.ServiceLayer.PerfTests\bin\%_BuildConfiguration%\net7.0\win-x64\publish"
SET _ServiceSourceLocation="%WORKINGDIR%\src\Microsoft.SqlTools.ServiceLayer\bin\%_BuildConfiguration%\net6.0\win-x64\publish" SET _ServiceSourceLocation="%WORKINGDIR%\src\Microsoft.SqlTools.ServiceLayer\bin\%_BuildConfiguration%\net7.0\win-x64\publish"

15
azure-pipelines/build.yml
View File

@@ -40,8 +40,17 @@ parameters:
- 'Microsoft.SqlTools.Migration' - 'Microsoft.SqlTools.Migration'
steps: steps:
# .NET Core 2.1 SDK is installed for ESRP Code signing task,
# ESRP currently uses DLL from this path: ~\1.9.111\netcoreapp2.1\esrpcli.dll (found in logs)
# Can be removed once ESRP codesigning task gets an upgrade and a newer SDK DLL is used.
- task: UseDotNet@2 - task: UseDotNet@2
displayName: 'Use defined .NET Core sdk' displayName: 'Use .NET Core 2 sdk'
inputs:
useGlobalJson: false
version: 2.x
- task: UseDotNet@2
displayName: 'Use defined .NET sdk'
inputs: inputs:
useGlobalJson: true useGlobalJson: true
@@ -245,10 +254,10 @@ steps:
- task: ArchiveFiles@1 - task: ArchiveFiles@1
displayName: 'Archive ${{ platform.displayName }} ${{ project }} build' displayName: 'Archive ${{ platform.displayName }} ${{ project }} build'
inputs: inputs:
rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/${{ project }}/${{ platform.name }}/net6.0' rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/${{ project }}/${{ platform.name }}/net7.0'
includeRootFolder: false includeRootFolder: false
archiveType: ${{ platform.archiveType }} archiveType: ${{ platform.archiveType }}
archiveFile: '$(Build.SourcesDirectory)/artifacts/package/${{ project }}-${{ platform.archiveName }}-net6.0.${{ platform.archiveFileFormat }}' archiveFile: '$(Build.SourcesDirectory)/artifacts/package/${{ project }}-${{ platform.archiveName }}-net7.0.${{ platform.archiveFileFormat }}'
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: build archives' displayName: 'Publish Artifact: build archives'

24
azure-pipelines/createBuildDirectories.sh
View File

@@ -13,7 +13,7 @@
# The script need to run from the repo root # The script need to run from the repo root
net6projectArray=( dotnetProjectArray=(
"./src/Microsoft.Kusto.ServiceLayer" "./src/Microsoft.Kusto.ServiceLayer"
"./src/Microsoft.SqlTools.Credentials" "./src/Microsoft.SqlTools.Credentials"
"./src/Microsoft.SqlTools.Hosting" "./src/Microsoft.SqlTools.Hosting"
@@ -34,13 +34,8 @@ net6projectArray=(
"./test/Microsoft.SqlTools.Test.CompletionExtension" "./test/Microsoft.SqlTools.Test.CompletionExtension"
) )
netStandard2ProjectArray=(
"./src/Microsoft.SqlTools.ManagedBatchParser"
)
# Please update the framework vars when updating target framework for the projects # Please update the framework vars when updating target framework for the projects
framework6="/bin/Debug/net6.0/" framework7="/bin/Debug/net7.0/"
framework2="/bin/Debug/netstandard2.1/"
requiredLocDirectories=( requiredLocDirectories=(
"cs" "cs"
@@ -74,24 +69,13 @@ requiredLocDirectories=(
"zh-hant" "zh-hant"
) )
for i in "${net6projectArray[@]}" for i in "${dotnetProjectArray[@]}"
do do
: :
for k in "${requiredLocDirectories[@]}" for k in "${requiredLocDirectories[@]}"
do do
: :
output=`mkdir -v -p $i$framework6$k` output=`mkdir -v -p $i$framework7$k`
echo $output
done
done
for i in "${netStandard2ProjectArray[@]}"
do
:
for k in "${requiredLocDirectories[@]}"
do
:
output=`mkdir -v -p $i$framework2$k`
echo $output echo $output
done done
done done

2
build.cake
View File

@@ -470,7 +470,7 @@ void PublishProject(string packageName, string[] projects)
var publishArguments = "publish"; var publishArguments = "publish";
if (!runtime.Equals("default")) if (!runtime.Equals("default"))
{ {
publishArguments = $"{publishArguments} --runtime {runtime}"; publishArguments = $"{publishArguments} --runtime {runtime} --self-contained";
} }
publishArguments = $"{publishArguments} --framework {framework} --configuration {configuration}"; publishArguments = $"{publishArguments} --framework {framework} --configuration {configuration}";
publishArguments = $"{publishArguments} --output \"{outputFolder}\" \"{projectFolder}\""; publishArguments = $"{publishArguments} --output \"{outputFolder}\" \"{projectFolder}\"";

12
build.json
View File

@@ -9,24 +9,24 @@
"PackageName": "Microsoft.SqlTools.ServiceLayer", "PackageName": "Microsoft.SqlTools.ServiceLayer",
"TestProjects": { "TestProjects": {
"Microsoft.SqlTools.ServiceLayer.UnitTests": [ "Microsoft.SqlTools.ServiceLayer.UnitTests": [
"net6.0" "net7.0"
], ],
"Microsoft.Kusto.ServiceLayer.UnitTests": [ "Microsoft.Kusto.ServiceLayer.UnitTests": [
"net6.0" "net7.0"
], ],
"Microsoft.SqlTools.ServiceLayer.TestEnvConfig": [ "Microsoft.SqlTools.ServiceLayer.TestEnvConfig": [
"net6.0" "net7.0"
], ],
"Microsoft.SqlTools.ServiceLayer.IntegrationTests": [ "Microsoft.SqlTools.ServiceLayer.IntegrationTests": [
"net6.0" "net7.0"
] ]
}, },
"Frameworks": [ "Frameworks": [
"net6.0" "net7.0"
], ],
"FxFrameworks":[ "FxFrameworks":[
"net472", "net472",
"net6.0" "net7.0"
], ],
"MainProjects": [ "MainProjects": [
"Microsoft.SqlTools.Credentials", "Microsoft.SqlTools.Credentials",

2
global.json
View File

@@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "6.0.403", "version": "7.0.101",
"rollForward": "latestFeature" "rollForward": "latestFeature"
}, },
"msbuild-sdks": { "msbuild-sdks": {

28
packages/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.nuspec
View File

@@ -18,7 +18,7 @@
<dependency id="Newtonsoft.Json" version="13.0.2" /> <dependency id="Newtonsoft.Json" version="13.0.2" />
<dependency id="System.Configuration.ConfigurationManager" version="6.0.0" /> <dependency id="System.Configuration.ConfigurationManager" version="6.0.0" />
</group> </group>
<group targetFramework="net6.0"> <group targetFramework="net7.0">
<dependency id="Microsoft.Data.SqlClient" version="5.0.1" /> <dependency id="Microsoft.Data.SqlClient" version="5.0.1" />
<dependency id="Microsoft.SqlServer.SqlManagementObjects" version="170.12.0" /> <dependency id="Microsoft.SqlServer.SqlManagementObjects" version="170.12.0" />
<dependency id="Newtonsoft.Json" version="13.0.2" /> <dependency id="Newtonsoft.Json" version="13.0.2" />
@@ -42,19 +42,19 @@
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net472\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net472" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net472\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net472" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net472\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net472" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net472\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net472" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\de\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\de" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\de\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\de" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\es\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\es" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\es\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\es" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\fr\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\fr" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\fr\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\fr" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\it\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\it" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\it\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\it" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\ja\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\ja" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\ja\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\ja" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\ko\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\ko" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\ko\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\ko" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\pt-br\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\pt-br" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\pt-br\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\pt-br" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\ru\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\ru" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\ru\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\ru" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\zh-hans\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\zh-hans" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\zh-hans\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\zh-hans" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\zh-hant\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net6.0\zh-hant" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\zh-hant\Microsoft.SqlTools.ManagedBatchParser.resources.dll" target="lib\net7.0\zh-hant" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\Microsoft.SqlTools.ManagedBatchParser.dll" target="lib\net6.0" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\Microsoft.SqlTools.ManagedBatchParser.dll" target="lib\net7.0" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net6.0" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\Microsoft.SqlTools.ManagedBatchParser.pdb" target="lib\net7.0" />
<file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net6.0\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net6.0" /> <file src="..\..\artifacts\publish\Microsoft.SqlTools.ServiceLayer\default\net7.0\Microsoft.SqlTools.ManagedBatchParser.xml" target="lib\net7.0" />
</files> </files>
</package> </package>

2
src/Microsoft.Kusto.ServiceLayer/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

2
src/Microsoft.Kusto.ServiceLayer/Microsoft.Kusto.ServiceLayer.csproj
View File

@@ -14,6 +14,8 @@
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers> <RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);SYSLIB1045;CA1311;CA1854</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

5
src/Microsoft.Kusto.ServiceLayer/Program.cs
View File

@@ -8,6 +8,7 @@ using Microsoft.SqlTools.ServiceLayer.SqlContext;
using Microsoft.Kusto.ServiceLayer.Utility; using Microsoft.Kusto.ServiceLayer.Utility;
using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.Utility;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks;
namespace Microsoft.Kusto.ServiceLayer namespace Microsoft.Kusto.ServiceLayer
{ {
@@ -21,7 +22,7 @@ namespace Microsoft.Kusto.ServiceLayer
/// <summary> /// <summary>
/// Main entry point into the SQL Tools API Service Layer /// Main entry point into the SQL Tools API Service Layer
/// </summary> /// </summary>
internal static void Main(string[] args) internal static async Task Main(string[] args)
{ {
try try
{ {
@@ -54,7 +55,7 @@ namespace Microsoft.Kusto.ServiceLayer
ProcessExitTimer.Start(commandOptions.ParentProcessId.Value); ProcessExitTimer.Start(commandOptions.ParentProcessId.Value);
} }
serviceHost.WaitForExit(); await serviceHost.WaitForExitAsync();
} }
catch (Exception e) catch (Exception e)
{ {

2
src/Microsoft.Kusto.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs
View File

@@ -73,7 +73,7 @@ namespace Microsoft.Kusto.ServiceLayer.QueryExecution.DataStorage
/// <returns></returns> /// <returns></returns>
public Task<bool> ReadAsync(CancellationToken cancellationToken) public Task<bool> ReadAsync(CancellationToken cancellationToken)
{ {
return Task.Run(() => DataReader.Read()); return Task.Run(DataReader.Read);
} }
/// <summary> /// <summary>

2
src/Microsoft.SqlTools.Credentials/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

2
src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
View File

@@ -13,6 +13,8 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers> <RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);SYSLIB1054</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" Exclude="**/obj/**/*.cs" /> <Compile Include="**\*.cs" Exclude="**/obj/**/*.cs" />

5
src/Microsoft.SqlTools.Credentials/Program.cs
View File

@@ -4,6 +4,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks;
using Microsoft.SqlTools.Credentials.Utility; using Microsoft.SqlTools.Credentials.Utility;
using Microsoft.SqlTools.ServiceLayer.SqlContext; using Microsoft.SqlTools.ServiceLayer.SqlContext;
using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.Utility;
@@ -20,7 +21,7 @@ namespace Microsoft.SqlTools.Credentials
/// <summary> /// <summary>
/// Main entry point into the Credentials Service Host /// Main entry point into the Credentials Service Host
/// </summary> /// </summary>
internal static void Main(string[] args) internal static async Task Main(string[] args)
{ {
try try
{ {
@@ -48,7 +49,7 @@ namespace Microsoft.SqlTools.Credentials
SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails); SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails);
UtilityServiceHost serviceHost = HostLoader.CreateAndStartServiceHost(sqlToolsContext); UtilityServiceHost serviceHost = HostLoader.CreateAndStartServiceHost(sqlToolsContext);
serviceHost.WaitForExit(); await serviceHost.WaitForExitAsync();
} }
catch (Exception e) catch (Exception e)
{ {

6
src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs
View File

@@ -112,7 +112,7 @@ namespace Microsoft.SqlTools.Extensibility
if (!services.ContainsKey(typeof(T))) if (!services.ContainsKey(typeof(T)))
{ {
ExtensionStore store = new ExtensionStore(typeof(T), config); ExtensionStore store = new ExtensionStore(typeof(T), config);
base.Register<T>(() => store.GetExports<T>()); base.Register<T>(store.GetExports<T>);
} }
} }
@@ -136,11 +136,11 @@ namespace Microsoft.SqlTools.Extensibility
// If the service type is already registered, replace the existing registration with the new one // If the service type is already registered, replace the existing registration with the new one
if (this.services.ContainsKey(typeof(T))) if (this.services.ContainsKey(typeof(T)))
{ {
this.services[typeof(T)] = () => store.GetExports<T>(); this.services[typeof(T)] = store.GetExports<T>;
} }
else else
{ {
base.Register<T>(() => store.GetExports<T>()); base.Register<T>(store.GetExports<T>);
} }
} }

4
src/Microsoft.SqlTools.Hosting/Hosting/Protocol/ProtocolEndpoint.cs
View File

@@ -119,10 +119,10 @@ namespace Microsoft.SqlTools.Hosting.Protocol
} }
} }
public void WaitForExit() public async Task WaitForExitAsync()
{ {
this.endpointExitedTask = new TaskCompletionSource<bool>(); this.endpointExitedTask = new TaskCompletionSource<bool>();
this.endpointExitedTask.Task.Wait(); await this.endpointExitedTask.Task.WaitAsync(CancellationToken.None);
} }
public async Task Stop() public async Task Stop()

2
src/Microsoft.SqlTools.Hosting/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

3
src/Microsoft.SqlTools.Hosting/Utility/ConcurrentCache.cs
View File

@@ -22,13 +22,10 @@ namespace Microsoft.SqlTools.Utility
{ {
{ {
foreach (var key in keys) foreach (var key in keys)
{
if (_cache.ContainsKey(key))
{ {
_cache.Remove(key); _cache.Remove(key);
} }
} }
}
}, out exception); }, out exception);
if (exception != null) if (exception != null)
{ {

2
src/Microsoft.SqlTools.Hosting/Utility/GeneralRequestDetails.cs
View File

@@ -19,6 +19,7 @@ namespace Microsoft.SqlTools.Utility
public T GetOptionValue<T>(string name, T defaultValue = default(T)) public T GetOptionValue<T>(string name, T defaultValue = default(T))
{ {
#pragma warning disable CA1854
T result = defaultValue; T result = defaultValue;
if (Options != null && Options.ContainsKey(name)) if (Options != null && Options.ContainsKey(name))
{ {
@@ -34,6 +35,7 @@ namespace Microsoft.SqlTools.Utility
"Cannot convert option value {0}:{1} to {2}", name, value ?? "", typeof(T))); "Cannot convert option value {0}:{1} to {2}", name, value ?? "", typeof(T)));
} }
} }
#pragma warning restore CA1854
return result; return result;
} }

3
src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs
View File

@@ -88,12 +88,9 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode
} }
if (value == null) if (value == null)
{
if (internalVariables.ContainsKey(name))
{ {
internalVariables.Remove(name); internalVariables.Remove(name);
} }
}
else else
{ {
internalVariables[name] = value; internalVariables[name] = value;

2
src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/PositionStruct.cs
View File

@@ -8,7 +8,7 @@ using System;
namespace Microsoft.SqlTools.ServiceLayer.BatchParser namespace Microsoft.SqlTools.ServiceLayer.BatchParser
{ {
[Serializable] [Serializable]
public struct PositionStruct public readonly struct PositionStruct
{ {
private readonly int line; private readonly int line;
private readonly int column; private readonly int column;

2
src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

8
src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<!-- Targeting both net6.0 and net472 so that other things such as PS cmdlets can use this which need to support a wider range of machines --> <!-- Targeting both net7.0 and net472 so that other things such as PS cmdlets can use this which need to support a wider range of machines -->
<TargetFrameworks>net6.0;net472</TargetFrameworks> <TargetFrameworks>net7.0;net472</TargetFrameworks>
<LangVersion>9.0</LangVersion> <LangVersion>9.0</LangVersion>
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
<AssemblyName>Microsoft.SqlTools.ManagedBatchParser</AssemblyName> <AssemblyName>Microsoft.SqlTools.ManagedBatchParser</AssemblyName>
@@ -13,6 +13,8 @@
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems> <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention> <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
<Product>Microsoft SqlTools Managed batch parser</Product> <Product>Microsoft SqlTools Managed batch parser</Product>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);CA1852</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" /> <PackageReference Include="Microsoft.Data.SqlClient" />
@@ -25,7 +27,7 @@
<EmbeddedResource Include="Localization\*.resx" /> <EmbeddedResource Include="Localization\*.resx" />
<None Include="Localization\sr.strings" /> <None Include="Localization\sr.strings" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net6.0'"> <ItemGroup Condition="$(TargetFramework) == 'net7.0'">
<InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.UnitTests" /> <InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.UnitTests" />
<InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.IntegrationTests" /> <InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.IntegrationTests" />
<InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.Test.Common" /> <InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.Test.Common" />

2
src/Microsoft.SqlTools.Migration/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

5
src/Microsoft.SqlTools.Migration/Program.cs
View File

@@ -10,6 +10,7 @@ using System.IO;
using System.Diagnostics; using System.Diagnostics;
using Microsoft.SqlTools.Extensibility; using Microsoft.SqlTools.Extensibility;
using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.Utility;
using System.Threading.Tasks;
namespace Microsoft.SqlTools.Migration namespace Microsoft.SqlTools.Migration
{ {
@@ -17,7 +18,7 @@ namespace Microsoft.SqlTools.Migration
{ {
private const string ServiceName = "MicrosoftSqlToolsMigration.exe"; private const string ServiceName = "MicrosoftSqlToolsMigration.exe";
internal static void Main(string[] args) internal static async Task Main(string[] args)
{ {
try try
{ {
@@ -51,7 +52,7 @@ namespace Microsoft.SqlTools.Migration
}); });
serviceHost.RegisterAndInitializeService(new MigrationService()); serviceHost.RegisterAndInitializeService(new MigrationService());
serviceHost.WaitForExit(); await serviceHost.WaitForExitAsync();
Logger.Verbose("SqlTools Migration Server exiting...."); Logger.Verbose("SqlTools Migration Server exiting....");
} }
catch (Exception ex) catch (Exception ex)

2
src/Microsoft.SqlTools.Migration/Utils/ExtensionMethods.cs
View File

@@ -23,7 +23,7 @@ namespace Microsoft.SqlTools.Migration.Utils
foreach (var keyValuePair2 in exceptionMap2) foreach (var keyValuePair2 in exceptionMap2)
{ {
// If the dictionary already contains the key then merge them // If the dictionary already contains the key then merge them
if (exceptionMap1.ContainsKey(keyValuePair2.Key)) if (exceptionMap1.TryGetValue(keyValuePair2.Key, out _))
{ {
foreach (var value in keyValuePair2.Value) foreach (var value in keyValuePair2.Value)
{ {

2
src/Microsoft.SqlTools.ResourceProvider.Core/Firewall/FirewallErrorParser.cs
View File

@@ -69,10 +69,12 @@ namespace Microsoft.SqlTools.ResourceProvider.Core.Firewall
clientIp = null; clientIp = null;
try try
{ {
#pragma warning disable SYSLIB1045
Regex regex = Regex regex =
new Regex( new Regex(
@"\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b", @"\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b",
RegexOptions.IgnoreCase); RegexOptions.IgnoreCase);
#pragma warning restore SYSLIB1045
Match match = regex.Match(message); Match match = regex.Match(message);
if (match.Success) if (match.Success)

2
src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

2
src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

2
src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj
View File

@@ -10,6 +10,8 @@
<StartupObject /> <StartupObject />
<Description>Provides the default for SqlTools applications.</Description> <Description>Provides the default for SqlTools applications.</Description>
<Copyright><EFBFBD> Microsoft Corporation. All rights reserved.</Copyright> <Copyright><EFBFBD> Microsoft Corporation. All rights reserved.</Copyright>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);CA1852</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" /> <PackageReference Include="Microsoft.Azure.Management.ResourceManager" />

2
src/Microsoft.SqlTools.ResourceProvider/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

2
src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj
View File

@@ -12,6 +12,8 @@
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems> <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention> <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
<RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers> <RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);CA1852</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETCOREAPP1_0;NETCOREAPP2_0</DefineConstants> <DefineConstants>TRACE;DEBUG;NETCOREAPP1_0;NETCOREAPP2_0</DefineConstants>

5
src/Microsoft.SqlTools.ResourceProvider/Program.cs
View File

@@ -7,6 +7,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.SqlContext; using Microsoft.SqlTools.ServiceLayer.SqlContext;
using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.Utility;
@@ -22,7 +23,7 @@ namespace Microsoft.SqlTools.ResourceProvider
/// <summary> /// <summary>
/// Main entry point into the Credentials Service Host /// Main entry point into the Credentials Service Host
/// </summary> /// </summary>
internal static void Main(string[] args) internal static async Task Main(string[] args)
{ {
try try
{ {
@@ -52,7 +53,7 @@ namespace Microsoft.SqlTools.ResourceProvider
SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails); SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails);
UtilityServiceHost serviceHost = ResourceProviderHostLoader.CreateAndStartServiceHost(sqlToolsContext); UtilityServiceHost serviceHost = ResourceProviderHostLoader.CreateAndStartServiceHost(sqlToolsContext);
serviceHost.WaitForExit(); await serviceHost.WaitForExitAsync();
} }
catch (Exception e) catch (Exception e)
{ {

2
src/Microsoft.SqlTools.ServiceLayer/DacFx/GetObjectsFromTSqlModelOperation.cs
View File

@@ -36,7 +36,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DacFx
{ {
try try
{ {
var filters = Parameters.ObjectTypes.Select(t => MapType(t)).ToArray(); var filters = Parameters.ObjectTypes.Select(MapType).ToArray();
var objects = Model.GetObjects(DacQueryScopes.UserDefined, filters).ToList(); var objects = Model.GetObjects(DacQueryScopes.UserDefined, filters).ToList();
return objects.Select(o => new TSqlObjectInfo return objects.Select(o => new TSqlObjectInfo

4
src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ExecutionPlanGraphUtils.cs
View File

@@ -81,8 +81,8 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
Subtext = currentNode.GetDisplayLinesOfText(true), Subtext = currentNode.GetDisplayLinesOfText(true),
RelativeCost = currentNode.RelativeCost, RelativeCost = currentNode.RelativeCost,
Properties = GetProperties(currentNode.Properties), Properties = GetProperties(currentNode.Properties),
Children = currentNode.Children.Select(x => ConvertShowPlanTreeToExecutionPlanTree(x)).ToList(), Children = currentNode.Children.Select(ConvertShowPlanTreeToExecutionPlanTree).ToList(),
Edges = currentNode.Edges.Select(x => ConvertShowPlanEdgeToExecutionPlanEdge(x)).ToList(), Edges = currentNode.Edges.Select(ConvertShowPlanEdgeToExecutionPlanEdge).ToList(),
Badges = GenerateNodeOverlay(currentNode), Badges = GenerateNodeOverlay(currentNode),
Name = currentNode.DisplayName, Name = currentNode.DisplayName,
ElapsedTimeInMs = currentNode.ElapsedTimeInMs, ElapsedTimeInMs = currentNode.ElapsedTimeInMs,

2
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
View File

@@ -599,7 +599,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
{ {
if (currentList != null && if (currentList != null &&
token != null && !string.IsNullOrWhiteSpace(token.Text) && token != null && !string.IsNullOrWhiteSpace(token.Text) &&
token.Text.All(ch => char.IsLetter(ch)) && token.Text.All(char.IsLetter) &&
currentList.All(x => string.Compare(x.Label, token.Text, true) != 0 currentList.All(x => string.Compare(x.Label, token.Text, true) != 0
)) ))
{ {

2
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
View File

@@ -1,5 +1,5 @@
// WARNING: // WARNING:
// This file was generated by the Microsoft DataWarehouse String Resource Tool 6.0.0.0 // This file was generated by the Microsoft DataWarehouse String Resource Tool 7.0.0.0
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //

2
src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
View File

@@ -13,6 +13,8 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers> <RuntimeIdentifiers>$(ToolsServiceTargetRuntimes)</RuntimeIdentifiers>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);SYSLIB1045;CA1311;CA1854;CS8600;CS8603;CS8625</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

2
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs
View File

@@ -63,7 +63,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
public ObjectExplorerService() public ObjectExplorerService()
{ {
sessionMap = new ConcurrentDictionary<string, ObjectExplorerSession>(); sessionMap = new ConcurrentDictionary<string, ObjectExplorerSession>();
applicableNodeChildFactories = new Lazy<Dictionary<string, HashSet<ChildFactory>>>(() => PopulateFactories()); applicableNodeChildFactories = new Lazy<Dictionary<string, HashSet<ChildFactory>>>(PopulateFactories);
NodePathGenerator.Initialize(); NodePathGenerator.Initialize();
} }

2
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoChildFactoryBase.cs
View File

@@ -118,7 +118,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
return; return;
} }
IEnumerable<SmoQuerier> queriers = context.ServiceProvider.GetServices<SmoQuerier>(q => IsCompatibleQuerier(q)); IEnumerable<SmoQuerier> queriers = context.ServiceProvider.GetServices<SmoQuerier>(IsCompatibleQuerier);
var filters = this.Filters.ToList(); var filters = this.Filters.ToList();
var smoProperties = this.SmoProperties.Where(p => ServerVersionHelper.IsValidFor(serverValidFor, p.ValidFor)).Select(x => x.Name); var smoProperties = this.SmoProperties.Where(p => ServerVersionHelper.IsValidFor(serverValidFor, p.ValidFor)).Select(x => x.Name);
if (!string.IsNullOrEmpty(name)) if (!string.IsNullOrEmpty(name))

5
src/Microsoft.SqlTools.ServiceLayer/Program.cs
View File

@@ -11,6 +11,7 @@ using Microsoft.SqlTools.ServiceLayer.SqlContext;
using Microsoft.SqlTools.ServiceLayer.Utility; using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Utility; using Microsoft.SqlTools.Utility;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks;
namespace Microsoft.SqlTools.ServiceLayer namespace Microsoft.SqlTools.ServiceLayer
{ {
@@ -22,7 +23,7 @@ namespace Microsoft.SqlTools.ServiceLayer
/// <summary> /// <summary>
/// Main entry point into the SQL Tools API Service Layer /// Main entry point into the SQL Tools API Service Layer
/// </summary> /// </summary>
internal static void Main(string[] args) internal static async Task Main(string[] args)
{ {
SqlClientListener? sqlClientListener = null; SqlClientListener? sqlClientListener = null;
try try
@@ -61,7 +62,7 @@ namespace Microsoft.SqlTools.ServiceLayer
ProcessExitTimer.Start(commandOptions.ParentProcessId.Value); ProcessExitTimer.Start(commandOptions.ParentProcessId.Value);
} }
serviceHost.WaitForExit(); await serviceHost.WaitForExitAsync();
} }
catch (Exception ex) catch (Exception ex)
{ {

2
src/Microsoft.SqlTools.ServiceLayer/TaskServices/SqlTask.cs
View File

@@ -231,7 +231,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TaskServices
//Run Task synchronously //Run Task synchronously
public void Run() public void Run()
{ {
Task.Run(() => RunAsync()); Task.Run(RunAsync);
} }
/// <summary> /// <summary>

2
test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs
View File

@@ -12,7 +12,7 @@ using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode;
namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
{ {
internal class BatchParserMockEventHandler : IBatchEventsHandler public class BatchParserMockEventHandler : IBatchEventsHandler
{ {
public SqlError Error { get; private set; } public SqlError Error { get; private set; }

12
test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/BatchParserTests.cs
View File

@@ -54,7 +54,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
p.ThrowOnUnresolvedVariable = true; p.ThrowOnUnresolvedVariable = true;
handler.SetParser(p); handler.SetParser(p);
Assert.Throws<BatchParserException>(() => p.Parse()); Assert.Throws<BatchParserException>(p.Parse);
} }
} }
@@ -77,7 +77,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
{ {
p.ThrowOnUnresolvedVariable = true; p.ThrowOnUnresolvedVariable = true;
handler.SetParser(p); handler.SetParser(p);
Assert.Throws<BatchParserException>(() => p.Parse()); Assert.Throws<BatchParserException>(p.Parse);
} }
} }
@@ -98,7 +98,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
{ {
p.ThrowOnUnresolvedVariable = true; p.ThrowOnUnresolvedVariable = true;
handler.SetParser(p); handler.SetParser(p);
Assert.Throws<BatchParserException>(() => p.Parse()); Assert.Throws<BatchParserException>(p.Parse);
} }
} }
@@ -119,7 +119,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
{ {
p.ThrowOnUnresolvedVariable = true; p.ThrowOnUnresolvedVariable = true;
handler.SetParser(p); handler.SetParser(p);
Assert.Throws<BatchParserException>(() => p.Parse()); Assert.Throws<BatchParserException>(p.Parse);
} }
} }
@@ -142,7 +142,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
handler.SetParser(p); handler.SetParser(p);
// This test will fail because we are passing invalid number. // This test will fail because we are passing invalid number.
// Exception will be raised from ParseGo() // Exception will be raised from ParseGo()
Assert.Throws<BatchParserException>(() => p.Parse()); Assert.Throws<BatchParserException>(p.Parse);
} }
} }
@@ -248,7 +248,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
p.ThrowOnUnresolvedVariable = true; p.ThrowOnUnresolvedVariable = true;
handler.SetParser(p); handler.SetParser(p);
var exception = Assert.Throws<BatchParserException>(() => p.Parse()); var exception = Assert.Throws<BatchParserException>(p.Parse);
// Verify the message should be "Command Execute is not supported." // Verify the message should be "Command Execute is not supported."
Assert.AreEqual("Command Execute is not supported.", exception.Message); Assert.AreEqual("Command Execute is not supported.", exception.Message);
} }

2
test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/TestCommandHandler.cs
View File

@@ -13,7 +13,7 @@ using Microsoft.SqlTools.ServiceLayer.BatchParser;
namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser
{ {
internal class TestCommandHandler : ICommandHandler public class TestCommandHandler : ICommandHandler
{ {
private Parser parser; private Parser parser;
private StringBuilder outputString; private StringBuilder outputString;

2
test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/BatchEventHandler.cs
View File

@@ -12,7 +12,7 @@ using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode;
namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.TSQLExecutionEngine namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.TSQLExecutionEngine
{ {
internal class BatchEventHandler : IBatchEventsHandler public class BatchEventHandler : IBatchEventsHandler
{ {
private List<int> resultCounts = new List<int>(); private List<int> resultCounts = new List<int>();
private List<string> sqlMessages = new List<string>(); private List<string> sqlMessages = new List<string>();

2
test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs
View File

@@ -14,7 +14,7 @@ using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.TSQLExecutionEngine namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.TSQLExecutionEngine
{ {
internal class TestExecutor : IDisposable public class TestExecutor : IDisposable
{ {
#region Private variables #region Private variables

2
test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Utility/FileUtilities.cs
View File

@@ -9,7 +9,7 @@ using System.IO;
namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.Utility namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.Utility
{ {
internal class FileUtilities public class FileUtilities
{ {
/// <summary> /// <summary>
/// Turns off the read-only attribute for this file /// Turns off the read-only attribute for this file

2
test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
View File

@@ -6,6 +6,8 @@
<PackageId>Microsoft.SqlTools.ServiceLayer.IntegrationTests</PackageId> <PackageId>Microsoft.SqlTools.ServiceLayer.IntegrationTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants> <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);SYSLIB1045;IDE0200;IDE0230;CA1311;CA1852;CA1854</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../../src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj" /> <ProjectReference Include="../../src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj" />

2
test/Microsoft.SqlTools.ServiceLayer.Test.Common/ComparisonFailureException.cs
View File

@@ -9,7 +9,7 @@ using System;
namespace Microsoft.SqlTools.ServiceLayer.Test.Common namespace Microsoft.SqlTools.ServiceLayer.Test.Common
{ {
internal class ComparisonFailureException : InvalidOperationException internal sealed class ComparisonFailureException : InvalidOperationException
{ {
internal string FullMessageWithDiff { get; private set; } internal string FullMessageWithDiff { get; private set; }
internal string EditAndCopyMessage { get; private set; } internal string EditAndCopyMessage { get; private set; }

4
test/Microsoft.SqlTools.ServiceLayer.Test.Common/RequestContextMocking/EventFlowValidator.cs
View File

@@ -180,14 +180,14 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking
Event Event
} }
private class ExpectedEvent private sealed class ExpectedEvent
{ {
public EventTypes EventType { get; set; } public EventTypes EventType { get; set; }
public Type ParamType { get; set; } public Type ParamType { get; set; }
public Delegate Validator { get; set; } public Delegate Validator { get; set; }
} }
private class ReceivedEvent private sealed class ReceivedEvent
{ {
public object EventObject { get; set; } public object EventObject { get; set; }
public EventTypes EventType { get; set; } public EventTypes EventType { get; set; }

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

@@ -45,7 +45,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\net6.0\win-x64\MicrosoftSqlToolsServiceLayer.exe"; @"..\..\..\..\..\src\Microsoft.SqlTools.ServiceLayer\bin\Debug\net7.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");

2
test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Program.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
namespace Microsoft.SqlTools.ServiceLayer.TestEnvConfig namespace Microsoft.SqlTools.ServiceLayer.TestEnvConfig
{ {
class Program sealed class Program
{ {
[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0210:Convert to top-level statements", Justification = "Structure retained for readability.")] [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0210:Convert to top-level statements", Justification = "Structure retained for readability.")]
static void Main(string[] args) static void Main(string[] args)

2
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
View File

@@ -6,6 +6,8 @@
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<!-- TODO FIX THESE WARNINGS ASAP -->
<NoWarn>$(NoWarn);SYSLIB1045;IDE0200;IDE0230;CA1311;CA1852;CA1854</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" /> <PackageReference Include="System.Text.Encoding.CodePages" />

28
test/ScriptGenerator/Program.cs
View File

@@ -11,21 +11,20 @@ using System.Text.RegularExpressions;
namespace ScriptGenerator namespace ScriptGenerator
{ {
public partial class Program
class Program
{ {
internal const string DefaultFileExtension = "Sql"; internal const string DefaultFileExtension = "Sql";
static readonly Regex ExtractDbName = new Regex(@"CREATE\s+DATABASE\s+\[(?<dbName>\w+)\]", RegexOptions.Compiled | RegexOptions.IgnoreCase); static readonly Regex ExtractDbName = CreateDbRegex();
static readonly Regex CreateTableRegex = new Regex(@"(?<begin>CREATE\s+TABLE\s+.*)(?<middle>\](?![\.])[\s\S]*?CONSTRAINT\s+\[\w+?)(?<end>\](?![\.]))", RegexOptions.Compiled | RegexOptions.IgnoreCase); static readonly Regex CreateTableRegex = CreateTableSyntaxRegex();
static readonly Regex AlterTableConstraintRegex = new Regex(@"(?<begin>ALTER\s+TABLE\s+.*?)(?<middle>\](?![\.])\s*\b(?:ADD|WITH|CHECK)\b[\s\S]*?CONSTRAINT\s+\[\w+?)(?<end>\](?![\.]))", RegexOptions.Compiled | RegexOptions.IgnoreCase); static readonly Regex AlterTableConstraintRegex = AlterTableSyntaxRegex();
static readonly Regex CreateViewRegex = new Regex(@"(?<begin>CREATE\s+VIEW\s+.*?)(?<end>\](?![\.])[\s\S]*?\bAS\b)", RegexOptions.Compiled | RegexOptions.IgnoreCase ); static readonly Regex CreateViewRegex = CreateViewSyntaxRegex();
static readonly Regex CreateProcedureRegex = new Regex(@"(?<begin>CREATE\s+PROCEDURE\s+.*?)(?<end>\](?![\.])[\s\S]*?(?:@|WITH|AS))", RegexOptions.Compiled | RegexOptions.IgnoreCase); static readonly Regex CreateProcedureRegex = CreateProcedureSyntaxRegex();
static void Main(string[] args) static void Main(string[] args)
{ {
CommandOptions options = new CommandOptions(args); var options = new CommandOptions(args);
for (int d = 1; d <= options.Databases; d++) for (int d = 1; d <= options.Databases; d++)
{ {
using (StreamWriter writer = new StreamWriter(Path.ChangeExtension($@"{options.FilePathPrefix}{d}", DefaultFileExtension))) using (var writer = new StreamWriter(Path.ChangeExtension($@"{options.FilePathPrefix}{d}", DefaultFileExtension)))
{ {
string oldDbName = ExtractDbName.Match(Resources.AdventureWorks).Groups["dbName"].Value; string oldDbName = ExtractDbName.Match(Resources.AdventureWorks).Groups["dbName"].Value;
string newDbName = $@"{oldDbName}{d}"; string newDbName = $@"{oldDbName}{d}";
@@ -59,5 +58,16 @@ namespace ScriptGenerator
} }
} }
} }
[GeneratedRegex("CREATE\\s+DATABASE\\s+\\[(?<dbName>\\w+)\\]", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-CA")]
private static partial Regex CreateDbRegex();
[GeneratedRegex("(?<begin>CREATE\\s+TABLE\\s+.*)(?<middle>\\](?![\\.])[\\s\\S]*?CONSTRAINT\\s+\\[\\w+?)(?<end>\\](?![\\.]))", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-CA")]
private static partial Regex CreateTableSyntaxRegex();
[GeneratedRegex("(?<begin>ALTER\\s+TABLE\\s+.*?)(?<middle>\\](?![\\.])\\s*\\b(?:ADD|WITH|CHECK)\\b[\\s\\S]*?CONSTRAINT\\s+\\[\\w+?)(?<end>\\](?![\\.]))", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-CA")]
private static partial Regex AlterTableSyntaxRegex();
[GeneratedRegex("(?<begin>CREATE\\s+VIEW\\s+.*?)(?<end>\\](?![\\.])[\\s\\S]*?\\bAS\\b)", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-CA")]
private static partial Regex CreateViewSyntaxRegex();
[GeneratedRegex("(?<begin>CREATE\\s+PROCEDURE\\s+.*?)(?<end>\\](?![\\.])[\\s\\S]*?(?:@|WITH|AS))", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-CA")]
private static partial Regex CreateProcedureSyntaxRegex();
} }
} }