diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-14 14:40:06 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-07-14 14:49:08 +1000 |
| commit | 1717b6b6273ef09bed9cc359d1c062c55650fd7e (patch) | |
| tree | 6b724782f4d7d64de68e92f279e0c8199ab8b65a /src/test | |
| parent | 6fdec6b03b34767c6c172d6910546f5e1555431f (diff) | |
| download | wix-1717b6b6273ef09bed9cc359d1c062c55650fd7e.tar.gz wix-1717b6b6273ef09bed9cc359d1c062c55650fd7e.tar.bz2 wix-1717b6b6273ef09bed9cc359d1c062c55650fd7e.zip | |
Update CompileCoreTestExtensionWixlib to be a .NET Core app.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj | 2 | ||||
| -rw-r--r-- | src/test/Example.Extension/Example.Extension.csproj | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj index 7e5c33ef..41c10d40 100644 --- a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj +++ b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net472</TargetFramework> | 6 | <TargetFramework>netcoreapp2.1</TargetFramework> |
| 7 | <OutputType>Exe</OutputType> | 7 | <OutputType>Exe</OutputType> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj index fe05fcb2..d7a3b729 100644 --- a/src/test/Example.Extension/Example.Extension.csproj +++ b/src/test/Example.Extension/Example.Extension.csproj | |||
| @@ -3,15 +3,18 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netstandard2.0</TargetFramework> | 6 | <TargetFramework>netcoreapp2.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <CompileWixlibExePath>$(OutputPath)net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath> | 9 | <CompileWixlibDllPath>$(OutputPath)netcoreapp2.1\CompileCoreTestExtensionWixlib.dll</CompileWixlibDllPath> |
| 10 | </PropertyGroup> | 10 | </PropertyGroup> |
| 11 | 11 | ||
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <!-- Try to hack around VS up-to-date detection --> | 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"> | ||
| 15 | <Visible>false</Visible> | 18 | <Visible>false</Visible> |
| 16 | </Content> | 19 | </Content> |
| 17 | <ExtensionWxs Include="Data\example.wxs" /> | 20 | <ExtensionWxs Include="Data\example.wxs" /> |
| @@ -22,9 +25,7 @@ | |||
| 22 | </ItemGroup> | 25 | </ItemGroup> |
| 23 | 26 | ||
| 24 | <ItemGroup> | 27 | <ItemGroup> |
| 25 | <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj"> | 28 | <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj" /> |
| 26 | <Private>false</Private> | ||
| 27 | </ProjectReference> | ||
| 28 | </ItemGroup> | 29 | </ItemGroup> |
| 29 | 30 | ||
| 30 | <Target Name="SetExtensionWixlib"> | 31 | <Target Name="SetExtensionWixlib"> |
| @@ -37,7 +38,7 @@ | |||
| 37 | </ItemGroup> | 38 | </ItemGroup> |
| 38 | </Target> | 39 | </Target> |
| 39 | 40 | ||
| 40 | <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="ResolveProjectReferences;SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibExePath)" Outputs="$(WixlibPath)"> | 41 | <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="ResolveProjectReferences;SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibDllPath)" Outputs="$(WixlibPath)"> |
| 41 | <Exec Command='$(CompileWixlibExePath) "$(IntermediateOutputPath)\" "$(WixlibPath)" "@(ExtensionWxs)"' /> | 42 | <Exec Command='dotnet $(CompileWixlibDllPath) "$(IntermediateOutputPath) " "$(WixlibPath)" "@(ExtensionWxs)"' /> |
| 42 | </Target> | 43 | </Target> |
| 43 | </Project> | 44 | </Project> |