Skip to content

Commit 2db5b8a

Browse files
committed
Syntax and formatting cleanup
1 parent b3ba819 commit 2db5b8a

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Configuration>Release</Configuration>
1818
<Platform>x64</Platform>
1919
</ProjectConfiguration>
20-
$arm64config$
20+
$arm64config$
2121
</ItemGroup>
2222
<PropertyGroup Label="Globals">
2323
<ProjectGuid>{$guid1$}</ProjectGuid>

GoogleTestAdapter/NewProjectWizard/WizardImplementation.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class WizardImplementation : IWizard
3030
private const string ARM64Config = "$arm64config$";
3131
private string arm64ConfigXML = "<ProjectConfiguration Include=\"Debug|ARM64\"> <Configuration>Debug</Configuration> <Platform>ARM64</Platform> </ProjectConfiguration> <ProjectConfiguration Include=\"Release|ARM64\"> <Configuration>Release</Configuration> <Platform>ARM64</Platform> </ProjectConfiguration>";
3232
private const string ARM64Pch = "$arm64Pch$";
33-
private string ARM64PchXML = "<PrecompiledHeader Condition=\"'$(Configuration)|$(Platform)'=='Debug|ARM64'\">Create</PrecompiledHeader> <PrecompiledHeader Condition=\"'$(Configuration)|$(Platform)'=='Release|ARM64'\">Create</PrecompiledHeader>";
33+
private string arm64PchXML = "<PrecompiledHeader Condition=\"'$(Configuration)|$(Platform)'=='Debug|ARM64'\">Create</PrecompiledHeader> <PrecompiledHeader Condition=\"'$(Configuration)|$(Platform)'=='Release|ARM64'\">Create</PrecompiledHeader>";
3434
private List<Project> projects = new List<Project>();
3535
private int selectedProjectIndex;
3636
private IWizard nugetWizard;
@@ -155,19 +155,19 @@ public void RunStarted(object automationObject,
155155
string RuntimeReleaseValue = "MultiThreadedDLL";
156156
if (configurationData.IsRuntimeStatic)
157157
{
158-
RuntimeReleaseValue = "MultiThreaded";
159158
RuntimeDebugValue = "MultiThreadedDebug";
159+
RuntimeReleaseValue = "MultiThreaded";
160160
}
161161
else
162162
{
163-
RuntimeReleaseValue = "MultiThreadedDLL";
164163
RuntimeDebugValue = "MultiThreadedDebugDLL";
164+
RuntimeReleaseValue = "MultiThreadedDLL";
165165
}
166166

167167
string arm64DebugXMLChunk = $" <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Debug|ARM64'\"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>ARM64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>{RuntimeDebugValue}</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> </Link> </ItemDefinitionGroup>";
168168
string arm64ReleaseXMLChunk = $" <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Release|ARM64'\"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PreprocessorDefinitions>ARM64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>{RuntimeReleaseValue}</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup>";
169-
replacementsDictionary[RuntimeRelease] = RuntimeReleaseValue;
170169
replacementsDictionary[RuntimeDebug] = RuntimeDebugValue;
170+
replacementsDictionary[RuntimeRelease] = RuntimeReleaseValue;
171171

172172
if (!isPlatformSet)
173173
{
@@ -191,13 +191,13 @@ public void RunStarted(object automationObject,
191191
.OrderByDescending(p => p.Version).ToList();
192192

193193
if (!this.IsARM64()) {
194+
arm64ConfigXML = "";
195+
arm64PchXML = "";
194196
arm64DebugXMLChunk = "";
195197
arm64ReleaseXMLChunk = "";
196-
arm64ConfigXML = "";
197-
ARM64PchXML = "";
198198
}
199199
replacementsDictionary[ARM64Config] = arm64ConfigXML;
200-
replacementsDictionary[ARM64Pch] = ARM64PchXML;
200+
replacementsDictionary[ARM64Pch] = arm64PchXML;
201201
replacementsDictionary[ARM64DebugPlatform] = arm64DebugXMLChunk;
202202
replacementsDictionary[ARM64ReleasePlatform] = arm64ReleaseXMLChunk;
203203

0 commit comments

Comments
 (0)