Skip to content

Added MsSqlSsdt.Tests.fsproj back (fixed build issues). #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Added MsSqlSsdt.Tests.fsproj back (fixed build issues). #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e79d0d6
Added MsSqlSsdt.Tests.fsproj back (fixed build issues).
JordanMarr Jan 7, 2023
0651429
merged from upstream
JordanMarr Jan 8, 2023
52782a2
Removed unused SSDT Project
JordanMarr Jan 8, 2023
7a94a72
Updated AdventureWorks_SSDT to (hopefully) build on Mac.
JordanMarr Jan 8, 2023
7d49d34
Referenced runtime project
JordanMarr Jan 8, 2023
d31fb90
Reverted global.json
JordanMarr Jan 8, 2023
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
28 changes: 28 additions & 0 deletions SQLProvider.Tests.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{DB81
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7BB500F4-9F6A-4AE2-848B-72204AFC706C}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MsSqlSsdt.Tests", "tests\SqlProvider.Core.Tests\MsSqlSsdt\MsSqlSsdt.Tests\MsSqlSsdt.Tests.fsproj", "{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SSDT", "SSDT", "{E1968454-7F5E-4EC7-BA12-2CD200F74324}"
EndProject
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "AdventureWorks_SSDT", "tests\SqlProvider.Core.Tests\MsSqlSsdt\MsSqlSsdt.Tests\AdventureWorks_SSDT\AdventureWorks_SSDT.sqlproj", "{6DE61DDD-AFBC-4646-B409-2266B456D06F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -59,12 +65,34 @@ Global
{B5E56E66-5EE2-4C81-A242-9973AAAE9C99}.Release|Any CPU.Build.0 = Release|Any CPU
{B5E56E66-5EE2-4C81-A242-9973AAAE9C99}.Release|x86.ActiveCfg = Release|Any CPU
{B5E56E66-5EE2-4C81-A242-9973AAAE9C99}.Release|x86.Build.0 = Release|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Debug|x86.ActiveCfg = Debug|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Debug|x86.Build.0 = Debug|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Release|Any CPU.Build.0 = Release|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Release|x86.ActiveCfg = Release|Any CPU
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877}.Release|x86.Build.0 = Release|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Debug|x86.ActiveCfg = Debug|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Debug|x86.Build.0 = Debug|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Debug|x86.Deploy.0 = Debug|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Release|Any CPU.Build.0 = Release|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Release|x86.ActiveCfg = Release|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Release|x86.Build.0 = Release|Any CPU
{6DE61DDD-AFBC-4646-B409-2266B456D06F}.Release|x86.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{C7E85487-91DA-43CE-B343-C54614949C13} = {D383A6BC-FD4A-4C9C-99CA-5AE5C8A7B261}
{A4EF7241-F3C2-4149-9AB8-9F23D6DFC877} = {E1968454-7F5E-4EC7-BA12-2CD200F74324}
{6DE61DDD-AFBC-4646-B409-2266B456D06F} = {E1968454-7F5E-4EC7-BA12-2CD200F74324}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {266D1D48-A28A-48A9-AAB2-3BE4132FBA88}
Expand Down
232 changes: 119 additions & 113 deletions ...ider.Core.Tests/MsSqlSsdt/MsSqlSsdt.Tests/AdventureWorks_SSDT/AdventureWorks_SSDT.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,113 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Name>AdventureWorks_SSDT</Name>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>4.1</ProjectVersion>
<ProjectGuid>{6de61ddd-afbc-4646-b409-2266b456d06f}</ProjectGuid>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider</DSP>
<OutputType>Database</OutputType>
<RootPath>
</RootPath>
<RootNamespace>AdventureWorks_SSDT</RootNamespace>
<AssemblyName>AdventureWorks_SSDT</AssemblyName>
<ModelCollation>1033, CI</ModelCollation>
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
<DeployToDatabase>True</DeployToDatabase>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetLanguage>CS</TargetLanguage>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SqlServerVerification>False</SqlServerVerification>
<IncludeCompositeObjects>True</IncludeCompositeObjects>
<TargetDatabaseSet>True</TargetDatabaseSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>
<Import Condition="'$(NetCoreBuild)' == 'true'" Project="$(NETCoreTargetsPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<ItemGroup>
<PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties" />
<Folder Include="Security" />
<Folder Include="SalesLT" />
<Folder Include="SalesLT\XMLSchemaCollections" />
<Folder Include="SalesLT\Views" />
<Folder Include="SalesLT\Tables" />
<Folder Include="dbo" />
<Folder Include="dbo\UserDefinedTypes" />
<Folder Include="dbo\Tables" />
<Folder Include="dbo\StoredProcedures" />
<Folder Include="dbo\Functions" />
</ItemGroup>
<Target Name="AfterClean">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target>
<ItemGroup>
<Build Include="Security\SalesLT.sql" />
<Build Include="SalesLT\XMLSchemaCollections\ProductDescriptionSchemaCollection.sql" />
<Build Include="SalesLT\Views\vProductModelCatalogDescription.sql" />
<Build Include="SalesLT\Views\vProductAndDescription.sql" />
<Build Include="SalesLT\Views\vGetAllCategories.sql" />
<Build Include="SalesLT\Tables\SalesOrderHeader.sql" />
<Build Include="SalesLT\Tables\SalesOrderDetail.sql" />
<Build Include="SalesLT\Tables\ProductModelProductDescription.sql" />
<Build Include="SalesLT\Tables\ProductModel.sql" />
<Build Include="SalesLT\Tables\ProductDescription.sql" />
<Build Include="SalesLT\Tables\ProductCategory.sql" />
<Build Include="SalesLT\Tables\Product.sql" />
<Build Include="SalesLT\Tables\CustomerAddress.sql" />
<Build Include="SalesLT\Tables\Customer.sql" />
<Build Include="SalesLT\Tables\Address.sql" />
<Build Include="ExtendedProperties.sql" />
<Build Include="dbo\UserDefinedTypes\Phone.sql" />
<Build Include="dbo\UserDefinedTypes\OrderNumber.sql" />
<Build Include="dbo\UserDefinedTypes\NameStyle.sql" />
<Build Include="dbo\UserDefinedTypes\Name.sql" />
<Build Include="dbo\UserDefinedTypes\Flag.sql" />
<Build Include="dbo\UserDefinedTypes\AccountNumber.sql" />
<Build Include="dbo\Tables\ErrorLog.sql" />
<Build Include="dbo\Tables\BuildVersion.sql" />
<Build Include="dbo\StoredProcedures\uspPrintError.sql" />
<Build Include="dbo\StoredProcedures\uspLogError.sql" />
<Build Include="dbo\Functions\ufnGetSalesOrderStatusText.sql" />
<Build Include="dbo\Functions\ufnGetCustomerInformation.sql" />
<Build Include="dbo\Functions\ufnGetAllCategories.sql" />
<Build Include="SalesLT\Tables\Test.Table.sql" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
<Project Sdk="MSBuild.Sdk.SqlProj/2.0.0">
<PropertyGroup>
<TargetFramework>net6</TargetFramework>
<SuppressTSqlWarnings>71558,71502</SuppressTSqlWarnings>
<SqlServerVersion>SqlAzure</SqlServerVersion>
<BundledNETCoreAppTargetFrameworkVersion>5.0</BundledNETCoreAppTargetFrameworkVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Name>AdventureWorks_SSDT</Name>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>4.1</ProjectVersion>
<ProjectGuid>{6de61ddd-afbc-4646-b409-2266b456d06f}</ProjectGuid>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider</DSP>
<OutputType>Database</OutputType>
<RootPath>
</RootPath>
<RootNamespace>AdventureWorks_SSDT</RootNamespace>
<AssemblyName>AdventureWorks_SSDT</AssemblyName>
<ModelCollation>1033, CI</ModelCollation>
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
<DeployToDatabase>True</DeployToDatabase>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetLanguage>CS</TargetLanguage>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SqlServerVerification>False</SqlServerVerification>
<IncludeCompositeObjects>True</IncludeCompositeObjects>
<TargetDatabaseSet>True</TargetDatabaseSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>
<Import Condition="'$(NetCoreBuild)' == 'true'" Project="$(NETCoreTargetsPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<ItemGroup>
<PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties" />
<Folder Include="Security" />
<Folder Include="SalesLT" />
<Folder Include="SalesLT\XMLSchemaCollections" />
<Folder Include="SalesLT\Views" />
<Folder Include="SalesLT\Tables" />
<Folder Include="dbo" />
<Folder Include="dbo\UserDefinedTypes" />
<Folder Include="dbo\Tables" />
<Folder Include="dbo\StoredProcedures" />
<Folder Include="dbo\Functions" />
</ItemGroup>
<Target Name="AfterClean">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target>
<ItemGroup>
<Build Include="Security\SalesLT.sql" />
<Build Include="SalesLT\XMLSchemaCollections\ProductDescriptionSchemaCollection.sql" />
<Build Include="SalesLT\Views\vProductModelCatalogDescription.sql" />
<Build Include="SalesLT\Views\vProductAndDescription.sql" />
<Build Include="SalesLT\Views\vGetAllCategories.sql" />
<Build Include="SalesLT\Tables\SalesOrderHeader.sql" />
<Build Include="SalesLT\Tables\SalesOrderDetail.sql" />
<Build Include="SalesLT\Tables\ProductModelProductDescription.sql" />
<Build Include="SalesLT\Tables\ProductModel.sql" />
<Build Include="SalesLT\Tables\ProductDescription.sql" />
<Build Include="SalesLT\Tables\ProductCategory.sql" />
<Build Include="SalesLT\Tables\Product.sql" />
<Build Include="SalesLT\Tables\CustomerAddress.sql" />
<Build Include="SalesLT\Tables\Customer.sql" />
<Build Include="SalesLT\Tables\Address.sql" />
<Build Include="ExtendedProperties.sql" />
<Build Include="dbo\UserDefinedTypes\Phone.sql" />
<Build Include="dbo\UserDefinedTypes\OrderNumber.sql" />
<Build Include="dbo\UserDefinedTypes\NameStyle.sql" />
<Build Include="dbo\UserDefinedTypes\Name.sql" />
<Build Include="dbo\UserDefinedTypes\Flag.sql" />
<Build Include="dbo\UserDefinedTypes\AccountNumber.sql" />
<Build Include="dbo\Tables\ErrorLog.sql" />
<Build Include="dbo\Tables\BuildVersion.sql" />
<Build Include="dbo\StoredProcedures\uspPrintError.sql" />
<Build Include="dbo\StoredProcedures\uspLogError.sql" />
<Build Include="dbo\Functions\ufnGetSalesOrderStatusText.sql" />
<Build Include="dbo\Functions\ufnGetCustomerInformation.sql" />
<Build Include="dbo\Functions\ufnGetAllCategories.sql" />
<Build Include="SalesLT\Tables\Test.Table.sql" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
28 changes: 13 additions & 15 deletions tests/SqlProvider.Core.Tests/MsSqlSsdt/MsSqlSsdt.Tests/MsSqlSsdt.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net472</TargetFramework>

<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
<OutputType>Library</OutputType>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Remove="Sql\**" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\SQLProvider.Runtime\SQLProvider.Runtime.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="6.0.7" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<Compile Include="TestQueries.fs" />
<Compile Include="Dacpac\UnzipTests.fs" />
<Compile Include="Dacpac\ParseSchemaTests.fs" />
<Compile Include="Dacpac\TypeAnnotationTests.fs" />
<Compile Include="UserDefinedDataTypes.fs" />
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<Reference Include="FSharp.Data.SqlProvider">
<HintPath>..\..\..\..\bin\net472\FSharp.Data.SqlProvider.dll</HintPath>
</Reference>
<Compile Include="UnzipTests.fs" />
<Compile Include="ParseSchemaTests.fs" />
<Compile Include="TypeAnnotationTests.fs" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...sSqlSsdt.Tests/Dacpac/ParseSchemaTests.fs → ...lSsdt/MsSqlSsdt.Tests/ParseSchemaTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Dacpac.ParseSchemaTests
module MsSqlSsdt.Tests.ParseSchemaTests
open NUnit.Framework
open FSharp.Data.Sql.Providers
open FSharp.Data.Sql.Ssdt
Expand Down
Loading