aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.MSBuild
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.MSBuild')
-rw-r--r--src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec3
-rw-r--r--src/WixToolset.MSBuild/WixToolset.MSBuild.props2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index 6bca928a..c49efff0 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -13,7 +13,6 @@
13 <files> 13 <files>
14 <file src="$projectFolder$$id$.props" target="build" /> 14 <file src="$projectFolder$$id$.props" target="build" />
15 <file src="net461\*" target="tools\net461" /> 15 <file src="net461\*" target="tools\net461" />
16 <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" /> 16 <file src="netstandard2.0\*" target="tools\netstandard2.0" />
17 <file src="netcoreapp2.1\runtimes\**" target="tools\netcoreapp2.1\runtimes" />
18 </files> 17 </files>
19</package> 18</package>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
index b1d207f4..b0b7e7e3 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
@@ -3,7 +3,7 @@
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5 <PropertyGroup> 5 <PropertyGroup>
6 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath> 6 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netstandard2.0\wix.targets'))</WixTargetsPath>
7 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath> 7 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath>
8 </PropertyGroup> 8 </PropertyGroup>
9</Project> 9</Project>