Better support all .NETs and fix-up integration tests
Rob Mensching committed
Oct 20, 2019 at 01:00 UTC
cef6ac5735e9cf47fb51746f136d6703f2d45de6
9 files changed
+18
-18
appveyor.cmd
+3
-3
@@ -4,12 +4,12 @@
4
5
nuget restore
6
7
-dotnet build -c Release src\test\WixToolsetTest.BuildTasks
8
-dotnet build -c Release src\test\WixToolsetTest.WixCop
7
+dotnet test -c Release src\test\WixToolsetTest.BuildTasks
8
+dotnet test -c Release src\test\WixToolsetTest.WixCop
9
10
dotnet publish -c Release -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix
11
dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net461\ -f net461 src\WixToolset.BuildTasks
12
-dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks
12
+dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netstandard2.0\ -f netstandard2.0 src\WixToolset.BuildTasks
13
14
@rem dotnet publish -c Release -o %_P%\netcoreapp2.1 -r win-x86 src\wix
15
@rem dotnet publish -c Release -o %_P%\net461 -r win-x86 src\light
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+3
-7
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
6
+ <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
<Description></Description>
8
<Title>WiX Toolset MSBuild Tasks</Title>
9
<DebugType>embedded</DebugType>
@@ -14,10 +14,6 @@
14
<NoWarn>NU1701</NoWarn>
15
</PropertyGroup>
16
17
- <PropertyGroup>
18
- <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> -->
19
- </PropertyGroup>
20
-
17
<ItemGroup>
18
<Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
19
<Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
@@ -38,8 +34,8 @@
34
</ItemGroup>
35
36
<ItemGroup>
41
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' " />
42
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
37
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
38
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netstandard2.0' " />
39
</ItemGroup>
40
41
<ItemGroup>
src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+1
-2
@@ -13,7 +13,6 @@
13
<files>
14
<file src="$projectFolder$$id$.props" target="build" />
15
<file src="net461\*" target="tools\net461" />
16
- <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
17
- <file src="netcoreapp2.1\runtimes\**" target="tools\netcoreapp2.1\runtimes" />
16
+ <file src="netstandard2.0\*" target="tools\netstandard2.0" />
17
</files>
18
</package>
src/WixToolset.MSBuild/WixToolset.MSBuild.props
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
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>
8
</PropertyGroup>
9
</Project>
src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
<Description>Tools Core</Description>
8
<Title>WiX Toolset Tools Core</Title>
9
<DebugType>embedded</DebugType>
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+2
-1
@@ -21,7 +21,8 @@
21
</ItemGroup>
22
23
<ItemGroup>
24
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="All" />
24
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
25
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
26
<PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
27
</ItemGroup>
28
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+5
-1
@@ -3,11 +3,15 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>net461</TargetFramework>
6
+ <TargetFramework>netcoreapp2.1</TargetFramework>
7
<IsPackable>false</IsPackable>
8
<DebugType>embedded</DebugType>
9
</PropertyGroup>
10
11
+ <PropertyGroup>
12
+ <NoWarn>NU1603</NoWarn>
13
+ </PropertyGroup>
14
+
15
<ItemGroup>
16
<None Remove="TestData\SingleFile\ConvertedSingleFile.wxs" />
17
<None Remove="TestData\SingleFile\SingleFile.wxs" />
src/wix/wix.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
6
+ <TargetFrameworks>netcoreapp2.1;net461;net472</TargetFrameworks>
7
<OutputType>Exe</OutputType>
8
<Description>Compiler</Description>
9
<Title>WiX Toolset Compiler</Title>
src/wixcop/WixCop.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
6
+ <TargetFrameworks>netcoreapp2.1;net461;net472</TargetFrameworks>
7
<OutputType>Exe</OutputType>
8
<Description>Converter</Description>
9
<Title>WiX Error Correction Tool</Title>