Skip to content

Commit 6357340

Browse files
JoshMcCulloughJoshMcCullough
committed
Fixed build configurations.
1 parent 531b059 commit 6357340

8 files changed

Lines changed: 243 additions & 211 deletions

File tree

‎Source/Client/Client.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</DocumentationFile>
6565
<Prefer32Bit>false</Prefer32Bit>
6666
</PropertyGroup>
67-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
67+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|AnyCPU' ">
6868
<DebugType>pdbonly</DebugType>
6969
<Optimize>true</Optimize>
7070
<OutputPath>bin\Release\</OutputPath>
@@ -93,7 +93,7 @@
9393
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
9494
<Prefer32Bit>false</Prefer32Bit>
9595
</PropertyGroup>
96-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
96+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|x86' ">
9797
<OutputPath>bin\x86\Release\</OutputPath>
9898
<DefineConstants>TRACE</DefineConstants>
9999
<Optimize>true</Optimize>
@@ -127,7 +127,7 @@
127127
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
128128
<Prefer32Bit>false</Prefer32Bit>
129129
</PropertyGroup>
130-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
130+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|x64' ">
131131
<OutputPath>bin\x64\Release\</OutputPath>
132132
<DefineConstants>TRACE</DefineConstants>
133133
<Optimize>true</Optimize>
@@ -155,7 +155,7 @@
155155
<AssemblyOriginatorKeyFile>
156156
</AssemblyOriginatorKeyFile>
157157
</PropertyGroup>
158-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|AnyCPU'">
158+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|AnyCPU' ">
159159
<DebugSymbols>true</DebugSymbols>
160160
<OutputPath>bin\Debug %28x64%29\</OutputPath>
161161
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -165,7 +165,7 @@
165165
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
166166
<Prefer32Bit>false</Prefer32Bit>
167167
</PropertyGroup>
168-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|x86'">
168+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x86' ">
169169
<DebugSymbols>true</DebugSymbols>
170170
<OutputPath>bin\x86\Debug %28x64%29\</OutputPath>
171171
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -177,7 +177,7 @@
177177
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
178178
<Prefer32Bit>false</Prefer32Bit>
179179
</PropertyGroup>
180-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|x64'">
180+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x64' ">
181181
<DebugSymbols>true</DebugSymbols>
182182
<OutputPath>bin\x64\Debug %28x64%29\</OutputPath>
183183
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -187,7 +187,7 @@
187187
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
188188
<Prefer32Bit>false</Prefer32Bit>
189189
</PropertyGroup>
190-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|AnyCPU'">
190+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|AnyCPU' ">
191191
<DebugSymbols>true</DebugSymbols>
192192
<OutputPath>bin\Release %28x64%29\</OutputPath>
193193
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -197,7 +197,7 @@
197197
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
198198
<Prefer32Bit>false</Prefer32Bit>
199199
</PropertyGroup>
200-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|x86'">
200+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x86' ">
201201
<DebugSymbols>true</DebugSymbols>
202202
<OutputPath>bin\x86\Release %28x64%29\</OutputPath>
203203
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -209,7 +209,7 @@
209209
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
210210
<Prefer32Bit>false</Prefer32Bit>
211211
</PropertyGroup>
212-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|x64'">
212+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x64' ">
213213
<DebugSymbols>true</DebugSymbols>
214214
<OutputPath>bin\x64\Release %28x64%29\</OutputPath>
215215
<DefineConstants>DEBUG;TRACE</DefineConstants>

‎Source/Client/Samples/NET4, C#, LINQ, WebForms.zip‎

-11.7 KB
Binary file not shown.

‎Source/Client/Samples/Sample-CS-EF.zip‎

-12.3 KB
Binary file not shown.

‎Source/CodeGenerator.sln‎

Lines changed: 183 additions & 183 deletions
Large diffs are not rendered by default.

