aboutsummaryrefslogtreecommitdiff
path: root/src/setup
diff options
context:
space:
mode:
Diffstat (limited to 'src/setup')
-rw-r--r--src/setup/OSMFEULA.rtfbin48699 -> 3728 bytes
-rw-r--r--src/setup/wix-cli/Package.wxs3
-rw-r--r--src/setup/wix-cli/wix-cli.wixproj2
3 files changed, 0 insertions, 5 deletions
diff --git a/src/setup/OSMFEULA.rtf b/src/setup/OSMFEULA.rtf
index e988b435..46dfbfca 100644
--- a/src/setup/OSMFEULA.rtf
+++ b/src/setup/OSMFEULA.rtf
Binary files differ
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs
index 897a1e5a..cbf28115 100644
--- a/src/setup/wix-cli/Package.wxs
+++ b/src/setup/wix-cli/Package.wxs
@@ -30,9 +30,6 @@
30 <Exclude Files="!(bindpath.Files)\**\*.xml" /> 30 <Exclude Files="!(bindpath.Files)\**\*.xml" />
31 <Exclude Files="!(bindpath.Files)\**\*.targets" /> 31 <Exclude Files="!(bindpath.Files)\**\*.targets" />
32 </Files> 32 </Files>
33
34 <Files Include="!(bindpath.Heat_x64)\**" Subdirectory="x64" />
35 <Files Include="!(bindpath.Heat_x86)\**" Subdirectory="x86" />
36 </ComponentGroup> 33 </ComponentGroup>
37 </Fragment> 34 </Fragment>
38 35
diff --git a/src/setup/wix-cli/wix-cli.wixproj b/src/setup/wix-cli/wix-cli.wixproj
index 5a5e2a93..7eb9acd0 100644
--- a/src/setup/wix-cli/wix-cli.wixproj
+++ b/src/setup/wix-cli/wix-cli.wixproj
@@ -9,8 +9,6 @@
9 9
10 <ItemGroup> 10 <ItemGroup>
11 <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" /> 11 <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" />
12 <BindPath BindName="Heat_x64" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x64\" />
13 <BindPath BindName="Heat_x86" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x86\" />
14 12
15 <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" /> 13 <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" />
16 <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" /> 14 <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" />