Merge branch 'mm-runtime' into mm-cleanup-and-enable

* mm-runtime:
  Bump to dotnet/installer@330dee3 (dotnet#7334)
  [xaprepare] CGManifest.json conforms to JSON schema (dotnet#7342)

Author: grendello

build-tools/xaprepare/xaprepare/Steps/Step_GenerateCGManifest.cs

@@ -67,7 +67,9 @@ protected override async Task<bool> Execute (Context context)
 			using var json  = File.CreateText (jsonPath);
 
 			json.WriteLine ("{");
-			json.WriteLine ("    \"Registrations\": [");
+			json.WriteLine ("    \"$schema\": \"https://json.schemastore.org/component-detection-manifest.json\",");
+			json.WriteLine ("    \"version\": 1,");
+			json.WriteLine ("    \"registrations\": [");
 
 			var properties = new Dictionary<string, string> ();
 
@@ -100,8 +102,8 @@ void WriteComponent (TextWriter json, CGManifestEntry entry, Dictionary<string,
 			entry.FillComponentProperties (properties);
 
 			json.WriteLine ($"        {{");
-			json.WriteLine ($"            \"Component\": {{");
-			json.WriteLine ($"                \"Type\": \"{entry.Type.ToLowerInvariant ()}\",");
+			json.WriteLine ($"            \"component\": {{");
+			json.WriteLine ($"                \"type\": \"{entry.Type.ToLowerInvariant ()}\",");
 			json.WriteLine ($"                \"{entry.Type}\": {{");
 			bool firstProp = true;
 			foreach (var key in properties.Keys.OrderBy (p => p, StringComparer.OrdinalIgnoreCase)) {
@@ -116,7 +118,7 @@ void WriteComponent (TextWriter json, CGManifestEntry entry, Dictionary<string,
 			json.WriteLine ();
 			json.WriteLine ($"                }}");
 			json.WriteLine ($"            }},");
-			json.WriteLine ($"            \"DevelopmentDependency\":{dev}");
+			json.WriteLine ($"            \"developmentDependency\":{dev}");
 			json.Write     ($"        }}");
 		}
 	}
@@ -145,7 +147,7 @@ public  override    string      Name {
 			}
 		}
 
-		public  override    string      Type    => "Git";
+		public  override    string      Type    => "git";
 
 		public  string      RepositoryUrl   {get; private set;} = String.Empty;
 		public  string      CommitHash      {get; private set;} = String.Empty;
@@ -157,8 +159,8 @@ public  override    string      Name {
 
 		public override void FillComponentProperties (Dictionary<string, string> properties)
 		{
-			properties ["RepositoryUrl"]    = RepositoryUrl;
-			properties ["CommitHash"]       = CommitHash;
+			properties ["repositoryUrl"]    = RepositoryUrl;
+			properties ["commitHash"]       = CommitHash;
 		}
 
 		const string Submodule = "submodule.external/";
@@ -256,7 +258,7 @@ sealed class MSBuildPackageReferenceInfo : CGManifestEntry {
 		string name;
 
 		public  override    string      Name    => name;
-		public  override    string      Type    => "Nuget";
+		public  override    string      Type    => "nuget";
 
 		public  string      Version {get; private set;}
 
@@ -268,8 +270,8 @@ sealed class MSBuildPackageReferenceInfo : CGManifestEntry {
 
 		public override void FillComponentProperties (Dictionary<string, string> properties)
 		{
-			properties ["Name"]     = Name;
-			properties ["Version"]  = Version;
+			properties ["name"]     = Name;
+			properties ["version"]  = Version;
 		}
 
 		static  readonly    XNamespace      MSBuildXmlns    = XNamespace.Get ("http://schemas.microsoft.com/developer/msbuild/2003");

eng/Version.Details.xml

@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22426.5">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22454.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>2d1a4de6b2da59647a9538bf9cc4e252847e6231</Sha>
+      <Sha>330dee39e5e4dcf765f4c41c76b94c8e4497e91c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22423.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22426.5</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22454.1</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22423.4</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22422.12</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>