Update CompileCoreTestExtensionWixlib to be a .NET Core app.
Sean Hall committed
Jul 14, 2020 at 14:40 UTC
1717b6b6273ef09bed9cc359d1c062c55650fd7e
2 files changed
+10
-9
src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>net472</TargetFramework>
6
+ <TargetFramework>netcoreapp2.1</TargetFramework>
7
<OutputType>Exe</OutputType>
8
</PropertyGroup>
9
src/test/Example.Extension/Example.Extension.csproj
+9
-8
@@ -3,15 +3,18 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFramework>netcoreapp2.1</TargetFramework>
7
<IsPackable>false</IsPackable>
8
<DebugType>embedded</DebugType>
9
- <CompileWixlibExePath>$(OutputPath)net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
9
+ <CompileWixlibDllPath>$(OutputPath)netcoreapp2.1\CompileCoreTestExtensionWixlib.dll</CompileWixlibDllPath>
10
</PropertyGroup>
11
12
<ItemGroup>
13
<!-- Try to hack around VS up-to-date detection -->
14
- <Content Include="$(CompileWixlibExePath)" CopyToOutputDirectory="PreserveNewest">
14
+ <Content Include="$(CompileWixlibDllPath)" CopyToOutputDirectory="PreserveNewest">
15
+ <Visible>false</Visible>
16
+ </Content>
17
+ <Content Include="Data\example.wxs" CopyToOutputDirectory="PreserveNewest">
18
<Visible>false</Visible>
19
</Content>
20
<ExtensionWxs Include="Data\example.wxs" />
@@ -22,9 +25,7 @@
25
</ItemGroup>
26
27
<ItemGroup>
25
- <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj">
26
- <Private>false</Private>
27
- </ProjectReference>
28
+ <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj" />
29
</ItemGroup>
30
31
<Target Name="SetExtensionWixlib">
@@ -37,7 +38,7 @@
38
</ItemGroup>
39
</Target>
40
40
- <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="ResolveProjectReferences;SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibExePath)" Outputs="$(WixlibPath)">
41
- <Exec Command='$(CompileWixlibExePath) "$(IntermediateOutputPath)\" "$(WixlibPath)" "@(ExtensionWxs)"' />
41
+ <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="ResolveProjectReferences;SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibDllPath)" Outputs="$(WixlibPath)">
42
+ <Exec Command='dotnet $(CompileWixlibDllPath) "$(IntermediateOutputPath) " "$(WixlibPath)" "@(ExtensionWxs)"' />
43
</Target>
44
</Project>