build.properties | 2 +- win/Console.wxs | 4 ++++ win/VERSION.mak | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit a66829ef0d8fab0ad822f695c7be0205acca087d Author: Noriko Hosoi nhosoi@redhat.com Date: Fri Jul 10 16:34:44 2015 -0700
version 1.1.12
- Separate PolicyCRT from CRT in WixMerge. Note: there is not policy msm in MSVC 11 C:\Program Files (x86)\Common Files\Merge Modules
diff --git a/build.properties b/build.properties index a8f5ed0..b34dc8d 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ lang=en
console.root=. console.version=11 -console.dotversion=1.1.11 +console.dotversion=1.1.12 console.dotgenversion=1.1
theme.core=389-console diff --git a/win/Console.wxs b/win/Console.wxs index 885d35b..d0cf35d 100644 --- a/win/Console.wxs +++ b/win/Console.wxs @@ -303,6 +303,10 @@ <?if $(var.CRTMSM) AND ($(var.CRTMSM) != $(var.EMPTY)) ?> <Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'> <MergeRef Id='CRT' /> + </Feature> +<?endif ?> +<?if $(var.POLICYCRTMSM) AND ($(var.POLICYCRTMSM) != $(var.EMPTY)) ?> + <Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'> <MergeRef Id='PolicyCRT' /> </Feature> <?endif ?> diff --git a/win/VERSION.mak b/win/VERSION.mak index c97e041..7e58e64 100644 --- a/win/VERSION.mak +++ b/win/VERSION.mak @@ -7,7 +7,7 @@ BRANDNOSPACE=389 # this is the vendor or manufacturer VENDOR=389 Project # the version -VERSION=1.1.11 +VERSION=1.1.12 # the name of the product - this is used in the title of the # installer, in the name of the folder, and in the name # of the shortcuts