Merge pull request #738 from DustinCampbell/update-sdks

Update to VS 2017 RC .NET Core SDK packages
OmniSharp · Jan 30, 2017 · e56399e · e56399e
2 parents b24c48f + 268c68e
commit e56399e
Show file tree

Hide file tree

Showing 9 changed files with 170 additions and 74 deletions.
diff --git a/build.cake b/build.cake
diff --git a/msbuild/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets b/msbuild/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
@@ -0,0 +1,18 @@
+<!--
+***********************************************************************************************
+Microsoft.NuGet.ImportAfter.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved. 
+***********************************************************************************************
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Import NuGet.targets for Restore -->
+  <PropertyGroup>
+    <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildExtensionsPath)\NuGet.targets</NuGetRestoreTargets>
+  </PropertyGroup>
+  <Import Condition="Exists('$(NuGetRestoreTargets)')" Project="$(NuGetRestoreTargets)" />
+</Project>
diff --git a/msbuild/15.0/SolutionFile/ImportAfter/Microsoft.NuGet.ImportAfter.targets b/msbuild/15.0/SolutionFile/ImportAfter/Microsoft.NuGet.ImportAfter.targets
@@ -0,0 +1,18 @@
+<!--
+***********************************************************************************************
+Microsoft.NuGet.ImportAfter.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved. 
+***********************************************************************************************
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Import NuGet.targets for Restore -->
+  <PropertyGroup>
+    <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildExtensionsPath)\NuGet.targets</NuGetRestoreTargets>
+  </PropertyGroup>
+  <Import Condition="Exists('$(NuGetRestoreTargets)')" Project="$(NuGetRestoreTargets)" />
+</Project>
diff --git a/packages/packages.config b/packages/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Microsoft.Build.Runtime" version="15.1.0-preview-000522-02" />
+    <package id="Microsoft.Build.Runtime" version="15.1.0-preview-000523-01" />
     <package id="NuGet.Build.Tasks" version="4.0.0-rc3" />
     <package id="NuGet.Build.Tasks.Pack" version="4.0.0-rc3" />
-    <package id="Microsoft.NET.Sdk" version="1.0.0-alpha-20170111-1" />
-    <package id="Microsoft.NET.Sdk.Web" version="1.0.0-alpha-20170106-1-203" />
-    <package id="Microsoft.NET.Sdk.Publish" version="1.0.0-alpha-20170106-1-203" />
-    <package id="Microsoft.NET.Sdk.Web.ProjectSystem" version="1.0.0-alpha-20170106-1-203" />
-    <package id="Microsoft.Net.Compilers" version="2.0.0-rc3-61318-04" />
+    <package id="Microsoft.NET.Sdk" version="1.0.0-alpha-20170123-1" />
+    <package id="Microsoft.NET.Sdk.Web" version="1.0.0-alpha-20170114-1-223" />
+    <package id="Microsoft.NET.Sdk.Publish" version="1.0.0-alpha-20170114-1-223" />
+    <package id="Microsoft.NET.Sdk.Web.ProjectSystem" version="1.0.0-alpha-20170114-1-223" />
+    <package id="Microsoft.Net.Compilers" version="2.0.0-rc3-61330-01" />
 </packages>
diff --git a/scripts/pathhelpers.cake b/scripts/pathhelpers.cake
@@ -0,0 +1,4 @@
+string CombinePaths(params string[] paths)
+{
+    return System.IO.Path.Combine(paths);
+}
diff --git a/src/OmniSharp.MSBuild/MSBuildEnvironment.cs b/src/OmniSharp.MSBuild/MSBuildEnvironment.cs
@@ -8,6 +8,8 @@ public static class MSBuildEnvironment
     {
         private static bool s_isInitialized;
         private static string s_msbuildFolder;
+        private static string s_msbuildExtensionsPath;
+        private static string s_msbuildSDKsPath;
 
         public static bool IsInitialized => s_isInitialized;
 
@@ -20,6 +22,24 @@ public static string MSBuildFolder
             }
         }
 
+        public static string MSBuildExtensionsPath
+        {
+            get
+            {
+                EnsureInitialized();
+                return s_msbuildExtensionsPath;
+            }
+        }
+
+        public static string MSBuildSDKsPath
+        {
+            get
+            {
+                EnsureInitialized();
+                return s_msbuildSDKsPath;
+            }
+        }
+
         public static void Initialize(ILogger logger)
         {
             if (s_isInitialized)
@@ -68,6 +88,7 @@ public static void Initialize(ILogger logger)
             var msbuildSdksFolder = Path.Combine(msbuildFolder, "Sdks");
             if (Directory.Exists(msbuildSdksFolder))
             {
+                s_msbuildSDKsPath = msbuildSdksFolder;
                 Environment.SetEnvironmentVariable("MSBuildSDKsPath", msbuildSdksFolder);
                 logger.LogInformation($"MSBuildSDKsPath environment variable set to {msbuildSdksFolder}");
             }
@@ -77,6 +98,7 @@ public static void Initialize(ILogger logger)
             }
 
             s_msbuildFolder = msbuildFolder;
+            s_msbuildExtensionsPath = msbuildFolder;
             s_isInitialized = true;
         }
 

diff --git a/src/OmniSharp.MSBuild/Options/MSBuildOptions.cs b/src/OmniSharp.MSBuild/Options/MSBuildOptions.cs
@@ -5,7 +5,9 @@ public class MSBuildOptions
         public string ToolsVersion { get; set; }
         public string VisualStudioVersion { get; set; }
         public bool WaitForDebugger { get; set; }
+
         public string MSBuildExtensionsPath { get; set; }
+        public string MSBuildSDKsPath { get; set; }
 
         // TODO: Allow loose properties
         // public IConfiguration Properties { get; set; }

diff --git a/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.PropertyNames.cs b/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.PropertyNames.cs
@@ -14,6 +14,7 @@ private static class PropertyNames
             public const string LangVersion = nameof(LangVersion);
             public const string OutputType = nameof(OutputType);
             public const string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
+            public const string MSBuildSDKsPath = nameof(MSBuildSDKsPath);
             public const string NoWarn = nameof(NoWarn);
             public const string OutputPath = nameof(OutputPath);
             public const string ProjectGuid = nameof(ProjectGuid);

diff --git a/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs b/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs
@@ -128,9 +128,18 @@ public void SetProjectId(ProjectId projectId)
             {
                 globalProperties.Add(PropertyNames.MSBuildExtensionsPath, options.MSBuildExtensionsPath);
             }
-            else
+            else if (!string.IsNullOrWhiteSpace(MSBuildEnvironment.MSBuildExtensionsPath))
             {
-                globalProperties.Add(PropertyNames.MSBuildExtensionsPath, MSBuildEnvironment.MSBuildFolder);
+                globalProperties.Add(PropertyNames.MSBuildExtensionsPath, MSBuildEnvironment.MSBuildExtensionsPath);
+            }
+
+            if (!string.IsNullOrWhiteSpace(options.MSBuildSDKsPath))
+            {
+                globalProperties.Add(PropertyNames.MSBuildSDKsPath, options.MSBuildSDKsPath);
+            }
+            else if (!string.IsNullOrWhiteSpace(MSBuildEnvironment.MSBuildSDKsPath))
+            {
+                globalProperties.Add(PropertyNames.MSBuildSDKsPath, MSBuildEnvironment.MSBuildSDKsPath);
             }
 
             if (PlatformHelper.IsMono)