Comments and cosmetics.

sharpjs · Jul 30, 2023 · 378f9a4 · 378f9a4
1 parent 9ba63e6
commit 378f9a4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/PSql.Tests/PSql.Tests.csproj b/PSql.Tests/PSql.Tests.csproj
@@ -11,17 +11,17 @@
     <RootNamespace>PSql</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.13" />
+    <PackageReference Include="Subatomix.Testing"        Version="2.5.0" />
+    <PackageReference Include="Unindent"                 Version="1.1.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\PSql\PSql.csproj" />
 
     <ProjectReference Include="..\PSql.private\PSql.private.csproj"
                       Private="false" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.13" />
-    <PackageReference Include="Subatomix.Testing"        Version="2.5.0" />
-    <PackageReference Include="Unindent"                 Version="1.1.1" />
-  </ItemGroup>
-
 </Project>
diff --git a/PSql.private/PSql.private.csproj b/PSql.private/PSql.private.csproj
@@ -15,18 +15,22 @@
     <!-- ^^ Opt dependencies out via IncludeAssets="compile" -->
   </PropertyGroup>
 
-  <!-- Public dependencies -->
+  <!-- Public dependencies (loaded in default AssemblyLoadContext) -->
   <ItemGroup>
-    <PackageReference Include="System.Management.Automation"
-                      Version="[7.0.0, 8.0.0)" IncludeAssets="compile" PrivateAssets="all" />
+    <PackageReference Include="System.Management.Automation" Version="[7.0.0, 8.0.0)"
+                      IncludeAssets="compile" PrivateAssets="all" />
 
-    <ProjectReference Include="..\PSql.Core\PSql.Core.csproj" Private="false" />
+    <ProjectReference Include="..\PSql.Core\PSql.Core.csproj"
+                      Private="false" />
   </ItemGroup>
 
-  <!-- Private dependencies -->
+  <!-- Private dependencies (loaded in private AssemblyLoadContext) -->
   <ItemGroup>
-    <PackageReference Include="Prequel"                  Version="1.0.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" PrivateAssets="all" />
+    <PackageReference Include="Prequel" Version="1.0.3"
+                      PrivateAssets="all" />
+
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1"
+                      PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PSql/PSql.csproj b/PSql/PSql.csproj
@@ -23,15 +23,16 @@
 
     <ProjectReference Include="..\PSql.private\PSql.private.csproj"
                       Private="false" PrivateAssets="all" />
+                      <!-- Copied to deps\ directory as None items below -->
   </ItemGroup>
 
   <ItemGroup>
     <Content Include="$(PowerShellItemIncludes)"
              Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
 
     <!--
-      Isolate PSql private dependencies into a subdirectory for consumption by
-      a private AssemblyLoadContext, preventing conflicts with other modules.
+      Isolate private dependencies into a subdirectory for consumption by a
+      private AssemblyLoadContext, preventing conflicts with other modules.
       See: https://learn.microsoft.com/en-us/powershell/scripting/dev-cross-plat/resolving-dependency-conflicts
     -->
     <None Include="..\PSql.private\bin\$(Configuration)\$(TargetFramework)\**"