diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-20 01:00:05 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-20 01:06:43 -0700 |
| commit | cef6ac5735e9cf47fb51746f136d6703f2d45de6 (patch) | |
| tree | 71726a5acb05914212eeee7b2cad36de71f91419 /src/WixToolset.MSBuild | |
| parent | c8c22de1957f8eeb2c9fc03df12db6af41613ca9 (diff) | |
| download | wix-cef6ac5735e9cf47fb51746f136d6703f2d45de6.tar.gz wix-cef6ac5735e9cf47fb51746f136d6703f2d45de6.tar.bz2 wix-cef6ac5735e9cf47fb51746f136d6703f2d45de6.zip | |
Better support all .NETs and fix-up integration tests
Diffstat (limited to 'src/WixToolset.MSBuild')
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 3 | ||||
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.props | 2 |
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> |