diff options
Diffstat (limited to 'src/ext/PowerShell')
-rw-r--r-- | src/ext/PowerShell/ps.cmd | 5 | ||||
-rw-r--r-- | src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd index b5a0657b..cfb1274b 100644 --- a/src/ext/PowerShell/ps.cmd +++ b/src/ext/PowerShell/ps.cmd | |||
@@ -8,11 +8,8 @@ | |||
8 | 8 | ||
9 | @echo PowerShell.wixext build %_C% | 9 | @echo PowerShell.wixext build %_C% |
10 | 10 | ||
11 | :: Restore | ||
12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
13 | |||
14 | :: Build | 11 | :: Build |
15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% || exit /b |
16 | 13 | ||
17 | :: Test | 14 | :: Test |
18 | dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b |
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj index 4d5403d7..58272eea 100644 --- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj +++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj | |||
@@ -7,20 +7,19 @@ | |||
7 | <RootNamespace>WixToolset.PowerShell</RootNamespace> | 7 | <RootNamespace>WixToolset.PowerShell</RootNamespace> |
8 | <Description>WiX Toolset PowerShell Extension</Description> | 8 | <Description>WiX Toolset PowerShell Extension</Description> |
9 | <Title>WiX Toolset PowerShell Extension</Title> | 9 | <Title>WiX Toolset PowerShell Extension</Title> |
10 | <IsTool>true</IsTool> | 10 | <DebugType>embedded</DebugType> |
11 | <ContentTargetFolders>build</ContentTargetFolders> | 11 | <IncludeSymbols>true</IncludeSymbols> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | 13 | ||
14 | <ItemGroup> | 14 | <ItemGroup> |
15 | <Content Include="$(MSBuildThisFileName).targets" /> | ||
16 | <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" /> |
17 | </ItemGroup> | 16 | </ItemGroup> |
18 | 17 | ||
19 | <ItemGroup> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
20 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> | 19 | <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> |
21 | </ItemGroup> | 20 | </ItemGroup> |
22 | 21 | ||
23 | <ItemGroup> | 22 | <ItemGroup> |
24 | <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 23 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
25 | </ItemGroup> | 24 | </ItemGroup> |
26 | </Project> | 25 | </Project> |