Skip to content

[xabuild.exe] fix for .NET standard projects #1011

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
Nov 7, 2017
Merged

[xabuild.exe] fix for .NET standard projects #1011

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
1 change: 1 addition & 0 deletions tools/xabuild/XABuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ static XmlDocument CreateConfig (XABuildPaths paths)

xml.Save (paths.XABuildConfig);

Environment.SetEnvironmentVariable ("MSBuildSDKsPath", paths.MSBuildSdksPath, EnvironmentVariableTarget.Process);
Environment.SetEnvironmentVariable ("MSBUILD_EXE_PATH", paths.MSBuildExeTempPath, EnvironmentVariableTarget.Process);
return xml;
}
Expand Down
7 changes: 7 additions & 0 deletions tools/xabuild/XABuildPaths.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class XABuildPaths
/// </summary>
public string MSBuildExtensionsPath { get; private set; }

/// <summary>
/// Used as the MSBuildSDKsPath environment variable, required for .NET standard projects to build
/// </summary>
public string MSBuildSdksPath { get; private set; }

/// <summary>
/// Array of search paths for MSBuildExtensionsPath
/// </summary>
Expand Down Expand Up @@ -113,6 +118,7 @@ public XABuildPaths ()
MSBuildPath = Path.Combine (VsInstallRoot, "MSBuild");
MSBuildBin = Path.Combine (MSBuildPath, "15.0", "Bin");
MSBuildConfig = Path.Combine (MSBuildBin, "MSBuild.exe.config");
MSBuildSdksPath = Path.Combine (MSBuildPath, "Sdks");
ProjectImportSearchPaths = new [] { MSBuildPath, "$(MSBuildProgramFiles32)\\MSBuild" };
SystemProfiles = Path.Combine (programFiles, "Reference Assemblies", "Microsoft", "Framework");
SearchPathsOS = "windows";
Expand All @@ -122,6 +128,7 @@ public XABuildPaths ()
MSBuildPath = Path.Combine (mono, "msbuild");
MSBuildBin = Path.Combine (MSBuildPath, "15.0", "bin");
MSBuildConfig = Path.Combine (MSBuildBin, "MSBuild.dll.config");
MSBuildSdksPath = "/usr/local/share/dotnet/sdk/2.0.0/Sdks";
ProjectImportSearchPaths = new [] { MSBuildPath, Path.Combine (mono, "xbuild"), Path.Combine (monoExternal, "xbuild") };
SystemProfiles = Path.Combine (mono, "xbuild-frameworks");
SearchPathsOS = IsMacOS ? "osx" : "unix";
Expand Down