diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs index 320aadb10b46..b1bbe4dec85a 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs +++ b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs @@ -1,7 +1,6 @@ - + - - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 038dd250ff40..87d8f979dd31 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -2,7 +2,9 @@ $(IntermediateOutputPath)d\ $(BaseIntermediateOutputPath) + $(OutputPath)$(Cultures)/ $(DefineConstants);DepsPath=$(DepsPath) + $(DefineConstants);OutputPath=$(OutputPath) diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs new file mode 100644 index 000000000000..2084a077f59b --- /dev/null +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 70d236243305..171edda4fbd4 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -17,8 +17,7 @@ - - + $(WixExtDir)\WixUtilExtension.dll WixUtilExtension @@ -40,4 +39,60 @@ + + + $(PackageVersion) + $(PackageVersion) + $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) + + + + + x64 + SharedFxRedistInstallerx64 + $(SharedFxPackageVersion) + + + x86 + SharedFxRedistInstallerx86 + $(SharedFxPackageVersion) + + + + + + + + + + + + SharedFxInstallerProductVersionx64 + SharedFxInstallerProductCodex64 + + + SharedFxInstallerProductVersionx86 + SharedFxInstallerProductCodex86 + + + + + + + + + + + + + $(DefineConstants);SharedFxRedistInstallerx64=$(SharedFxRedistInstallerx64) + $(DefineConstants);SharedFxInstallerProductVersionx64=$(SharedFxInstallerProductVersionx64) + $(DefineConstants);SharedFxInstallerProductCodex64=$(SharedFxInstallerProductCodex64) + $(DefineConstants);SharedFxRedistInstallerx86=$(SharedFxRedistInstallerx86) + $(DefineConstants);SharedFxInstallerProductVersionx86=$(SharedFxInstallerProductVersionx86) + $(DefineConstants);SharedFxInstallerProductCodex86=$(SharedFxInstallerProductCodex86) + +