Skip to content

Commit 045aaba

Browse files
couchcodingcouchcoding
committed
Support for x86 64-Bit
Increased version and added support for x86 64-Bit
1 parent bbed28f commit 045aaba

File tree

14 files changed

+108
-34
lines changed

14 files changed

+108
-34
lines changed

‎src/Couchcoding.Logbert.Gui/Couchcoding.Logbert.Gui.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,24 @@
3131
<ErrorReport>prompt</ErrorReport>
3232
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
3333
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
35+
<DebugSymbols>true</DebugSymbols>
36+
<OutputPath>bin\Debug\</OutputPath>
37+
<DefineConstants>DEBUG;TRACE</DefineConstants>
38+
<DebugType>full</DebugType>
39+
<PlatformTarget>AnyCPU</PlatformTarget>
40+
<ErrorReport>prompt</ErrorReport>
41+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
44+
<OutputPath>bin\Release\</OutputPath>
45+
<DefineConstants>TRACE</DefineConstants>
46+
<Optimize>true</Optimize>
47+
<DebugType>pdbonly</DebugType>
48+
<PlatformTarget>AnyCPU</PlatformTarget>
49+
<ErrorReport>prompt</ErrorReport>
50+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
51+
</PropertyGroup>
3452
<ItemGroup>
3553
<Reference Include="System" />
3654
<Reference Include="System.Core" />

‎src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.5.7.0")]
35-
[assembly: AssemblyFileVersion("1.5.7.0")]
34+
[assembly: AssemblyVersion("1.6.0.0")]
35+
[assembly: AssemblyFileVersion("1.6.0.0")]

‎src/Couchcoding.Logbert.Theme/Couchcoding.Logbert.Theme.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,24 @@
3131
<ErrorReport>prompt</ErrorReport>
3232
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
3333
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
35+
<DebugSymbols>true</DebugSymbols>
36+
<OutputPath>bin\Debug\</OutputPath>
37+
<DefineConstants>DEBUG;TRACE</DefineConstants>
38+
<DebugType>full</DebugType>
39+
<PlatformTarget>AnyCPU</PlatformTarget>
40+
<ErrorReport>prompt</ErrorReport>
41+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
44+
<OutputPath>bin\Release\</OutputPath>
45+
<DefineConstants>TRACE</DefineConstants>
46+
<Optimize>true</Optimize>
47+
<DebugType>pdbonly</DebugType>
48+
<PlatformTarget>AnyCPU</PlatformTarget>
49+
<ErrorReport>prompt</ErrorReport>
50+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
51+
</PropertyGroup>
3452
<ItemGroup>
3553
<Reference Include="System" />
3654
<Reference Include="System.Core" />

‎src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.5.7.0")]
35-
[assembly: AssemblyFileVersion("1.5.7.0")]
34+
[assembly: AssemblyVersion("1.6.0.0")]
35+
[assembly: AssemblyFileVersion("1.6.0.0")]

‎src/Logbert Setup/Includes/GlobalDefines.wxi

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@
3434

3535
<?if $(var.Platform) = x64 ?>
3636
<?define Win64 = "yes" ?>
37+
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
3738
<?else ?>
3839
<?define Win64 = "no" ?>
40+
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
3941
<?endif ?>
4042

41-
<?define Manufacturer = "Couchcoding" ?>
42-
<?define ProductName = "Logbert" ?>
43+
<?define Manufacturer = "Couchcoding" ?>
44+
<?define ProductName = "Logbert" ?>
4345

44-
<?define ReleaseDir = "..\Logbert\bin\x86\Release" ?>
46+
<?define ReleaseDir = "..\Logbert\bin\Release" ?>
4547

4648
<?define UpgradeCode = "12B94D27-128D-4498-ADBF-A90DA2122854"?>
4749

‎src/Logbert Setup/Install/Files.wxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<!-- Define the installation directories on the target machine. -->
3636
<Directory Id="TARGETDIR" Name="SourceDir">
3737

38-
<Directory Id="ProgramFilesFolder">
38+
<Directory Id="$(var.PlatformProgramFilesFolder)">
3939
<Directory Id="ManufacturerName" Name="$(var.Manufacturer)">
4040
<Directory Id="INSTALLDIR" Name="$(var.ProductName)" />
4141
</Directory>

