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.csproj2
-rw-r--r--src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec3
-rw-r--r--src/WixToolset.MSBuild/WixToolset.MSBuild.props2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index 76e42911..5a9633ae 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework> 6 <TargetFramework>netcoreapp2.1</TargetFramework>
7 <IncludeBuildOutput>false</IncludeBuildOutput> 7 <IncludeBuildOutput>false</IncludeBuildOutput>
8 <Description>WiX Toolset MSBuild integration</Description> 8 <Description>WiX Toolset MSBuild integration</Description>
9 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> 9 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index ba16aa92..c9e5cdf2 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="net472\*" target="tools\net472" /> 16 <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
17 <file src="netstandard2.0\*" target="tools\netstandard2.0" />
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 b0b7e7e3..b1d207f4 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\netstandard2.0\wix.targets'))</WixTargetsPath> 6 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\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>