Store different framework target separately
Rob Mensching committed
Dec 29, 2017 at 04:09 UTC
5524dd89431695bf9d710e694ec49401d3cecfde
4 files changed
+12
-11
appveyor.cmd
+3
-3
@@ -6,9 +6,9 @@ dotnet build -c Release src\test\WixToolsetTest.BuildTasks
6
dotnet build -c Release src\test\WixToolsetTest.CoreIntegration
7
dotnet build -c Release src\test\WixToolsetTest.LightIntegration
8
9
-dotnet publish -c Release -o %_P% -r win-x86 src\wix
10
-dotnet publish -c Release -o %_P% -r win-x86 src\light
11
-dotnet publish -c Release -o %_P% -r win-x86 src\WixToolset.BuildTasks
9
+dotnet publish -c Release -o %_P%\netcoreapp2.0 -r win-x86 src\wix
10
+dotnet publish -c Release -o %_P%\net461 -r win-x86 src\light
11
+dotnet publish -c Release -o %_P%\net461 -r win-x86 src\WixToolset.BuildTasks
12
13
dotnet pack -c Release src\WixToolset.Core.InternalPackage
14
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+5
-3
@@ -15,9 +15,11 @@
15
<PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
16
</ItemGroup>
17
18
- <Target Name="SetNuspecVersion"
19
- AfterTargets="GetBuildVersion">
20
- <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
18
+ <PropertyGroup>
19
+ <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
20
+ </PropertyGroup>
21
+ <Target Name="SetNuspecVersion">
22
+ <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
23
24
<PropertyGroup>
25
<NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+3
-4
@@ -13,9 +13,8 @@
13
<files>
14
<file src="$projectFolder$$id$.props" target="build" />
15
16
- <file src="redirects\wix.targets" target="msbuild" />
17
- <file src="redirects\wix.ca.targets" target="msbuild" />
18
-
19
- <file src="*" target="tools" />
16
+ <file src="netcoreapp2.0\*" target="tools\netcoreapp2.0" />
17
+ <file src="net461\*" target="tools\net461" />
18
+ <file src="net461\redirects\*" target="msbuild" />
19
</files>
20
</package>
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
+1
-1
@@ -3,6 +3,6 @@
3
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
<PropertyGroup>
6
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
6
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\net461\wix.targets</WixTargetsPath>
7
</PropertyGroup>
8
</Project>