[WIP] Do not remove a root package that is not explicitly specified i…

…n ChiselIgnores
0xced · Mar 12, 2024 · 64affc6 · 64affc6
1 parent beace6f
commit 64affc6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/samples/SqlClientSample/Program.cs b/samples/SqlClientSample/Program.cs
@@ -8,6 +8,7 @@
     var result = await command.ExecuteScalarAsync();
 
     Console.WriteLine($"✅ {result}");
+    _ = new BinaryData(Array.Empty<byte>());
     return 0;
 }
 catch (Exception exception)

diff --git a/samples/SqlClientSample/SqlClientSample.csproj b/samples/SqlClientSample/SqlClientSample.csproj
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageReference Include="System.Memory.Data" Version="1.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Chisel.Tests/DependencyGraphTest.SqlClientGraph_graphviz.verified.gv b/tests/Chisel.Tests/DependencyGraphTest.SqlClientGraph_graphviz.verified.gv
@@ -67,7 +67,7 @@ digraph
   "System.Diagnostics.EventLog/8.0.0"
   "System.IdentityModel.Tokens.Jwt/6.35.0" [ color = lightcoral ]
   "System.IO.FileSystem.AccessControl/5.0.0" [ color = lightcoral ]
-  "System.Memory.Data/1.0.2" [ color = lightcoral ]
+  "System.Memory.Data/1.0.2"
   "System.Runtime.Caching/8.0.0"
   "System.Runtime.CompilerServices.Unsafe/6.0.0" [ color = lightcoral ]
   "System.Security.AccessControl/5.0.0" [ color = lightcoral ]

diff --git a/tests/Chisel.Tests/DependencyGraphTest.SqlClientGraph_mermaid.verified.mmd b/tests/Chisel.Tests/DependencyGraphTest.SqlClientGraph_mermaid.verified.mmd
@@ -70,7 +70,7 @@ class System.Diagnostics.DiagnosticSource/6.0.1 removed
 class System.Diagnostics.EventLog/8.0.0 default
 class System.IdentityModel.Tokens.Jwt/6.35.0 removed
 class System.IO.FileSystem.AccessControl/5.0.0 removed
-class System.Memory.Data/1.0.2 removed
+class System.Memory.Data/1.0.2 default
 class System.Runtime.Caching/8.0.0 default
 class System.Runtime.CompilerServices.Unsafe/6.0.0 removed
 class System.Security.AccessControl/5.0.0 removed

diff --git a/tests/Chisel.Tests/DependencyGraphTest.cs b/tests/Chisel.Tests/DependencyGraphTest.cs
@@ -95,7 +95,7 @@ public async Task SqlClientGraph(string graphFormat)
             "System.Text.Json",
         ];
         var assetsFile = GetAssetsPath("SqlClientGraph.json");
-        var graph = new DependencyGraph(resolvedPackages, assetsFile, tfm: "net8.0", rid: "win-x64", ignores: []);
+        var graph = new DependencyGraph(resolvedPackages, assetsFile, tfm: "net8.0-windows", rid: "win-x64", ignores: []);
         var (removed, notFound, removedRoots) = graph.Remove([ "Azure.Identity", "Microsoft.IdentityModel.JsonWebTokens", "Microsoft.IdentityModel.Protocols.OpenIdConnect" ]);
         await using var writer = new StringWriter();
 

diff --git a/tests/Chisel.Tests/ProjectAssets/SqlClientGraph.json b/tests/Chisel.Tests/ProjectAssets/SqlClientGraph.json
@@ -1,7 +1,7 @@
 {
   "version": 3,
   "targets": {
-    "net8.0": {
+    "net8.0-windows7.0": {
       "Azure.Core/1.35.0": {
         "type": "package",
         "dependencies": {
@@ -632,7 +632,7 @@
         }
       }
     },
-    "net8.0/win-x64": {
+    "net8.0-windows7.0/win-x64": {
       "Azure.Core/1.35.0": {
         "type": "package",
         "dependencies": {
@@ -2504,20 +2504,25 @@
     }
   },
   "projectFileDependencyGroups": {
-    "net8.0": [
+    "net8.0-windows7.0": [
       "Microsoft.Data.SqlClient >= 5.2.0",
-      "Microsoft.Identity.Client >= 4.56.0"
+      "Microsoft.Identity.Client >= 4.56.0",
+      "System.Memory.Data >= 1.0.2"
     ]
   },
   "project": {
     "version": "1.0.0",
     "frameworks": {
-      "net8.0": {
-        "targetAlias": "net8.0",
+      "net8.0-windows7.0": {
+        "targetAlias": "net8.0-windows",
         "dependencies": {
           "Microsoft.Data.SqlClient": {
             "target": "Package",
             "version": "[5.2.0, )"
+          },
+          "System.Memory.Data": {
+            "target": "Package",
+            "version": "[1.0.2, )"
           }
         },
         "imports": [