‎Source/Core/Core.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<WarningLevel>4</WarningLevel>
4040
<Prefer32Bit>false</Prefer32Bit>
4141
</PropertyGroup>
42-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
42+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|AnyCPU' ">
4343
<DebugType>pdbonly</DebugType>
4444
<Optimize>true</Optimize>
4545
<OutputPath>bin\Release\</OutputPath>
@@ -68,7 +68,7 @@
6868
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
6969
<Prefer32Bit>false</Prefer32Bit>
7070
</PropertyGroup>
71-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
71+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|x86' ">
7272
<OutputPath>bin\x86\Release\</OutputPath>
7373
<DefineConstants>TRACE</DefineConstants>
7474
<Optimize>true</Optimize>
@@ -102,7 +102,7 @@
102102
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
103103
<Prefer32Bit>false</Prefer32Bit>
104104
</PropertyGroup>
105-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
105+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|x64' ">
106106
<OutputPath>bin\x64\Release\</OutputPath>
107107
<DefineConstants>TRACE</DefineConstants>
108108
<Optimize>true</Optimize>
@@ -125,7 +125,7 @@
125125
<AssemblyOriginatorKeyFile>
126126
</AssemblyOriginatorKeyFile>
127127
</PropertyGroup>
128-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|AnyCPU'">
128+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|AnyCPU' ">
129129
<DebugSymbols>true</DebugSymbols>
130130
<OutputPath>bin\Debug %28x64%29\</OutputPath>
131131
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -135,7 +135,7 @@
135135
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
136136
<Prefer32Bit>false</Prefer32Bit>
137137
</PropertyGroup>
138-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|x86'">
138+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x86' ">
139139
<DebugSymbols>true</DebugSymbols>
140140
<OutputPath>bin\x86\Debug %28x64%29\</OutputPath>
141141
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -145,7 +145,7 @@
145145
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
146146
<Prefer32Bit>false</Prefer32Bit>
147147
</PropertyGroup>
148-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|x64'">
148+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x64' ">
149149
<DebugSymbols>true</DebugSymbols>
150150
<OutputPath>bin\x64\Debug %28x64%29\</OutputPath>
151151
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -155,7 +155,7 @@
155155
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
156156
<Prefer32Bit>false</Prefer32Bit>
157157
</PropertyGroup>
158-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|AnyCPU'">
158+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|AnyCPU' ">
159159
<DebugSymbols>true</DebugSymbols>
160160
<OutputPath>bin\Release %28x64%29\</OutputPath>
161161
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -165,7 +165,7 @@
165165
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
166166
<Prefer32Bit>false</Prefer32Bit>
167167
</PropertyGroup>
168-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|x86'">
168+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x86' ">
169169
<DebugSymbols>true</DebugSymbols>
170170
<OutputPath>bin\x86\Release %28x64%29\</OutputPath>
171171
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -175,7 +175,7 @@
175175
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
176176
<Prefer32Bit>false</Prefer32Bit>
177177
</PropertyGroup>
178-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|x64'">
178+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x64' ">
179179
<DebugSymbols>true</DebugSymbols>
180180
<OutputPath>bin\x64\Release %28x64%29\</OutputPath>
181181
<DefineConstants>DEBUG;TRACE</DefineConstants>

