diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 1 | ||||
| -rw-r--r-- | src/heat/heat.csproj | 1 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 2 | ||||
| -rw-r--r-- | src/wix/wix.csproj | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index e4dfaf2f..20ae6931 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | <ItemGroup Condition="'$(TargetFramework)'=='net461'"> | 20 | <ItemGroup Condition="'$(TargetFramework)'=='net461'"> |
| 21 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> | 21 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> |
| 22 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 22 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 23 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | ||
| 23 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
| 24 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
| 25 | </ItemGroup> | 26 | </ItemGroup> |
diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj index 53446e2f..83f97343 100644 --- a/src/heat/heat.csproj +++ b/src/heat/heat.csproj | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 28 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 29 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" /> | 30 | <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" /> |
| 30 | </ItemGroup> | 31 | </ItemGroup> |
| 31 | 32 | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index 696e5845..95a88190 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | 29 | ||
| 30 | <ItemGroup> | 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" /> | 32 | <PackageReference Include="xunit" Version="2.4.1" /> |
| 33 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 33 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> |
| 34 | </ItemGroup> | 34 | </ItemGroup> |
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs index f505dbb5..034f5b0b 100644 --- a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs | |||
| @@ -240,7 +240,7 @@ namespace WixToolsetTest.Sdk | |||
| 240 | } | 240 | } |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | [Theory(Skip = "https://github.com/wixtoolset/issues/issues/5946")] | 243 | [Theory] |
| 244 | [InlineData(BuildSystem.DotNetCoreSdk)] | 244 | [InlineData(BuildSystem.DotNetCoreSdk)] |
| 245 | [InlineData(BuildSystem.MSBuild)] | 245 | [InlineData(BuildSystem.MSBuild)] |
| 246 | [InlineData(BuildSystem.MSBuild64)] | 246 | [InlineData(BuildSystem.MSBuild64)] |
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj index f414bf41..648816fd 100644 --- a/src/wix/wix.csproj +++ b/src/wix/wix.csproj | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <PackageReference Include="WixToolset.Converters" Version="4.0.*" /> | 28 | <PackageReference Include="WixToolset.Converters" Version="4.0.*" /> |
| 29 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 29 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 30 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | ||
| 30 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 31 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
| 31 | <PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" /> | 32 | <PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" /> |
| 32 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 33 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
