From 756e6e0dccdb815454c8d1d76d8947b8fcdfe3e7 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Mon, 8 Jan 2024 12:39:30 -0800
Subject: [PATCH] Minor formatting fixes. TODO comments for tracking
 versions/packages.

---
 eng/ManualVersions.props | 17 +++++++++--------
 eng/Versions.props       | 13 ++++++++-----
 src/redist/redist.csproj |  7 ++++---
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
index 57a4b6415..ce3306b86 100644
--- a/eng/ManualVersions.props
+++ b/eng/ManualVersions.props
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
-<!-- The following properties (unlike those in version.props) are maintained manually.  So
-     when there is a merge conflict, the highest version should generally be chosen, rather
-     than keeping what's in the branch, which is the usual strategy with version.props merge
-     conflicts.
-       
-     Basically: In this file, choose the highest version when resolving merge conflicts.
+<!--
+  The following properties (unlike those in version.props) are maintained manually. So
+  when there is a merge conflict, the highest version should generally be chosen, rather
+  than keeping what's in the branch, which is the usual strategy with version.props merge
+  conflicts.
+
+  Basically: In this file, choose the highest version when resolving merge conflicts.
  -->
   <PropertyGroup>
     <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
@@ -16,4 +16,5 @@
     <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
     <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
   </PropertyGroup>
+
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index cdc73045b..1f805a529 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -76,13 +76,14 @@
     <MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23558.19</MicrosoftAspNetCoreAppRefPackageVersion>
     <MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.23558.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
     <VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23558.19</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
-    <dotnetdevcertsPackageVersion>9.0.0-alpha.1.23558.19</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>9.0.0-alpha.1.23558.19</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>9.0.0-alpha.1.23558.19</dotnetusersecretsPackageVersion>
+    <DotnetDevCertsPackageVersion>9.0.0-alpha.1.23558.19</DotnetDevCertsPackageVersion>
+    <DotnetUserJwtsPackageVersion>9.0.0-alpha.1.23558.19</DotnetUserJwtsPackageVersion>
+    <DotnetUserSecretsPackageVersion>9.0.0-alpha.1.23558.19</DotnetUserSecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
+  <!-- TODO -->
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23559.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
@@ -118,8 +119,7 @@
     <MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.23558.4</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64    -->
-    <!-- version above and create aliases without the winx64 here for clarity elsewhere. -->
+    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
     <MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
@@ -134,6 +134,7 @@
     <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23509.2</MicrosoftDeploymentDotNetReleasesVersion>
   </PropertyGroup>
   <PropertyGroup>
+    <!-- TODO -->
     <!-- Automated versions for asp.net templates -->
     <!-- Grab just the patch version from MicrosoftNETSdkPackageVersion (7.0.103-servicing becomes 03) -->
     <MicrosoftNETSdkFeatureAndPatchVersion>$(MicrosoftNETSdkPackageVersion.Split('.')[2])</MicrosoftNETSdkFeatureAndPatchVersion>
@@ -184,7 +185,9 @@
   <PropertyGroup>
     <!-- 9.0 Template versions -->
     <AspNetCorePackageVersionFor90Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor90Templates>
+    <!-- TODO -->
     <MicrosoftDotNetCommonItemTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates90PackageVersion>
+    <!-- TODO -->
     <MicrosoftDotNetCommonProjectTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates90PackageVersion>
     <MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>
     <MicrosoftDotNetWpfProjectTemplates90PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates90PackageVersion>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 43c026318..5ff14ad48 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-   <PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
     <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
@@ -33,7 +34,6 @@
   <Import Project="targets\GenerateLayout.targets" />
   <Import Project="targets\GenerateMSBuildExtensions.targets" />
   <Import Project="targets\FileExtensions.targets" />
-  
   <Import Project="targets\GenerateArchives.targets" />
   <Import Project="targets\GenerateMSIs.targets" />
   <Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" />
@@ -42,4 +42,5 @@
   <Import Project="targets\GeneratePKG.targets" />
   <Import Project="targets\GenerateInstallers.targets" />
   <Import Project="targets\Badge.targets" />
+
 </Project>