diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2019-07-25 15:30:53 +0300 |
|---|---|---|
| committer | Sandy Armstrong <sandy@xamarin.com> | 2019-07-25 15:30:53 +0300 |
| commit | f2439c71580618ad284a768860a9787f90f50a0e (patch) | |
| tree | 894b8772c70dcd675c98eb66ee92e5e99ea6819d | |
| parent | 22317686c5af2cc4303f0f3ba96634d272d136bb (diff) | |
Sync with vs-editor-core@99682a78
| -rw-r--r-- | Directory.Build.props | 1 | ||||
| -rw-r--r-- | build/Environment.props | 8 | ||||
| -rw-r--r-- | global.json | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index d61b76d..7065fcf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,7 +13,6 @@ <RepoBinPath>$(RepoRootPath)bin\</RepoBinPath> <RepoObjPath>$(RepoRootPath)obj\</RepoObjPath> <RepoSrcPath>$(RepoRootPath)src\</RepoSrcPath> - <RepoSrcEditorPath>$(RepoSrcPath)Editor\</RepoSrcEditorPath> <RepoLocalNuGetFeedPath>$(RepoRootPath)build\nuget-feed\</RepoLocalNuGetFeedPath> <RepoSrcRelativeProjectDirectory Condition="$(MSBuildProjectDirectory.Length) >= $(RepoSrcPath.Length)">$(MSBuildProjectDirectory.Substring($(RepoSrcPath.Length)))\</RepoSrcRelativeProjectDirectory> diff --git a/build/Environment.props b/build/Environment.props index 826315d..8775bbc 100644 --- a/build/Environment.props +++ b/build/Environment.props @@ -10,13 +10,7 @@ <HaveMono Condition="'$(HaveMono)' == '' And '$(MonoInstallRootDirectory)' != '' And Exists('$(MonoInstallRootDirectory)VERSION')">true</HaveMono> <HaveMono Condition="'$(HaveMono)' == ''">false</HaveMono> - <!-- Mono msbuild workaround: MSBuildExtensionsPath seems to be '$(MonoInstallRootDirectory)lib/mono/xbuild' by default, which is incorrect... --> - <MSBuildExtensionsPath Condition="$(HaveMono)">$([MSBuild]::NormalizeDirectory('$(MonoInstallRootDirectory)..\..\External\xbuild'))</MSBuildExtensionsPath> - - <XamarinMacCommonProps>$(MSBuildExtensionsPath)Xamarin\Mac\Xamarin.Mac.Common.props</XamarinMacCommonProps> - <XamarinMacCommonTargets>$(MSBuildExtensionsPath)Xamarin\Mac\Xamarin.Mac.Common.targets</XamarinMacCommonTargets> - - <HaveXamarinMac Condition="'$(HaveXamarinMac)' == '' And $(IsMac) And Exists('$(XamarinMacCommonProps)') And Exists('$(XamarinMacCommonTargets)')">true</HaveXamarinMac> + <HaveXamarinMac Condition="'$(HaveXamarinMac)' == '' And $(IsMac) And Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/Version')">true</HaveXamarinMac> <HaveXamarinMac Condition="'$(HaveXamarinMac)' == ''">false</HaveXamarinMac> </PropertyGroup> diff --git a/global.json b/global.json index 7c894d9..9d9b739 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "msbuild-sdks": { "Microsoft.Build.Traversal": "1.0.45", - "Xamarin.MSBuild.Sdk": "0.26.0", - "Xamarin.Mac.Sdk": "0.26.0" + "Xamarin.MSBuild.Sdk": "0.22.0", + "Xamarin.Mac.Sdk": "0.22.0" } }
\ No newline at end of file |