Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

housekeeping: Update the event generator to use latest Xamarin.Essentials 1.0.1 #1966

Merged
merged 1 commit into from Mar 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/EventBuilder/Platforms/Essentials.cs
Expand Up @@ -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")),
};

/// <inheritdoc />
Expand All @@ -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);
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/EventBuilder/Platforms/Tizen.cs
Expand Up @@ -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))
{
Expand Down