Clean up project files; Fix AnyCPU target actually being x64

Klocman · May 20, 2023 · dab6bf3 · dab6bf3
1 parent 775696e
commit dab6bf3
Show file tree

Hide file tree

Showing 16 changed files with 1,064 additions and 1,066 deletions.
diff --git a/source/BCU-console/BCU-console.csproj b/source/BCU-console/BCU-console.csproj
@@ -1,48 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>BCU_console</RootNamespace>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-       <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-       <OutputPath>..\..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-       <OutputPath>..\..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-       <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-       <OutputPath>..\..\bin\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-       <OutputPath>..\..\bin\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UninstallTools\UninstallTools.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Licence.licenseheader">
-      <Link>Licence.licenseheader</Link>
-    </None>
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<OutputType>Exe</OutputType>
+		<RootNamespace>BCU_console</RootNamespace>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<Platforms>AnyCPU;x64;x86</Platforms>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<RuntimeIdentifier></RuntimeIdentifier>
+		<OutputPath>..\..\bin\Debug\AnyCPU\</OutputPath>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
+		<OutputPath>..\..\bin\Debug\</OutputPath>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<OutputPath>..\..\bin\Debug\</OutputPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<RuntimeIdentifier></RuntimeIdentifier>
+		<OutputPath>..\..\bin\Release\AnyCPU\</OutputPath>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
+		<OutputPath>..\..\bin\Release\</OutputPath>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<OutputPath>..\..\bin\Release\</OutputPath>
+	</PropertyGroup>
+	<PropertyGroup>
+		<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Include="..\GlobalAssemblyInfo.cs">
+			<Link>Properties\GlobalAssemblyInfo.cs</Link>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\UninstallTools\UninstallTools.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\Licence.licenseheader">
+			<Link>Licence.licenseheader</Link>
+		</None>
+	</ItemGroup>
 </Project>
diff --git a/source/BulkCrapUninstaller.sln b/source/BulkCrapUninstaller.sln
@@ -1,19 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31205.134
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33424.131
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BulkCrapUninstaller", "BulkCrapUninstaller\BulkCrapUninstaller.csproj", "{5086CDDE-5B1D-485B-AABC-A63C633579B6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9C818D14-22AE-46DB-B179-119069AE6116} = {9C818D14-22AE-46DB-B179-119069AE6116}
 		{129CBF33-9E19-4D26-A601-5E8394907AE1} = {129CBF33-9E19-4D26-A601-5E8394907AE1}
-		{5247BD39-5DEB-4F14-AF4B-9598A8544D06} = {5247BD39-5DEB-4F14-AF4B-9598A8544D06}
-		{43022440-594D-437C-96C8-6AA24F6CEE63} = {43022440-594D-437C-96C8-6AA24F6CEE63}
-		{FA4F2993-A7F5-4738-9FE1-81F34DB032A7} = {FA4F2993-A7F5-4738-9FE1-81F34DB032A7}
-		{319C4596-0EE6-4392-9D7B-F937794133C7} = {319C4596-0EE6-4392-9D7B-F937794133C7}
 		{2E8CECA3-4872-439E-9A47-5304FB4BF705} = {2E8CECA3-4872-439E-9A47-5304FB4BF705}
-		{DCA3F6AD-0A1A-4E14-894A-114CC9B3B3E5} = {DCA3F6AD-0A1A-4E14-894A-114CC9B3B3E5}
+		{319C4596-0EE6-4392-9D7B-F937794133C7} = {319C4596-0EE6-4392-9D7B-F937794133C7}
+		{43022440-594D-437C-96C8-6AA24F6CEE63} = {43022440-594D-437C-96C8-6AA24F6CEE63}
+		{5247BD39-5DEB-4F14-AF4B-9598A8544D06} = {5247BD39-5DEB-4F14-AF4B-9598A8544D06}
 		{52FCBDB1-48D8-448D-B8CA-07F10AB3CA25} = {52FCBDB1-48D8-448D-B8CA-07F10AB3CA25}
