Remove x86 restriction (introduced from previous commit) from published contents. Remove unused net472 BuildTasks. Make BuildTasks target netcoreapp instead of netstandard since publishing isn't supported for netstandard.
Remove x86 restriction (introduced from previous commit) from published contents. Remove unused net472 BuildTasks. Make BuildTasks target netcoreapp instead of netstandard since publishing isn't supported for netstandard.
Sean Hall committed
May 10, 2020 at 13:49 UTC
a5f59cb11a6372a6da8540bd1bebf6dec20e92e3
8 files changed
+14
-14
appveyor.cmd
+1
-2
@@ -9,8 +9,7 @@ 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\net472\ -f net472 src\WixToolset.BuildTasks
13
-dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netstandard2.0\ -f netstandard2.0 src\WixToolset.BuildTasks
12
+dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreapp2.1 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
+5
-4
@@ -3,12 +3,13 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
6
+ <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
7
<Description></Description>
8
<Title>WiX Toolset MSBuild Tasks</Title>
9
<DebugType>embedded</DebugType>
10
<PublishRepositoryUrl>true</PublishRepositoryUrl>
11
- <RuntimeIdentifier>win-x86</RuntimeIdentifier>
11
+ <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
12
+ <PlatformTarget>AnyCPU</PlatformTarget>
13
</PropertyGroup>
14
15
<PropertyGroup>
@@ -36,8 +37,8 @@
37
</ItemGroup>
38
39
<ItemGroup>
39
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
40
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netstandard2.0' " />
40
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461'" />
41
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
42
</ItemGroup>
43
44
<ItemGroup>
src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFramework>netcoreapp2.1</TargetFramework>
7
<IncludeBuildOutput>false</IncludeBuildOutput>
8
<Description>WiX Toolset MSBuild integration</Description>
9
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
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="net472\*" target="tools\net472" />
17
- <file src="netstandard2.0\*" target="tools\netstandard2.0" />
16
+ <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
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\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>
8
</PropertyGroup>
9
</Project>
src/dotnet-wix/dotnet-wix.csproj
+1
-2
@@ -3,13 +3,12 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFramework>netcoreapp2.1</TargetFramework>
7
<IncludeBuildOutput>false</IncludeBuildOutput>
8
<Description>WiX Toolset Command-line interface</Description>
9
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
10
<NuspecBasePath>$(OutputPath)publish\dotnet-wix\</NuspecBasePath>
11
<NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
12
- <RuntimeIdentifier>win-x86</RuntimeIdentifier>
12
</PropertyGroup>
13
14
<ItemGroup>
src/wix/wix.csproj
+2
-1
@@ -10,7 +10,8 @@
10
<DebugType>embedded</DebugType>
11
<PublishRepositoryUrl>true</PublishRepositoryUrl>
12
<!-- <PackAsTool>true</PackAsTool> -->
13
- <RuntimeIdentifier>win-x86</RuntimeIdentifier>
13
+ <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
14
+ <PlatformTarget>AnyCPU</PlatformTarget>
15
</PropertyGroup>
16
17
<PropertyGroup>
src/wixcop/WixCop.csproj
+2
-1
@@ -10,7 +10,8 @@
10
<DebugType>embedded</DebugType>
11
<PublishRepositoryUrl>true</PublishRepositoryUrl>
12
<!-- <PackAsTool>true</PackAsTool> -->
13
- <RuntimeIdentifier>win-x86</RuntimeIdentifier>
13
+ <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
14
+ <PlatformTarget>AnyCPU</PlatformTarget>
15
</PropertyGroup>
16
17
<PropertyGroup>