diff options
Diffstat (limited to 'src/ext/NetFx/wixlib')
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi (renamed from src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi) | 8 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs (renamed from src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs) | 2 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs (renamed from src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs) | 2 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs (renamed from src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs) | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi index bc332efc..98fbd523 100644 --- a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi +++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi | |||
@@ -5,11 +5,11 @@ | |||
5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
6 | 6 | ||
7 | <Fragment> | 7 | <Fragment> |
8 | <BundleExtension Id="$(var.Prefix)NetfxBundleExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\netfxbe.dll"> | 8 | <BootstrapperExtension Id="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\netfxbe.dll"> |
9 | <?foreach PLATFORM in x86;x64;arm64?> | 9 | <?foreach PLATFORM in x86;x64;arm64?> |
10 | <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" /> | 10 | <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" /> |
11 | <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" /> | 11 | <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" /> |
12 | <?endforeach?> | 12 | <?endforeach?> |
13 | </BundleExtension> | 13 | </BootstrapperExtension> |
14 | </Fragment> | 14 | </Fragment> |
15 | </Include> | 15 | </Include> |
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs index 13757dd8..00b607a1 100644 --- a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs +++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs | |||
@@ -3,5 +3,5 @@ | |||
3 | 3 | ||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
5 | <?define platform=arm64 ?> | 5 | <?define platform=arm64 ?> |
6 | <?include NetfxBundleExtension_Platform.wxi ?> | 6 | <?include NetfxBootstrapperExtension_Platform.wxi ?> |
7 | </Wix> | 7 | </Wix> |
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs index f6c27a8e..a7412e60 100644 --- a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs +++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs | |||
@@ -3,5 +3,5 @@ | |||
3 | 3 | ||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
5 | <?define platform=x64 ?> | 5 | <?define platform=x64 ?> |
6 | <?include NetfxBundleExtension_Platform.wxi ?> | 6 | <?include NetfxBootstrapperExtension_Platform.wxi ?> |
7 | </Wix> | 7 | </Wix> |
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs index 76a8358f..406f6139 100644 --- a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs +++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs | |||
@@ -3,5 +3,5 @@ | |||
3 | 3 | ||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
5 | <?define platform=x86 ?> | 5 | <?define platform=x86 ?> |
6 | <?include NetfxBundleExtension_Platform.wxi ?> | 6 | <?include NetfxBootstrapperExtension_Platform.wxi ?> |
7 | </Wix> | 7 | </Wix> |