‎src/Logbert Setup/Install/Shortcuts.wxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<?if $(var.Platform) = x64 ?>
5353
<Shortcut Id = "UninstallShortCut"
5454
Name = "!(loc.ShortcutUninstall)"
55-
Descroption = "!(loc.ShortcutDescUninstall)"
55+
Description = "!(loc.ShortcutDescUninstall)"
5656
Target = "[System64Folder]msiexec.exe"
5757
Arguments = "/x [ProductCode]"/>
5858
<?else?>

‎src/Logbert Setup/Localization/en-US.wxl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<String Id="ShortcutUninstall">Uninstall</String>
5151
<String Id="ShortcutDescUninstall">Uninstall Logbert.</String>
5252

53-
<String Id="ConditionInvalidOS">You need Windows XP SP3 or higher for Resetto.</String>
54-
<String Id="ConditionNoDotNet35">Resetto needs the .NET Framework 4.0 or higher.</String>
53+
<String Id="ConditionInvalidOS">You need Windows XP SP3 or higher for Logbert.</String>
54+
<String Id="ConditionNoDotNet35">Logbert needs the .NET Framework 4.0 or higher.</String>
5555

5656
</WixLocalization>

‎src/Logbert Setup/Logbert Setup.wixproj

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,31 @@
1212
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
15-
<OutputPath>bin\$(Configuration)\</OutputPath>
15+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
1616
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
17+
<SuppressSpecificWarnings>
18+
</SuppressSpecificWarnings>
1719
<DefineConstants>Debug</DefineConstants>
1820
</PropertyGroup>
1921
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
20-
<OutputPath>bin\$(Configuration)\</OutputPath>
22+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
2123
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
24+
<SuppressSpecificWarnings>
25+
</SuppressSpecificWarnings>
26+
<SuppressIces>ICE61</SuppressIces>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
29+
<DefineConstants>Debug</DefineConstants>
30+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
31+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
32+
<SuppressSpecificWarnings>
33+
</SuppressSpecificWarnings>
34+
</PropertyGroup>
35+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
36+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
37+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
38+
<SuppressSpecificWarnings>
39+
</SuppressSpecificWarnings>
2240
<SuppressIces>ICE61</SuppressIces>
2341
</PropertyGroup>
2442
<ItemGroup>

‎src/Logbert.sln

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29418.71
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logbert", "Logbert\Logbert.csproj", "{EE81C506-55E4-417E-B1D6-09453F89C7CD}"
77
EndProject
@@ -17,25 +17,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Couchcoding.Logbert.Theme",
1717
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20-
Debug|x86 = Debug|x86
21-
Release|x86 = Release|x86
20+
Debug|Any CPU = Debug|Any CPU
21+
Release|Any CPU = Release|Any CPU
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Debug|x86.ActiveCfg = Debug|x86
25-
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Debug|x86.Build.0 = Debug|x86
26-
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Release|x86.ActiveCfg = Release|x86
27-
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Release|x86.Build.0 = Release|x86
28-
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Debug|x86.ActiveCfg = Debug|x86
29-
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Debug|x86.Build.0 = Debug|x86
30-
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Release|x86.ActiveCfg = Release|x86
31-
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Release|x86.Build.0 = Release|x86
32-
{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}.Debug|x86.ActiveCfg = Debug|x86
33-
{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}.Release|x86.ActiveCfg = Release|x86
34-
{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}.Release|x86.Build.0 = Release|x86
35-
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Debug|x86.ActiveCfg = Debug|x86
36-
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Debug|x86.Build.0 = Debug|x86
37-
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Release|x86.ActiveCfg = Release|x86
38-
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Release|x86.Build.0 = Release|x86
24+
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}.Debug|Any CPU.ActiveCfg = Debug|x86
33+
{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}.Release|Any CPU.ActiveCfg = Release|x64
34+
{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}.Release|Any CPU.Build.0 = Release|x64
35+
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{DE30D0ED-E29F-4779-A057-C7C1F1EF4F59}.Release|Any CPU.Build.0 = Release|Any CPU
3939
EndGlobalSection
4040
GlobalSection(SolutionProperties) = preSolution
4141
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)