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

Updating SQL Projects nuget dependency (#2253)

Browse Source 
* Updating SQL Projects nuget dependency

* Bumping nuget version

* Adding missed swapover
This commit is contained in:
Benjin Dubishar
2023-09-29 13:04:14 -07:00
committed by GitHub
parent 138a70efa0
commit c7857c249c
7 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Packages.props
View File

@@ -29,7 +29,7 @@
<PackageReference Update="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="1.1.1" />
<PackageReference Update="Microsoft.SqlServer.Management.SmoMetadataProvider" Version="170.18.0" />
<PackageReference Update="Microsoft.SqlServer.DacFx" Version="162.1.153-preview" />
<PackageReference Update="Microsoft.SqlServer.DacFx.Projects" Version="0.1.14-preview" />
<PackageReference Update="Microsoft.SqlServer.DacFx.Projects" Version="0.2.2-preview" />
<PackageReference Update="Microsoft.Azure.Kusto.Data" Version="9.0.4" />
<PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4" />
<PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.1.17]" />

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

@@ -11388,6 +11388,11 @@ namespace Microsoft.SqlTools.ServiceLayer
return Keys.GetString(Keys.PropertyNotInitialized, propertyName);
}
public static string InvalidDspFormatError(string dsp)
{
return Keys.GetString(Keys.InvalidDspFormatError, dsp);
}
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Keys
{
@@ -15758,6 +15763,9 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string PropertyNotInitialized = "PropertyNotInitialized";
public const string InvalidDspFormatError = "InvalidDspFormatError";
private Keys()
{ }

5
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
View File

@@ -6028,4 +6028,9 @@ The Query Processor estimates that implementing the following index could improv
<comment>.
Parameters: 0 - propertyName (string) </comment>
</data>
<data name="InvalidDspFormatError" xml:space="preserve">
<value>Invalid value for Database Schema Provider: &apos;{0}&apos;; expected to be in the form &apos;Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider&apos;.</value>
<comment>.
Parameters: 0 - dsp (string) </comment>
</data>
</root>

8
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
View File

@@ -2426,5 +2426,9 @@ HyperscaleAzureEdition = Hyperscale
#############################################################################
# Server Properties
############################################################################
PropertyNotInitialized(string propertyName) = Property '{0}' was set before initialization.
PropertyNotInitialized(string propertyName) = Property '{0}' was set before initialization.
#############################################################################
# SqlProjects
InvalidDspFormatError(string dsp) = Invalid value for Database Schema Provider: '{0}'; expected to be in the form 'Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider'.

6
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
View File

@@ -7364,6 +7364,12 @@ The Query Processor estimates that implementing the following index could improv
<target state="new">7 Days</target>
<note></note>
</trans-unit>
<trans-unit id="InvalidDspFormatError">
<source>Invalid value for Database Schema Provider: '{0}'; expected to be in the form 'Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider'.</source>
<target state="new">Invalid value for Database Schema Provider: '{0}'; expected to be in the form 'Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider'.</target>
<note>.
Parameters: 0 - dsp (string) </note>
</trans-unit>
</body>
</file>
</xliff>

11
src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs
View File

@@ -117,7 +117,14 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects
{
await RunWithErrorHandling(async () =>
{
await SqlProject.CreateProjectAsync(requestParams.ProjectUri, new SqlServer.Dac.Projects.CreateSqlProjectParams() { ProjectType = requestParams.SqlProjectType, DspVersion = requestParams.DatabaseSchemaProvider });
SqlServer.Dac.Projects.CreateSqlProjectParams createParams = new()
{
ProjectType = requestParams.SqlProjectType,
TargetPlatform = requestParams.DatabaseSchemaProvider == null ? null : Utilities.DatabaseSchemaProviderToSqlPlatform(requestParams.DatabaseSchemaProvider),
BuildSdkVersion = requestParams.BuildSdkVersion
};
await SqlProject.CreateProjectAsync(requestParams.ProjectUri, createParams);
this.GetProject(requestParams.ProjectUri); // load into the cache
}, requestContext);
}
@@ -169,7 +176,7 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects
internal async Task HandleSetDatabaseSchemaProviderRequest(SetDatabaseSchemaProviderParams requestParams, RequestContext<ResultStatus> requestContext)
{
await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri, onlyLoadProperties: true).Properties.DatabaseSchemaProvider = requestParams.DatabaseSchemaProvider, requestContext);
await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri, onlyLoadProperties: true).Properties.TargetSqlPlatform = Utilities.DatabaseSchemaProviderToSqlPlatform(requestParams.DatabaseSchemaProvider), requestContext);
}
#endregion

7
test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs
View File

@@ -7,6 +7,7 @@ using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Data.Tools.Schema.SchemaModel;
using Microsoft.SqlServer.Dac.Projects;
using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
using Microsoft.SqlTools.ServiceLayer.SqlProjects;
@@ -62,13 +63,17 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
await service.HandleCreateSqlProjectRequest(new ServiceLayer.SqlProjects.Contracts.CreateSqlProjectParams()
{
ProjectUri = sdkProjectUri,
SqlProjectType = ProjectType.SdkStyle
SqlProjectType = ProjectType.SdkStyle,
DatabaseSchemaProvider = "Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider", // non-default DSP
BuildSdkVersion = "0.1.7-preview" // non-default (old) SDK version
}, requestMock.Object);
requestMock.AssertSuccess(nameof(service.HandleCreateSqlProjectRequest), "SDK");
Assert.AreEqual(1, service.Projects.Count, "Number of loaded projects after creating SDK not as expected");
Assert.IsTrue(service.Projects.ContainsKey(sdkProjectUri), "Loaded project list expected to contain SDK project URI");
Assert.AreEqual(ProjectType.SdkStyle, service.Projects[sdkProjectUri].SqlProjStyle, "SqlProj style expected to be SDK");
Assert.AreEqual(SqlPlatforms.SqlAzureV12, service.Projects[sdkProjectUri].Properties.TargetSqlPlatform, "Target SQL platform expected to be Azure");
Assert.AreEqual("0.1.7-preview", service.Projects[sdkProjectUri].MicrosoftBuildSqlSdkVersion, "SQL SDK version expected to be 0.1.7-preview");
// Validate creating Legacy-style project
requestMock = new();