+		{9C818D14-22AE-46DB-B179-119069AE6116} = {9C818D14-22AE-46DB-B179-119069AE6116}
+		{DCA3F6AD-0A1A-4E14-894A-114CC9B3B3E5} = {DCA3F6AD-0A1A-4E14-894A-114CC9B3B3E5}
+		{FA4F2993-A7F5-4738-9FE1-81F34DB032A7} = {FA4F2993-A7F5-4738-9FE1-81F34DB032A7}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UninstallTools", "UninstallTools\UninstallTools.csproj", "{87091C84-B671-4269-ABE4-D0F818AB201C}"
@@ -50,6 +50,21 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTreeMapTests", "SimpleTreeMapTests\SimpleTreeMapTests.csproj", "{3F3D249F-885B-4AF5-B760-3900D077D66B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCU-console", "BCU-console\BCU-console.csproj", "{2E8CECA3-4872-439E-9A47-5304FB4BF705}"
+	ProjectSection(ProjectDependencies) = postProject
+		{129CBF33-9E19-4D26-A601-5E8394907AE1} = {129CBF33-9E19-4D26-A601-5E8394907AE1}
+		{18FEDA0C-D147-4286-B39A-01204808106A} = {18FEDA0C-D147-4286-B39A-01204808106A}
+		{319C4596-0EE6-4392-9D7B-F937794133C7} = {319C4596-0EE6-4392-9D7B-F937794133C7}
+		{43022440-594D-437C-96C8-6AA24F6CEE63} = {43022440-594D-437C-96C8-6AA24F6CEE63}
+		{495A9EA6-B13C-48F9-A2E2-6667CECEBFDE} = {495A9EA6-B13C-48F9-A2E2-6667CECEBFDE}
+		{4F843421-01D4-48E8-B88B-CDF30DD671A4} = {4F843421-01D4-48E8-B88B-CDF30DD671A4}
+		{5247BD39-5DEB-4F14-AF4B-9598A8544D06} = {5247BD39-5DEB-4F14-AF4B-9598A8544D06}
+		{52FCBDB1-48D8-448D-B8CA-07F10AB3CA25} = {52FCBDB1-48D8-448D-B8CA-07F10AB3CA25}
+		{9C818D14-22AE-46DB-B179-119069AE6116} = {9C818D14-22AE-46DB-B179-119069AE6116}
+		{B5F0E648-A6E8-4D63-842C-90562148A930} = {B5F0E648-A6E8-4D63-842C-90562148A930}
+		{C28A3493-8FCA-4571-8F9E-27B8420C0720} = {C28A3493-8FCA-4571-8F9E-27B8420C0720}
+		{DCA3F6AD-0A1A-4E14-894A-114CC9B3B3E5} = {DCA3F6AD-0A1A-4E14-894A-114CC9B3B3E5}
+		{FA4F2993-A7F5-4738-9FE1-81F34DB032A7} = {FA4F2993-A7F5-4738-9FE1-81F34DB032A7}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OculusHelper", "OculusHelper\OculusHelper.csproj", "{319C4596-0EE6-4392-9D7B-F937794133C7}"
 EndProject
@@ -64,16 +79,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BCU-launcher", "BCU-launcher\BCU-launcher.vcxproj", "{C54B5AFD-C079-4852-960E-906B8CEE0E07}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		HelperTools\HelperTools.projitems*{319c4596-0ee6-4392-9d7b-f937794133c7}*SharedItemsImports = 5
-		HelperTools\HelperTools.projitems*{43022440-594d-437c-96c8-6aa24f6cee63}*SharedItemsImports = 5
-		HelperTools\HelperTools.projitems*{5086cdde-5b1d-485b-aabc-a63c633579b6}*SharedItemsImports = 5
-		HelperTools\HelperTools.projitems*{5247bd39-5deb-4f14-af4b-9598a8544d06}*SharedItemsImports = 5
-		HelperTools\HelperTools.projitems*{73a9796d-334c-400c-87ac-1dfdd613266e}*SharedItemsImports = 13
-		HelperTools\HelperTools.projitems*{9c818d14-22ae-46db-b179-119069ae6116}*SharedItemsImports = 5
-		HelperTools\HelperTools.projitems*{dca3f6ad-0a1a-4e14-894a-114cc9b3b3e5}*SharedItemsImports = 5
-		HelperTools\HelperTools.projitems*{fa4f2993-a7f5-4738-9fe1-81f34db032a7}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
@@ -304,4 +309,14 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6E45D37F-C2A8-4E8E-B8FE-19F1D8A5B010}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		HelperTools\HelperTools.projitems*{319c4596-0ee6-4392-9d7b-f937794133c7}*SharedItemsImports = 5
+		HelperTools\HelperTools.projitems*{43022440-594d-437c-96c8-6aa24f6cee63}*SharedItemsImports = 5
+		HelperTools\HelperTools.projitems*{5086cdde-5b1d-485b-aabc-a63c633579b6}*SharedItemsImports = 5
+		HelperTools\HelperTools.projitems*{5247bd39-5deb-4f14-af4b-9598a8544d06}*SharedItemsImports = 5
+		HelperTools\HelperTools.projitems*{73a9796d-334c-400c-87ac-1dfdd613266e}*SharedItemsImports = 13
+		HelperTools\HelperTools.projitems*{9c818d14-22ae-46db-b179-119069ae6116}*SharedItemsImports = 5
+		HelperTools\HelperTools.projitems*{dca3f6ad-0a1a-4e14-894a-114cc9b3b3e5}*SharedItemsImports = 5
+		HelperTools\HelperTools.projitems*{fa4f2993-a7f5-4738-9fe1-81f34db032a7}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal