Skip to content

[Xamarin.Android.Build.Tasks] precompile SetVsMonoAndroidRegistryKey #2130

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 5, 2018
Merged

[Xamarin.Android.Build.Tasks] precompile SetVsMonoAndroidRegistryKey #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Xamarin.Android.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,7 @@ Copyright (C) 2011-2016 Xamarin. All rights reserved.
<Delete Files="$(IntermediateOutputPath)sdks.cache" />
</Target>

<UsingTask Condition="'$(VsInstallRoot)' != ''" TaskName="SetVsMonoAndroidRegistryKey" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<InstallationID Required="true" />
<VisualStudioVersion Required="true" />
</ParameterGroup>
<Task>
<Code Type="Fragment" Language="cs">
Environment.SetEnvironmentVariable("XAMARIN_ANDROID_REGKEY", string.Format(@"SOFTWARE\Xamarin\VisualStudio\{0}_{1}\Android", VisualStudioVersion, InstallationID), EnvironmentVariableTarget.Process);
Log.LogMessage(Environment.GetEnvironmentVariable("XAMARIN_ANDROID_REGKEY"));
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="Xamarin.Android.Tasks.SetVsMonoAndroidRegistryKey" AssemblyFile="Android\Xamarin.Android.Build.Tasks.dll" />

<PropertyGroup>
<XamarinAndroidSdkPropsImported>true</XamarinAndroidSdkPropsImported>
Expand Down
25 changes: 25 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/SetVsMonoAndroidRegistryKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using System;

namespace Xamarin.Android.Tasks
{
public class SetVsMonoAndroidRegistryKey : Task
{
[Required]
public string InstallationID { get; set; }

[Required]
public string VisualStudioVersion { get; set; }

const string EnvironmentVariable = "XAMARIN_ANDROID_REGKEY";

public override bool Execute ()
{
string value = $@"SOFTWARE\Xamarin\VisualStudio\{VisualStudioVersion}_{InstallationID}\Android";
Log.LogDebugMessage ($"Setting %{EnvironmentVariable}%=\"{value}\"");
Environment.SetEnvironmentVariable (EnvironmentVariable, value, EnvironmentVariableTarget.Process);
return !Log.HasLoggedErrors;
}
}
}
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
<Compile Include="Mono.Android\ActivityAttribute.Partial.cs" />
<Compile Include="Mono.Android\ContentProviderAttribute.Partial.cs" />
<Compile Include="Mono.Android\LayoutAttribute.Partial.cs" />
<Compile Include="Tasks\SetVsMonoAndroidRegistryKey.cs" />
<Compile Include="Tasks\ValidateJavaVersion.cs" />
<Compile Include="Utilities\AndroidAddOnManifest.cs" />
<Compile Include="Mono.Android\IntentFilterAttribute.Partial.cs" />
Expand Down