‎Source/Plugins/MVC Admin/MVC Admin.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<WarningLevel>4</WarningLevel>
2929
<Prefer32Bit>false</Prefer32Bit>
3030
</PropertyGroup>
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|AnyCPU' ">
3232
<DebugType>pdbonly</DebugType>
3333
<Optimize>true</Optimize>
3434
<OutputPath>bin\Release\</OutputPath>
@@ -62,7 +62,7 @@
6262
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
6363
<Prefer32Bit>false</Prefer32Bit>
6464
</PropertyGroup>
65-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
65+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|x64' ">
6666
<OutputPath>bin\x64\Release\</OutputPath>
6767
<DefineConstants>TRACE</DefineConstants>
6868
<Optimize>true</Optimize>
@@ -97,7 +97,7 @@
9797
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
9898
<Prefer32Bit>false</Prefer32Bit>
9999
</PropertyGroup>
100-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
100+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x86|x86' ">
101101
<OutputPath>bin\x86\Release\</OutputPath>
102102
<DefineConstants>TRACE</DefineConstants>
103103
<Optimize>true</Optimize>
@@ -115,7 +115,7 @@
115115
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
116116
<Prefer32Bit>false</Prefer32Bit>
117117
</PropertyGroup>
118-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|AnyCPU'">
118+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|AnyCPU' ">
119119
<DebugSymbols>true</DebugSymbols>
120120
<OutputPath>bin\Debug %28x64%29\</OutputPath>
121121
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -125,7 +125,7 @@
125125
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
126126
<Prefer32Bit>false</Prefer32Bit>
127127
</PropertyGroup>
128-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|x64'">
128+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x64' ">
129129
<DebugSymbols>true</DebugSymbols>
130130
<OutputPath>bin\x64\Debug %28x64%29\</OutputPath>
131131
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -135,7 +135,7 @@
135135
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
136136
<Prefer32Bit>false</Prefer32Bit>
137137
</PropertyGroup>
138-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28x64%29|x86'">
138+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x86' ">
139139
<DebugSymbols>true</DebugSymbols>
140140
<OutputPath>bin\x86\Debug %28x64%29\</OutputPath>
141141
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -145,7 +145,7 @@
145145
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
146146
<Prefer32Bit>false</Prefer32Bit>
147147
</PropertyGroup>
148-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|AnyCPU'">
148+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|AnyCPU' ">
149149
<DebugSymbols>true</DebugSymbols>
150150
<OutputPath>bin\Release %28x64%29\</OutputPath>
151151
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -155,7 +155,7 @@
155155
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
156156
<Prefer32Bit>false</Prefer32Bit>
157157
</PropertyGroup>
158-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|x64'">
158+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x64' ">
159159
<DebugSymbols>true</DebugSymbols>
160160
<OutputPath>bin\x64\Release %28x64%29\</OutputPath>
161161
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -165,7 +165,7 @@
165165
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
166166
<Prefer32Bit>false</Prefer32Bit>
167167
</PropertyGroup>
168-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28x64%29|x86'">
168+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x86' ">
169169
<DebugSymbols>true</DebugSymbols>
170170
<OutputPath>bin\x86\Release %28x64%29\</OutputPath>
171171
<DefineConstants>DEBUG;TRACE</DefineConstants>

‎Source/Setup/Client/Client.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?endif ?>
1515

1616
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
17-
<Product Id="*" Manufacturer="Quantum Concepts" Name="CodeGenerator ($(var.Platform))" Version="1.7.3.2" Language="1033" UpgradeCode="$(var.UpgradeCode)">
17+
<Product Id="*" Manufacturer="Quantum Concepts" Name="CodeGenerator ($(var.Platform))" Version="1.7.4.0" Language="1033" UpgradeCode="$(var.UpgradeCode)">
1818
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="$(var.Platform)"/>
1919
<MediaTemplate EmbedCab="yes" CompressionLevel="high" CabinetTemplate="_{0}.cab"/>
2020
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>

‎Source/Setup/Plugins/MVC Admin/MVC Admin.wixproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,38 @@
2929
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
3030
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
3131
</PropertyGroup>
32+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x86' ">
33+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
34+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
35+
</PropertyGroup>
36+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|x64' ">
37+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
38+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
39+
</PropertyGroup>
40+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|AnyCPU' ">
41+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
42+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
43+
</PropertyGroup>
44+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-x64|Any CPU' ">
45+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
46+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
47+
</PropertyGroup>
48+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x86' ">
49+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
50+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
51+
</PropertyGroup>
52+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|x64' ">
53+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
54+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
55+
</PropertyGroup>
56+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|AnyCPU' ">
57+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
58+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
59+
</PropertyGroup>
60+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-x64|Any CPU' ">
61+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
62+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
63+
</PropertyGroup>
3264
<ItemGroup>
3365
<Compile Include="MVC Admin.wxs" />
3466
</ItemGroup>

0 commit comments

Comments
 (0)