diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-26 11:31:05 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 11:14:01 -0700 |
commit | df016066100df955d5ff98811e113fb2b1bd4b8a (patch) | |
tree | a27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/NetFx/wixext | |
parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip |
Implement integrated build process
Diffstat (limited to 'src/ext/NetFx/wixext')
-rw-r--r-- | src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | 9 | ||||
-rw-r--r-- | src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj index 7c1d55c1..0e89f172 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | |||
@@ -20,12 +20,7 @@ | |||
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | 21 | ||
22 | <ItemGroup> | 22 | <ItemGroup> |
23 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 23 | <PackageReference Include="WixToolset.Data" /> |
24 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 24 | <PackageReference Include="WixToolset.Extensibility" /> |
25 | </ItemGroup> | ||
26 | |||
27 | <ItemGroup> | ||
28 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
30 | </ItemGroup> | 25 | </ItemGroup> |
31 | </Project> | 26 | </Project> |
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec | |||
@@ -14,12 +14,12 @@ | |||
14 | </metadata> | 14 | </metadata> |
15 | 15 | ||
16 | <files> | 16 | <files> |
17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
18 | 18 | ||
19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
20 | 20 | ||
21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 21 | <file src="..\ARM64\*.pdb" target="pdbs\ARM64" /> |
22 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
23 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
24 | </files> | 24 | </files> |
25 | </package> | 25 | </package> |