Skip to content

Commit d848b43

Browse files
authored
Merge pull request #10554 from MaxWang-MS/fix_docs_gen
Remove unnecessary #if
2 parents d40def9 + 9180cc1 commit d848b43

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

Assets/MRTK/Tools/MSBuild/Scripts/UnityProjectInfo.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,7 @@ private CSProjectInfo GetProjectInfo(Dictionary<string, CSProjectInfo> projectsM
221221

222222
// Manually add special plugin dependencies to the projects
223223
#if UNITY_2019_3_OR_NEWER
224-
#if UNITY_2020_2_OR_NEWER
225224
if (toReturn.Name.StartsWith("Microsoft.MixedReality.Toolkit") || toReturn.Name.StartsWith("Unity.TextMeshPro"))
226-
#else
227-
if (toReturn.Name.StartsWith("Microsoft.MixedReality.Toolkit"))
228-
#endif
229225
{
230226
string[] plugins = SpecialPluginNameMappingUnity2019.Values.OrderByDescending(p => p).ToArray();
231227
foreach (var plugin in plugins)
@@ -234,7 +230,6 @@ private CSProjectInfo GetProjectInfo(Dictionary<string, CSProjectInfo> projectsM
234230
{
235231
toReturn.AddDependency(projectInfo);
236232
}
237-
#if UNITY_2020_2_OR_NEWER
238233
else
239234
{
240235
CSProjectInfo newProjInfo = new CSProjectInfo(this, asmDefInfoMap[plugin], projectOutputPath);
@@ -245,7 +240,6 @@ private CSProjectInfo GetProjectInfo(Dictionary<string, CSProjectInfo> projectsM
245240
projectsMap.Add(plugin, newProjInfo);
246241
toReturn.AddDependency(newProjInfo);
247242
}
248-
#endif
249243
}
250244
}
251245
#endif

0 commit comments

Comments
 (0)