Skip to content

Commit d2e5e6c

Browse files
committed
Deleted \r\t\n
1 parent 4d84071 commit d2e5e6c

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

GoogleTestAdapter/NewProjectWizard/WizardImplementation.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public class WizardImplementation : IWizard
2626
private const string RuntimeRelease = "$rtrelease$";
2727
private const string RunSilent = "$runsilent$";
2828
private const string ARM64DebugPlatform = "$arm64debugplatform$";
29-
private string arm64DebugXMLChunk = " <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Debug|ARM64'\">\r\n\t<ClCompile>\r\n\t <PrecompiledHeader>Use</PrecompiledHeader>\r\n\t <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r\n\t <Optimization>Disabled</Optimization>\r\n\t <PreprocessorDefinitions>ARM64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r\n\t <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r\n\t <RuntimeLibrary>$rtdebug$</RuntimeLibrary>\r\n\t <WarningLevel>Level3</WarningLevel>\r\n\t</ClCompile>\r\n\t<Link>\r\n\t <GenerateDebugInformation>true</GenerateDebugInformation>\r\n\t <SubSystem>Console</SubSystem>\r\n\t</Link>\r\n </ItemDefinitionGroup>";
29+
private 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>$rtdebug$</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> </Link> </ItemDefinitionGroup>";
3030
private const string ARM64ReleasePlatform = "$arm64releaseplatform$";
31-
private string arm64ReleaseXMLChunk = " <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Release|ARM64'\">\r\n\t<ClCompile>\r\n\t <PrecompiledHeader>Use</PrecompiledHeader>\r\n\t <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r\n\t <PreprocessorDefinitions>ARM64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r\n\t <RuntimeLibrary>$rtrelease$</RuntimeLibrary>\r\n\t <WarningLevel>Level3</WarningLevel>\r\n\t <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r\n\t</ClCompile>\r\n\t<Link>\r\n\t <GenerateDebugInformation>true</GenerateDebugInformation>\r\n\t <SubSystem>Console</SubSystem>\r\n\t <OptimizeReferences>true</OptimizeReferences>\r\n\t <EnableCOMDATFolding>true</EnableCOMDATFolding>\r\n\t</Link>\r\n </ItemDefinitionGroup>";
31+
private string arm64ReleaseXMLChunk = " <ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='Release|ARM64'\"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PreprocessorDefinitions>ARM64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>$rtrelease$</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup>";
3232
private const string ARM64Config = "$arm64config$";
33-
private string arm64ConfigXML = "\t<ProjectConfiguration Include=\"Debug|ARM64\">\r\n\t <Configuration>Debug</Configuration>\r\n\t <Platform>ARM64</Platform>\r\n\t</ProjectConfiguration>\r\n\t<ProjectConfiguration Include=\"Release|ARM64\">\r\n\t <Configuration>Release</Configuration>\r\n\t <Platform>ARM64</Platform>\r\n\t</ProjectConfiguration>";
33+
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>";
3434
private List<Project> projects = new List<Project>();
3535
private int selectedProjectIndex;
3636
private IWizard nugetWizard;
@@ -183,10 +183,7 @@ public void RunStarted(object automationObject,
183183
.Where(name => name != null)
184184
.OrderByDescending(p => p.Version).ToList();
185185

186-
if (this.IsARM64()) {
187-
allPlatformsForLatestSdk.Add(TryParsePlatformVersion("ARM64"));
188-
}
189-
else {
186+
if (!this.IsARM64()) {
190187
arm64DebugXMLChunk = "";
191188
arm64ReleaseXMLChunk = "";
192189
arm64ConfigXML = "";

0 commit comments

Comments
 (0)