Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ jobs:
with:
dotnet-version: ${{ matrix.dotnetVersion }}
dotnet-quality: ga
- run: dotnet build DacFx.sln
- run: dotnet test DacFx.sln --no-build -f ${{ matrix.targetFramework }}
- run: dotnet build DacFx.slnx

# The tests for Microsoft.SqlServer.VectorData currently require an Azure SQL instance, since on-premise
# SQL Server 2025 doesn't have the latest vector support. Once it does, we can turn on the tests here
# (they use testcontainers).
# - run: dotnet test DacFx.slnx --no-build -f ${{ matrix.targetFramework }}
- run: dotnet test test/Microsoft.Build.Sql.Tests --no-build -f ${{ matrix.targetFramework }}

# Test SDK builds with full framework MSBuild on Windows, with SDK itself and against SSDT installation.
msbuildTest:
Expand All @@ -57,5 +62,10 @@ jobs:
with:
dotnet-version: ${{ env.LATEST_DOTNET_VERSION }}
dotnet-quality: preview
- run: dotnet build DacFx.sln
- run: dotnet test DacFx.sln --no-build -f net472
- run: dotnet build DacFx.slnx

# The tests for Microsoft.SqlServer.VectorData currently require an Azure SQL instance, since on-premise
# SQL Server 2025 doesn't have the latest vector support. Once it does, we can turn on the tests here
# (they use testcontainers).
# - run: dotnet test DacFx.slnx --no-build -f net472
- run: dotnet test test/Microsoft.Build.Sql.Tests --no-build -f net472
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -353,4 +353,6 @@ MigrationBackup/
src/Microsoft.Build.Sql/[Tt]ools/

## Ignore packages generated for testing
test/Microsoft.Build.Sql.Tests/pkg/
test/Microsoft.Build.Sql.Tests/pkg/

*.lscache
37 changes: 0 additions & 37 deletions DacFx.sln

This file was deleted.

7 changes: 7 additions & 0 deletions DacFx.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Solution>
<Project Path="src/Microsoft.Build.Sql.Templates/Microsoft.Build.Sql.Templates.csproj" />
<Project Path="src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj" />
<Project Path="src/Microsoft.SqlServer.VectorData/SqlServer.csproj" />
<Project Path="test/Microsoft.Build.Sql.Tests/Microsoft.Build.Sql.Tests.csproj" />
<Project Path="test/Microsoft.SqlServer.VectorData.ConformanceTests/SqlServer.ConformanceTests.csproj" />
</Solution>
10 changes: 10 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.48" />
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="$(DacFxPackageVersion)" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="$(SqlClientPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.0" />
<PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.5.0" />
<PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
<PackageVersion Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="$(ScriptDomPackageVersion)" />
<PackageVersion Include="Microsoft.SqlServer.Types" Version="170.1000.7" />
Expand All @@ -23,11 +25,19 @@
<!-- Test -->
<PackageVersion Include="Microsoft.Build" Version="17.11.48" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.VectorData.ConformanceTests" Version="10.5.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="NuGet.Packaging" Version="6.13.2" />
<PackageVersion Include="nunit" Version="3.13.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.11.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
32 changes: 32 additions & 0 deletions src/LegacySupport/CallerArgumentExpressionAttribute.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma warning disable IDE0079
#pragma warning disable SA1101
#pragma warning disable SA1512

using System.Diagnostics.CodeAnalysis;

namespace System.Runtime.CompilerServices;

/// <summary>
/// Tags parameter that should be filled with specific caller name.
/// </summary>
[AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = false)]
[ExcludeFromCodeCoverage]
internal sealed class CallerArgumentExpressionAttribute : Attribute
{
/// <summary>
/// Initializes a new instance of the <see cref="CallerArgumentExpressionAttribute"/> class.
/// </summary>
/// <param name="parameterName">Function parameter to take the name from.</param>
public CallerArgumentExpressionAttribute(string parameterName)
{
ParameterName = parameterName;
}

/// <summary>
/// Gets name of the function parameter that name should be taken from.
/// </summary>
public string ParameterName { get; }
}
160 changes: 160 additions & 0 deletions src/LegacySupport/Index.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;

