mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-01-19 17:23:55 -05:00
Update to latest .Net SDK 7.0 (#1760)
* Bump to SDK 7.0 and related updates * More net 7 updates * Install SDK 2.0 for ESRP * Fix typo * Address comment and update integration test script * Disable new warnings from SDK update
This commit is contained in:
@@ -89,10 +89,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode
|
||||
|
||||
if (value == null)
|
||||
{
|
||||
if (internalVariables.ContainsKey(name))
|
||||
{
|
||||
internalVariables.Remove(name);
|
||||
}
|
||||
internalVariables.Remove(name);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@ using System;
|
||||
namespace Microsoft.SqlTools.ServiceLayer.BatchParser
|
||||
{
|
||||
[Serializable]
|
||||
public struct PositionStruct
|
||||
public readonly struct PositionStruct
|
||||
{
|
||||
private readonly int line;
|
||||
private readonly int column;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// 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
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<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 -->
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
<!-- 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>net7.0;net472</TargetFrameworks>
|
||||
<LangVersion>9.0</LangVersion>
|
||||
<Nullable>disable</Nullable>
|
||||
<AssemblyName>Microsoft.SqlTools.ManagedBatchParser</AssemblyName>
|
||||
@@ -13,6 +13,7 @@
|
||||
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
|
||||
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
|
||||
<Product>Microsoft SqlTools Managed batch parser</Product>
|
||||
<NoWarn>$(NoWarn);CA1852</NoWarn>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Localization\transXliff\" />
|
||||
@@ -28,7 +29,7 @@
|
||||
<EmbeddedResource Include="Localization\*.resx" />
|
||||
<None Include="Localization\sr.strings" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
|
||||
<ItemGroup Condition="$(TargetFramework) == 'net7.0'">
|
||||
<InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.UnitTests" />
|
||||
<InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.IntegrationTests" />
|
||||
<InternalsVisibleTo Include="Microsoft.SqlTools.ServiceLayer.Test.Common" />
|
||||
|
||||
Reference in New Issue
Block a user