Changeset 2982


Ignore:
Timestamp:
1/14/2017 9:15:21 AM (5 months ago)
Author:
gtrant
Message:

MSBuild issue

Location:
trunk/eraser
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser/Eraser.Shell/ShellExt.vcxproj

    r2981 r2982  
    2626    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> 
    2727  </PropertyGroup> 
    28   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
     28  <Import Project="$(VCTargetsPath14)\Microsoft.Cpp.Default.props" /> 
    2929  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    3030    <ConfigurationType>DynamicLibrary</ConfigurationType> 
     
    4848    <CharacterSet>Unicode</CharacterSet> 
    4949    <WholeProgramOptimization>true</WholeProgramOptimization> 
    50     <PlatformToolset>v120</PlatformToolset> 
     50    <PlatformToolset>v140</PlatformToolset> 
    5151  </PropertyGroup> 
    5252  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 
  • trunk/eraser/Eraser.Util.Native/Eraser.Util.Native.vcxproj

    r2981 r2982  
    2525    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> 
    2626  </PropertyGroup> 
    27   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
     27  <Import Project="$(VCTargetsPath14)\Microsoft.Cpp.Default.props" /> 
    2828  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    2929    <ConfigurationType>DynamicLibrary</ConfigurationType> 
     
    4444    <CLRSupport>true</CLRSupport> 
    4545    <WholeProgramOptimization>true</WholeProgramOptimization> 
    46     <PlatformToolset>v120</PlatformToolset> 
     46    <PlatformToolset>v140</PlatformToolset> 
    4747  </PropertyGroup> 
    4848  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 
  • trunk/eraser/Installer/Bootstrapper/Bootstrapper.vcxproj

    r2981 r2982  
    1818    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> 
    1919  </PropertyGroup> 
    20   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
     20  <Import Project="$(VCTargetsPath14)\Microsoft.Cpp.Default.props" /> 
    2121  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    2222    <ConfigurationType>Application</ConfigurationType> 
    2323    <CharacterSet>Unicode</CharacterSet> 
    2424    <WholeProgramOptimization>true</WholeProgramOptimization> 
    25     <PlatformToolset>v120</PlatformToolset> 
     25    <PlatformToolset>v140</PlatformToolset> 
    2626  </PropertyGroup> 
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 
  • trunk/eraser/Version.cs

    r2981 r2982  
    2323using System.Diagnostics; 
    2424 
    25 [assembly: AssemblyFileVersion("6.2.0.2980")] 
    26 [assembly: AssemblyVersion("6.2.0.2980")] 
     25[assembly: AssemblyFileVersion("6.2.0.2981")] 
     26[assembly: AssemblyVersion("6.2.0.2981")] 
    2727 
    2828namespace Eraser { 
    2929    internal static class BuildInfo 
    3030    { 
    31         public static readonly DateTime BuildDate = DateTime.Parse("2017/01/12 21:57:09", 
     31        public static readonly DateTime BuildDate = DateTime.Parse("2017/01/12 22:29:34", 
    3232            System.Globalization.CultureInfo.InvariantCulture); 
    3333        public const bool CustomBuild = true; 
  • trunk/eraser/Version.wxs

    r2981 r2982  
    2222 
    2323<Include> 
    24     <?define VERSIONSTRING=6.2.0.2980 ?><!-- Major.Minor.Release.Build --> 
    25     <?define INTERNALVERSIONSTRING=6.2.2980 ?><!-- Major.Minor.Build; used for MSI version comparisons --> 
     24    <?define VERSIONSTRING=6.2.0.2981 ?><!-- Major.Minor.Release.Build --> 
     25    <?define INTERNALVERSIONSTRING=6.2.2981 ?><!-- Major.Minor.Build; used for MSI version comparisons --> 
    2626</Include> 
Note: See TracChangeset for help on using the changeset viewer.