Add SdkFlatLayout option for SDK packages that extend base SDKs

Author: JerrettDavis

samples/MinimalSdkPackage/DefinitionFactory.cs

@@ -21,7 +21,7 @@ public static PackageDefinition Create()
           .Task("WriteLinesToFile", task => task
             .Param("File", "$(BaseIntermediateOutputPath)MinimalSdkPackage.txt")
             .Param("Lines", "Hello from MinimalSdkPackage"))))
-      .Pack(o => { o.EmitSdk = true; o.BuildTransitive = true; })
+      .Pack(o => { o.EmitSdk = true; o.SdkFlatLayout = true; o.BuildTransitive = true; })
       .Build();
   }
 }

src/JD.MSBuild.Fluent/Packaging/MsBuildPackageEmitter.cs

@@ -41,10 +41,12 @@ public void Emit(PackageDefinition def, string outputDirectory)
     if (def.Packaging.BuildTransitive)
       EmitBuildAssets(Path.Combine(outputDirectory, "buildTransitive"), basename, def.GetBuildTransitiveProps(), def.GetBuildTransitiveTargets());
 
-    // Sdk/<id>/Sdk.props & Sdk.targets
+    // Sdk/<id>/Sdk.props & Sdk.targets (or Sdk/Sdk.props if SdkFlatLayout=true)
     if (def.Packaging.EmitSdk)
     {
-      var sdkDir = Path.Combine(outputDirectory, "Sdk", def.Id);
+      var sdkDir = def.Packaging.SdkFlatLayout 
+        ? Path.Combine(outputDirectory, "Sdk")
+        : Path.Combine(outputDirectory, "Sdk", def.Id);
       Directory.CreateDirectory(sdkDir);
       File.WriteAllText(Path.Combine(sdkDir, "Sdk.props"), _renderer.RenderToString(def.GetSdkProps()));
       File.WriteAllText(Path.Combine(sdkDir, "Sdk.targets"), _renderer.RenderToString(def.GetSdkTargets()));

src/JD.MSBuild.Fluent/Packaging/PackagePackagingOptions.cs

@@ -15,6 +15,12 @@ public sealed class PackagePackagingOptions
   /// </summary>
   public bool EmitSdk { get; set; }
 
+  /// <summary>
+  /// If true, emit SDK files as Sdk/Sdk.props instead of Sdk/&lt;PackageId&gt;/Sdk.props.
+  /// This is required for packages that extend base SDKs (e.g., extending Microsoft.NET.Sdk).
+  /// </summary>
+  public bool SdkFlatLayout { get; set; }
+
   /// <summary>
   /// Base file name used for build/*.props and build/*.targets.
   /// Defaults to the package ID.