Turn tests off in appveyor.yml since they're run in appveyor.cmd
Sean Hall committed
Jun 24, 2020 at 15:32 UTC
69ed2c07285729b55a0a26adcf19ce684c437a44
4 files changed
+41
-6
appveyor.cmd
+1
-1
@@ -17,7 +17,7 @@ msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b
17
msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v142 || exit /b
18
msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b
19
20
-@rem msbuild -t:VSTest -p:Configuration=%_C% src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
20
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
21
22
msbuild -t:Pack -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b
23
msbuild -t:Pack -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b
appveyor.yml
+2
@@ -21,6 +21,8 @@ environment:
21
build_script:
22
- appveyor.cmd
23
24
+test: off
25
+
26
pull_requests:
27
do_not_increment_build_number: true
28
src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+38
@@ -20,6 +20,44 @@
20
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
21
</ItemGroup>
22
23
+ <PropertyGroup>
24
+ <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
25
+ <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
26
+ </PropertyGroup>
27
+
28
+ <Target Name="BuildMbaNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' ">
29
+ <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup">
30
+ <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
31
+ </MSBuild>
32
+
33
+ <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
34
+
35
+ <ItemGroup>
36
+ <FileWrites Include="$(NativeFileListPath)" />
37
+
38
+ <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
39
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40
+ <TargetPath>%(Filename)%(Extension)</TargetPath>
41
+ </AllItemsFullPathWithTargetPath>
42
+ </ItemGroup>
43
+ </Target>
44
+
45
+ <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' ">
46
+ <ReadLinesFromFile File="$(NativeFileListPath)">
47
+ <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" />
48
+ </ReadLinesFromFile>
49
+
50
+ <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " />
51
+
52
+ <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true">
53
+ <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" />
54
+ </Copy>
55
+
56
+ <ItemGroup>
57
+ <FileWrites Include="@(_NCrunchNativeCopied)" />
58
+ </ItemGroup>
59
+ </Target>
60
+
61
<Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
62
<PropertyGroup>
63
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
-5
@@ -9,11 +9,6 @@
9
</PropertyGroup>
10
11
<ItemGroup>
12
- <ProjectReference Include="..\..\mbanative\mbanative.vcxproj">
13
- <Project>{665E0441-17F9-4105-B202-EDF274657F6E}</Project>
14
- <OutputItemType>Content</OutputItemType>
15
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
16
- </ProjectReference>
12
<ProjectReference Include="..\..\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />
13
</ItemGroup>
14