From a181c02fd5ef6d601a98778a5c9e20b5c52779ca Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Fri, 14 Feb 2025 22:29:39 -0500 Subject: Convert ext\ to MSTest and traversal projects. - Move ext\ unit tests to MSTest. - MSBuildify ext projects with MSTest execution. - Fork test support projects for MSTest: - WixInternal.TestSupport - WixInternal.Core.TestPackage --- src/ext/NetFx/netfx.cmd | 48 ---------------- src/ext/NetFx/netfx_t.proj | 26 +++++++++ .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 67 +++++++--------------- .../WixToolsetTest.Netfx.csproj | 7 ++- 4 files changed, 51 insertions(+), 97 deletions(-) delete mode 100644 src/ext/NetFx/netfx.cmd create mode 100644 src/ext/NetFx/netfx_t.proj (limited to 'src/ext/NetFx') diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd deleted file mode 100644 index d81959cc..00000000 --- a/src/ext/NetFx/netfx.cmd +++ /dev/null @@ -1,48 +0,0 @@ -@setlocal -@pushd %~dp0 - -@set _C=Debug -@set _L=%~dp0..\..\..\build\logs - -:parse_args -@if /i "%1"=="release" set _C=Release -@if /i "%1"=="inc" set _INC=1 -@if /i "%1"=="clean" set _CLEAN=1 -@if not "%1"=="" shift & goto parse_args - -@set _B=%~dp0..\..\..\build\NetFx.wixext\%_C% - -:: Clean - -@if "%_INC%"=="" call :clean -@if NOT "%_CLEAN%"=="" goto :end - -@echo NetFx.wixext build %_C% - -:: Restore -nuget restore netcoresearch\packages.config || exit /b - -:: Build -msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_netfx_build.binlog || exit /b - -:: Test -dotnet test ^ - %_B%\net6.0\WixToolsetTest.NetFx.dll ^ - --nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b - -:: Pack -msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b - -@goto :end - -:clean -@rd /s/q "..\..\build\NetFx.wixext" 2> nul -@del "..\..\build\artifacts\WixToolset.NetFx.wixext.*.nupkg" 2> nul -@del "%_L%\ext_netfx_build.binlog" 2> nul -@del "%_L%\TestResults\netfx.wixext.trx" 2> nul -@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.netfx.wixext" 2> nul -@exit /b - -:end -@popd -@endlocal diff --git a/src/ext/NetFx/netfx_t.proj b/src/ext/NetFx/netfx_t.proj new file mode 100644 index 00000000..3301dc8a --- /dev/null +++ b/src/ext/NetFx/netfx_t.proj @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index a78a5617..37f715bf 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -4,14 +4,15 @@ namespace WixToolsetTest.Netfx { using System.IO; using System.Linq; - using WixInternal.TestSupport; - using WixInternal.Core.TestPackage; + using Microsoft.VisualStudio.TestTools.UnitTesting; + using WixInternal.MSTestSupport; + using WixInternal.Core.MSTestPackage; using WixToolset.Netfx; - using Xunit; + [TestClass] public class NetfxExtensionFixture { - [Fact] + [TestMethod] public void CanBuildUsingLatestDotNetCorePackages() { using (var fs = new DisposableFileSystem()) @@ -21,30 +22,24 @@ namespace WixToolsetTest.Netfx var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); var intermediateFolder = Path.Combine(baseFolder, "obj"); - var extensionResult = WixRunner.Execute(new[] - { - "extension", "add", - "WixToolset.BootstrapperApplications.wixext" - }); - var compileResult = WixRunner.Execute(new[] { "build", Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), - "-ext", "WixToolset.BootstrapperApplications.wixext", + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll").Replace("NetFx.wixext", "Bal.wixext"), "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, }); compileResult.AssertSuccess(); - Assert.True(File.Exists(bundleFile)); + Assert.IsTrue(File.Exists(bundleFile)); } } - [Fact] + [TestMethod] public void CanBuildUsingLatestDotNetCorePackages_X64() { using (var fs = new DisposableFileSystem()) @@ -54,29 +49,23 @@ namespace WixToolsetTest.Netfx var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); var intermediateFolder = Path.Combine(baseFolder, "obj"); - var extensionResult = WixRunner.Execute(new[] - { - "extension", "add", - "WixToolset.BootstrapperApplications.wixext" - }); - var compileResult = WixRunner.Execute(new[] { "build", Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), - "-ext", "WixToolset.BootstrapperApplications.wixext", + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll").Replace("NetFx.wixext", "Bal.wixext"), "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, }); compileResult.AssertSuccess(); - Assert.True(File.Exists(bundleFile)); + Assert.IsTrue(File.Exists(bundleFile)); } } - [Fact] + [TestMethod] public void CanBuildUsingNetFx481Packages() { using (var fs = new DisposableFileSystem()) @@ -86,17 +75,11 @@ namespace WixToolsetTest.Netfx var bundleSourceFolder = TestData.Get(@"TestData\UsingNetFxPackages"); var intermediateFolder = Path.Combine(baseFolder, "obj"); - var extensionResult = WixRunner.Execute(new[] - { - "extension", "add", - "WixToolset.BootstrapperApplications.wixext" - }); - var compileResult = WixRunner.Execute(new[] { "build", Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), - "-ext", "WixToolset.BootstrapperApplications.wixext", + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll").Replace("NetFx.wixext", "Bal.wixext"), "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, @@ -104,11 +87,11 @@ namespace WixToolsetTest.Netfx }); compileResult.AssertSuccess(); - Assert.True(File.Exists(bundleFile)); + Assert.IsTrue(File.Exists(bundleFile)); } } - [Fact] + [TestMethod] public void CanBuildUsingNetFxSearches() { using (var fs = new DisposableFileSystem()) @@ -118,20 +101,12 @@ namespace WixToolsetTest.Netfx var bundleSourceFolder = TestData.Get(@"TestData\UsingNetFxSearches"); var intermediateFolder = Path.Combine(baseFolder, "obj"); - var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[] - { - "extension", "add", - "WixToolset.BootstrapperApplications.wixext", - "extension", "add", - "WixToolset.Util.wixext", - }); - var compileResult = WixRunner.Execute(new[] { "build", Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), - "-ext", "WixToolset.BootstrapperApplications.wixext", - "-ext", "WixToolset.Util.wixext", + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll").Replace("NetFx.wixext", "Bal.wixext"), + "-ext", TestData.Get(@"WixToolset.Util.wixext.dll").Replace("NetFx.wixext", "Util.wixext"), "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, @@ -139,11 +114,11 @@ namespace WixToolsetTest.Netfx }); compileResult.AssertSuccess(); - Assert.True(File.Exists(bundleFile)); + Assert.IsTrue(File.Exists(bundleFile)); } } - [Fact] + [TestMethod] public void CanBuildUsingNativeImage() { var folder = TestData.Get(@"TestData\UsingNativeImage"); @@ -162,7 +137,7 @@ namespace WixToolsetTest.Netfx }, results.OrderBy(s => s).ToArray()); } - [Fact] + [TestMethod] public void CanBuildUsingNativeImageX64() { var folder = TestData.Get(@"TestData\UsingNativeImage"); @@ -181,7 +156,7 @@ namespace WixToolsetTest.Netfx }, results.OrderBy(s => s).ToArray()); } - [Fact] + [TestMethod] public void CanBuildUsingNativeImageARM64() { var folder = TestData.Get(@"TestData\UsingNativeImage"); @@ -200,7 +175,7 @@ namespace WixToolsetTest.Netfx }, results.OrderBy(s => s).ToArray()); } - [Fact] + [TestMethod] public void CanBuildUsingDotNetCompatibilityCheck() { var folder = TestData.Get(@"TestData\UsingDotNetCompatibilityCheck"); diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index 4e509cce..bdca49e6 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -1,10 +1,10 @@ - + net6.0 - true + true @@ -16,6 +16,7 @@ - + + -- cgit v1.2.3-55-g6feb