#pragma warning disable CS0436 // Type conflicts with imported type
#pragma warning disable S3427 // Method overloads with default parameter values should not overlap
#pragma warning disable SA1642 // Constructor summary documentation should begin with standard text
#pragma warning disable IDE0011 // Add braces
#pragma warning disable SA1623 // Property summary documentation should match accessors
#pragma warning disable IDE0023 // Use block body for conversion operator
#pragma warning disable S3928 // Parameter names used into ArgumentException constructors should match an existing one
#pragma warning disable LA0001 // Use the 'Microsoft.Shared.Diagnostics.Throws' class instead of explicitly throwing exception for improved performance
#pragma warning disable CA1305 // Specify IFormatProvider

namespace System
{
internal readonly struct Index : IEquatable<Index>
{
private readonly int _value;

/// <summary>Construct an Index using a value and indicating if the index is from the start or from the end.</summary>
/// <param name="value">The index value. it has to be zero or positive number.</param>
/// <param name="fromEnd">Indicating if the index is from the start or from the end.</param>
/// <remarks>
/// If the Index constructed from the end, index value 1 means pointing at the last element and index value 0 means pointing at beyond last element.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Index(int value, bool fromEnd = false)
{
if (value < 0)
{
ThrowValueArgumentOutOfRange_NeedNonNegNumException();
}

if (fromEnd)
_value = ~value;
else
_value = value;
}

// The following private constructors mainly created for perf reason to avoid the checks
private Index(int value)
{
_value = value;
}

/// <summary>Create an Index pointing at first element.</summary>
public static Index Start => new Index(0);

/// <summary>Create an Index pointing at beyond last element.</summary>
public static Index End => new Index(~0);

/// <summary>Create an Index from the start at the position indicated by the value.</summary>
/// <param name="value">The index value from the start.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Index FromStart(int value)
{
if (value < 0)
{
ThrowValueArgumentOutOfRange_NeedNonNegNumException();
}

return new Index(value);
}

/// <summary>Create an Index from the end at the position indicated by the value.</summary>
/// <param name="value">The index value from the end.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Index FromEnd(int value)
{
if (value < 0)
{
ThrowValueArgumentOutOfRange_NeedNonNegNumException();
}

return new Index(~value);
}

/// <summary>Returns the index value.</summary>
public int Value
{
get
{
if (_value < 0)
return ~_value;
else
return _value;
}
}

/// <summary>Indicates whether the index is from the start or the end.</summary>
public bool IsFromEnd => _value < 0;

/// <summary>Calculate the offset from the start using the giving collection length.</summary>
/// <param name="length">The length of the collection that the Index will be used with. length has to be a positive value.</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter and the returned offset value against negative values.
/// we don't validate either the returned offset is greater than the input length.
/// It is expected Index will be used with collections which always have non negative length/count. If the returned offset is negative and
/// then used to index a collection will get out of range exception which will be same affect as the validation.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOffset(int length)
{
int offset = _value;
if (IsFromEnd)
{
// offset = length - (~value)
// offset = length + (~(~value) + 1)
// offset = length + value + 1

offset += length + 1;
}

return offset;
}

/// <summary>Indicates whether the current Index object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object.</param>
public override bool Equals([NotNullWhen(true)] object? value) => value is Index && _value == ((Index)value)._value;

/// <summary>Indicates whether the current Index object is equal to another Index object.</summary>
/// <param name="other">An object to compare with this object.</param>
public bool Equals(Index other) => _value == other._value;

/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode() => _value;

/// <summary>Converts integer number to an Index.</summary>
public static implicit operator Index(int value) => FromStart(value);

/// <summary>Converts the value of the current Index object to its equivalent string representation.</summary>
public override string ToString()
{
if (IsFromEnd)
return ToStringFromEnd();

return ((uint)Value).ToString();
}

private static void ThrowValueArgumentOutOfRange_NeedNonNegNumException()
{
throw new ArgumentOutOfRangeException("value", "value must be non-negative");
}

private string ToStringFromEnd()
{
#if (!NETSTANDARD2_0 && !NETFRAMEWORK)
Span<char> span = stackalloc char[11]; // 1 for ^ and 10 for longest possible uint value
bool formatted = ((uint)Value).TryFormat(span.Slice(1), out int charsWritten);
span[0] = '^';
return new string(span.Slice(0, charsWritten + 1));
#else
return '^' + Value.ToString();
#endif
}
}
}
13 changes: 13 additions & 0 deletions src/LegacySupport/IsExternalInit.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#pragma warning disable IDE0079
#pragma warning disable S3903

/* This enables support for C# 9/10 records on older frameworks */

namespace System.Runtime.CompilerServices;

internal static class IsExternalInit
{
}
Loading
Loading