Re-enable suppressed ICES test and update dependencies
Completes wixtoolset/issues#5946
Rob Mensching committed
Mar 18, 2021 at 02:33 UTC
f71e6a5dfdda7f12bac06b36ef6761af41b94ea1
7 files changed
+8
-3
appveyor.cmd
+1
-1
@@ -1,9 +1,9 @@
1
@setlocal
2
@pushd %~dp0
3
@set _C=Release
4
+@if /i "%1"=="debug" set _C=Debug
5
@set _P=%~dp0build\%_C%\publish
6
@set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS
6
-@if /i "%1"=="debug" set _C=Debug
7
8
:: Restore
9
nuget restore || exit /b
appveyor.yml
+2
@@ -30,6 +30,8 @@ nuget:
30
skip_branch_with_pr: true
31
skip_tags: true
32
33
+test: off
34
+
35
artifacts:
36
- path: build\Release\**\*.msi
37
name: msi
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+1
@@ -20,6 +20,7 @@
20
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
21
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
22
<PackageReference Include="WixToolset.Core" Version="4.0.*" />
23
+ <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
24
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
25
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
26
</ItemGroup>
src/heat/heat.csproj
+1
@@ -26,6 +26,7 @@
26
27
<ItemGroup>
28
<PackageReference Include="WixToolset.Core" Version="4.0.*" />
29
+ <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
30
<PackageReference Include="WixToolset.Harvesters" Version="4.0.*" />
31
</ItemGroup>
32
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1
-1
@@ -28,7 +28,7 @@
28
</ItemGroup>
29
30
<ItemGroup>
31
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
31
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
32
<PackageReference Include="xunit" Version="2.4.1" />
33
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
34
</ItemGroup>
src/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+1
-1
@@ -240,7 +240,7 @@ namespace WixToolsetTest.Sdk
240
}
241
}
242
243
- [Theory(Skip = "https://github.com/wixtoolset/issues/issues/5946")]
243
+ [Theory]
244
[InlineData(BuildSystem.DotNetCoreSdk)]
245
[InlineData(BuildSystem.MSBuild)]
246
[InlineData(BuildSystem.MSBuild64)]
src/wix/wix.csproj
+1
@@ -27,6 +27,7 @@
27
<ItemGroup>
28
<PackageReference Include="WixToolset.Converters" Version="4.0.*" />
29
<PackageReference Include="WixToolset.Core" Version="4.0.*" />
30
+ <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
31
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
32
<PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" />
33
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />