diff --git a/src/EventBuilder/Platforms/Essentials.cs b/src/EventBuilder/Platforms/Essentials.cs index 4bf4678529..91ec97eb74 100644 --- a/src/EventBuilder/Platforms/Essentials.cs +++ b/src/EventBuilder/Platforms/Essentials.cs @@ -22,7 +22,8 @@ public class Essentials : BasePlatform { private readonly PackageIdentity[] _packageNames = new[] { - new PackageIdentity("Xamarin.Essentials", new NuGetVersion("1.0.0")), + new PackageIdentity("Xamarin.Essentials", new NuGetVersion("1.0.1")), + new PackageIdentity("NetStandard.Library", new NuGetVersion("2.0.0")), }; /// @@ -41,17 +42,12 @@ public override async Task Extract() "Xamarin.Essentials.dll", SearchOption.AllDirectories); - var latestVersion = xamarinForms.First(x => x.Contains("netstandard1.0", StringComparison.InvariantCulture)); + var latestVersion = xamarinForms.First(x => x.Contains("netstandard2.0", StringComparison.InvariantCulture)); Assemblies.Add(latestVersion); - if (PlatformHelper.IsRunningOnMono()) + foreach (var directory in Directory.GetDirectories(packageUnzipPath, "*.*", SearchOption.AllDirectories)) { - CecilSearchDirectories.Add( - @"/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile111"); - } - else - { - CecilSearchDirectories.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile111"); + CecilSearchDirectories.Add(directory); } } } diff --git a/src/EventBuilder/Platforms/Tizen.cs b/src/EventBuilder/Platforms/Tizen.cs index a4333dffa0..c21708b62a 100644 --- a/src/EventBuilder/Platforms/Tizen.cs +++ b/src/EventBuilder/Platforms/Tizen.cs @@ -37,7 +37,6 @@ public override async Task Extract() Assemblies.AddRange(Directory.GetFiles(packageUnzipPath, "ElmSharp*.dll", SearchOption.AllDirectories)); Assemblies.AddRange(Directory.GetFiles(packageUnzipPath, "Tizen*.dll", SearchOption.AllDirectories)); - Assemblies.AddRange(Directory.GetFiles(packageUnzipPath, "netstandard.dll", SearchOption.AllDirectories)); foreach (var directory in Directory.GetDirectories(packageUnzipPath, "*.*", SearchOption.AllDirectories)) {