Skip to content

Commit

Permalink
Fix compilation errors in netstandard2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hadashiA committed Jan 18, 2024
1 parent eb85aca commit 719a296
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/NuGetForUnity/Editor/NugetAssetPostprocessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ public class NugetAssetPostprocessor : AssetPostprocessor
/// <summary>
/// Folder of root before the version of analyzers was split.
/// </summary>
private static readonly string AnalyzersRoslynVersionsFolderName = Path.Join(AnalyzersFolderName, "dotnet");
private static readonly string AnalyzersRoslynVersionsFolderName = JoinPathComponents(AnalyzersFolderName, "dotnet");

/// <summary>
/// Prefix for roslyn versioning of dll asset path.
/// </summary>
private static readonly string AnalyzersRoslynVersionSubFolderPrefix = Path.Join(AnalyzersRoslynVersionsFolderName, "roslyn");
private static readonly string AnalyzersRoslynVersionSubFolderPrefix = JoinPathComponents(AnalyzersRoslynVersionsFolderName, "roslyn");

/// <summary>
/// Used to mark an asset as already processed by this class.
Expand Down Expand Up @@ -173,6 +173,12 @@ private static string[] GetPathComponents([NotNull] string path)
return path.Split(Path.DirectorySeparatorChar);
}

[NotNull]
private static string JoinPathComponents([NotNull] params string[] pathComponents)
{
return string.Join(Path.DirectorySeparatorChar.ToString(), pathComponents);
}

private static bool AssetIsDllInsideNuGetRepository([NotNull] string absoluteAssetPath, [NotNull] string absoluteRepositoryPath)
{
return absoluteAssetPath.StartsWith(absoluteRepositoryPath, PathHelper.PathComparisonType) &&
Expand Down Expand Up @@ -221,7 +227,7 @@ private static void ModifyImportSettingsOfRoslynAnalyzer([NotNull] PluginImporte
if (assetRoslynVersion != null)
{
var versionPrefixIndex = plugin.assetPath.IndexOf(AnalyzersRoslynVersionsFolderName, StringComparison.Ordinal);
var analyzersVersionsRoot = Path.Join(plugin.assetPath.Substring(0, versionPrefixIndex), AnalyzersRoslynVersionsFolderName);
var analyzersVersionsRoot = JoinPathComponents(plugin.assetPath.Substring(0, versionPrefixIndex), AnalyzersRoslynVersionsFolderName);
var analyzersFolders = AssetDatabase.GetSubFolders(analyzersVersionsRoot);

var enabledRoslynVersions = analyzersFolders
Expand Down

0 comments on commit 719a296

Please sign in to comment.