aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-07-23 21:03:25 -0700
committerRob Mensching <rob@firegiant.com>2018-07-23 21:03:25 -0700
commit7f55b5b680f9b52da60354263af3493f0a4c5c79 (patch)
treed7c1a833c839bc4e9bf3f78cf632abd8796d546a /src/test
parent3f5a5717ac1ea7232d65122af22ba2a09032486b (diff)
downloadwix-7f55b5b680f9b52da60354263af3493f0a4c5c79.tar.gz
wix-7f55b5b680f9b52da60354263af3493f0a4c5c79.tar.bz2
wix-7f55b5b680f9b52da60354263af3493f0a4c5c79.zip
Integrate Core to Tools repro and Extensibility.Data namespace changes
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 45429574..ec9f79b6 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -1,9 +1,9 @@
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="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp2.0</TargetFramework> 6 <TargetFramework>netcoreapp2.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsPackable>false</IsPackable>
8 </PropertyGroup> 8 </PropertyGroup>
9 9
@@ -23,9 +23,11 @@
23 </ItemGroup> 23 </ItemGroup>
24 24
25 <ItemGroup> 25 <ItemGroup>
26 <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
27 <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\wix\wix.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
28 <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " PrivateAssets="all" /> 26 <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " PrivateAssets="all" />
27 <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
28 <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
29 <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
30 <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
29 </ItemGroup> 31 </ItemGroup>
30 32
31 <ItemGroup> 33 <ItemGroup>
@@ -33,8 +35,8 @@
33 </ItemGroup> 35 </ItemGroup>
34 36
35 <ItemGroup> 37 <ItemGroup>
36 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" /> 38 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
37 <PackageReference Include="xunit" Version="2.2.0" /> 39 <PackageReference Include="xunit" Version="2.4.0" />
38 <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> 40 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
39 </ItemGroup> 41 </ItemGroup>
40</Project> 42</Project>