diff options
Diffstat (limited to 'src/ext/NetFx')
-rw-r--r-- | src/ext/NetFx/netfx.cmd | 7 | ||||
-rw-r--r-- | src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd index f5e3984e..182630b3 100644 --- a/src/ext/NetFx/netfx.cmd +++ b/src/ext/NetFx/netfx.cmd | |||
@@ -6,13 +6,10 @@ | |||
6 | @if /i "%1"=="release" set _C=Release | 6 | @if /i "%1"=="release" set _C=Release |
7 | @if not "%1"=="" shift & goto parse_args | 7 | @if not "%1"=="" shift & goto parse_args |
8 | 8 | ||
9 | @echo Building ext\NetFx %_C% | 9 | @echo NetFx.wixext build %_C% |
10 | |||
11 | :: Restore | ||
12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
13 | 10 | ||
14 | :: Build | 11 | :: Build |
15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.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.Netfx || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b |
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj index 0749e688..667576c1 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | |||
@@ -4,10 +4,10 @@ | |||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netstandard2.0</TargetFramework> | 6 | <TargetFramework>netstandard2.0</TargetFramework> |
7 | <DebugType>embedded</DebugType> | ||
8 | <RootNamespace>WixToolset.Netfx</RootNamespace> | 7 | <RootNamespace>WixToolset.Netfx</RootNamespace> |
9 | <Description>WiX Toolset .NET extension</Description> | 8 | <Description>WiX Toolset .NET extension</Description> |
10 | <Title>WiX Toolset .NET extension</Title> | 9 | <Title>WiX Toolset .NET extension</Title> |
10 | <DebugType>embedded</DebugType> | ||
11 | <IncludeSymbols>true</IncludeSymbols> | 11 | <IncludeSymbols>true</IncludeSymbols> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | 13 | ||
@@ -15,12 +15,11 @@ | |||
15 | <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | 17 | ||
18 | <ItemGroup> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
19 | <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 19 | <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | 21 | ||
22 | <ItemGroup> | 22 | <ItemGroup> |
23 | <PackageReference Include="WixToolset.Data" /> | 23 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
24 | <PackageReference Include="WixToolset.Extensibility" /> | ||
25 | </ItemGroup> | 24 | </ItemGroup> |
26 | </Project> | 25 | </Project> |