Merge branch 'jsp/dead-code' into 'main'

tech debt: Removed dead code See merge request Sharpmake/sharpmake!580
ubisoft · Nov 13, 2024 · 2e97f16 · 2e97f16
2 parents 3bbbbca + f63191d
commit 2e97f16
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Sharpmake/Project.Configuration.cs b/Sharpmake/Project.Configuration.cs
@@ -2586,8 +2586,6 @@ public bool DefaultAddFastBuildProjectToSolution()
 
             // These dependencies will not be propagated to other projects that depend on us
             internal IDictionary<Type, ITarget> UnResolvedPrivateDependencies { get; } = new Dictionary<Type, ITarget>();
-            // These dependencies will be propagated to other dependent projects, but not across dll dependencies.
-            internal IDictionary<Type, ITarget> UnResolvedProtectedDependencies { get; } = new Dictionary<Type, ITarget>();
             // These dependencies are always propagated to other dependent projects.
             internal Dictionary<Type, ITarget> UnResolvedPublicDependencies { get; } = new Dictionary<Type, ITarget>();
 
@@ -3056,7 +3054,7 @@ public bool HaveDependency<TPROJECT>()
 
             public bool HaveDependency(Type projectType)
             {
-                return UnResolvedPrivateDependencies.ContainsKey(projectType) || UnResolvedProtectedDependencies.ContainsKey(projectType) || UnResolvedPublicDependencies.ContainsKey(projectType);
+                return UnResolvedPrivateDependencies.ContainsKey(projectType) || UnResolvedPublicDependencies.ContainsKey(projectType);
             }
 
             /// <summary>

diff --git a/Sharpmake/Project.cs b/Sharpmake/Project.cs
@@ -1614,7 +1614,6 @@ internal HashSet<Type> GetUnresolvedDependenciesTypes()
             foreach (Project.Configuration conf in Configurations)
             {
                 dependencies.UnionWith(conf.UnResolvedPublicDependencies.Keys);
-                dependencies.UnionWith(conf.UnResolvedProtectedDependencies.Keys);
                 dependencies.UnionWith(conf.UnResolvedPrivateDependencies.Keys);
             }
             return dependencies;