diff options
Diffstat (limited to 'src/ext/Sql')
-rw-r--r-- | src/ext/Sql/sql.cmd | 21 | ||||
-rw-r--r-- | src/ext/Sql/sql_t.proj | 17 | ||||
-rw-r--r-- | src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs | 9 | ||||
-rw-r--r-- | src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | 7 |
4 files changed, 26 insertions, 28 deletions
diff --git a/src/ext/Sql/sql.cmd b/src/ext/Sql/sql.cmd deleted file mode 100644 index 41af0223..00000000 --- a/src/ext/Sql/sql.cmd +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | |||
4 | @set _C=Debug | ||
5 | :parse_args | ||
6 | @if /i "%1"=="release" set _C=Release | ||
7 | @if not "%1"=="" shift & goto parse_args | ||
8 | |||
9 | @echo Sql.wixext build %_C% | ||
10 | |||
11 | :: Build | ||
12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b | ||
13 | |||
14 | :: Test | ||
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b | ||
16 | |||
17 | :: Pack | ||
18 | msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Sql.wixext.csproj || exit /b | ||
19 | |||
20 | @popd | ||
21 | @endlocal | ||
diff --git a/src/ext/Sql/sql_t.proj b/src/ext/Sql/sql_t.proj new file mode 100644 index 00000000..97b2c8fd --- /dev/null +++ b/src/ext/Sql/sql_t.proj | |||
@@ -0,0 +1,17 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
3 | |||
4 | <Project Sdk="Microsoft.Build.Traversal"> | ||
5 | <ItemGroup> | ||
6 | <ProjectReference Include="test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj" /> | ||
7 | <ProjectReference Include="wixext\WixToolset.Sql.wixext.csproj" Targets="Pack" Properties="NoBuild=true" /> | ||
8 | </ItemGroup> | ||
9 | |||
10 | <Target Name="WixClean" BeforeTargets="Restore" Condition="'$(SuppressWixClean)' != 'true'"> | ||
11 | <RemoveDir Directories="$(RootBuildFolder)Sql.wixext" /> | ||
12 | <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\wixtoolset.Sql.wixext" Condition="'$(NUGET_PACKAGES)' == ''" /> | ||
13 | <RemoveDir Directories="$(NUGET_PACKAGES)\wixtoolset.Sql.wixext" Condition="'$(NUGET_PACKAGES)' != ''" /> | ||
14 | |||
15 | <Delete Files="$(ArtifactsFolder)WixToolset.Sql.wixext.*.nupkg" /> | ||
16 | </Target> | ||
17 | </Project> | ||
diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs b/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs index 5576576d..14ca14c3 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs +++ b/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs | |||
@@ -3,14 +3,15 @@ | |||
3 | namespace WixToolsetTest.Sql | 3 | namespace WixToolsetTest.Sql |
4 | { | 4 | { |
5 | using System.Linq; | 5 | using System.Linq; |
6 | using WixInternal.TestSupport; | 6 | using Microsoft.VisualStudio.TestTools.UnitTesting; |
7 | using WixInternal.Core.TestPackage; | 7 | using WixInternal.MSTestSupport; |
8 | using WixInternal.Core.MSTestPackage; | ||
8 | using WixToolset.Sql; | 9 | using WixToolset.Sql; |
9 | using Xunit; | ||
10 | 10 | ||
11 | [TestClass] | ||
11 | public class SqlExtensionFixture | 12 | public class SqlExtensionFixture |
12 | { | 13 | { |
13 | [Fact] | 14 | [TestMethod] |
14 | public void CanBuildUsingSqlStuff() | 15 | public void CanBuildUsingSqlStuff() |
15 | { | 16 | { |
16 | var folder = TestData.Get(@"TestData\UsingSql"); | 17 | var folder = TestData.Get(@"TestData\UsingSql"); |
diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index 6c848683..62345258 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj +++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | |||
@@ -1,10 +1,10 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
10 | <ItemGroup> | 10 | <ItemGroup> |
@@ -16,6 +16,7 @@ | |||
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | 17 | ||
18 | <ItemGroup> | 18 | <ItemGroup> |
19 | <PackageReference Include="WixInternal.Core.TestPackage" /> | 19 | <PackageReference Include="WixInternal.MSTestSupport" /> |
20 | <PackageReference Include="WixInternal.Core.MSTestPackage" /> | ||
20 | </ItemGroup> | 21 | </ItemGroup> |
21 | </Project> | 22 | </Project> |