Merge pull request #4466 from Microsoft/merges/master-to-dev15.7

Merge master to dev15.7
dotnet · Mar 8, 2018 · 5276ece · 5276ece
2 parents c5d4aaf + 3fc5e6d
commit 5276ece
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 236 deletions.
diff --git a/FSharp.Directory.Build.targets b/FSharp.Directory.Build.targets
@@ -1,13 +1,38 @@
 <Project>
 
   <PropertyGroup>
+    <XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
     <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
     <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
-    <OutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</OutputPath>
-    <IntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj\$(MSBuildProjectName)\</IntermediateOutputPath>
-    <XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
+    <ActualOutputPath Condition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
+    <ActualOutputPath Condition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
+    <FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
+    <FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
   </PropertyGroup>
 
+  <Target Name="HACK_CopyOutputsToTheProperLocation"
+          AfterTargets="AfterBuild"
+          Condition="'$(DisableOutputPathCopying)' != 'true'">
+    <!--
+    Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
+    depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
+    that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the
+    values of $(OutputPath)/$(OutDir).
+
+    The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
+    -->
+
+    <ItemGroup>
+      <OutputFilesToCopy Include="$(ActualOutputPath)**" />
+      <IntermediateFilesToCopy Include="$(IntermediateOutputPath)\**" />
+    </ItemGroup>
+
+    <Message Text="Copying build artifacts to $(FinalOutputPath)" />
+    <MakeDir Directories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
+    <Copy SourceFiles="@(OutputFilesToCopy)" DestinationFolder="$(FinalOutputPath)" />
+    <Copy SourceFiles="@(IntermediateFilesToCopy)" DestinationFolder="$(FinalIntermediateOutputPath)" />
+  </Target>
+
   <Import Project="build\targets\AssemblyVersions.props" />
   <Import Project="build\targets\GenerateAssemblyAttributes.targets" />
   <Import Project="build\targets\GenerateInternalsVisibleTo.targets" />

diff --git a/VisualFSharp.sln b/VisualFSharp.sln
diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props
@@ -11,7 +11,8 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <FSharpProductVersion>10.1</FSharpProductVersion>
+        <!-- This number should be kept in sync with the expected shipping version of Visual Studio. -->
+        <FSharpProductVersion>15.7</FSharpProductVersion>
         <!-- BUILD_BUILDNUMBER is passed from Microbuild. Replace by today's date and (0) if it was a local build -->
         <BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
         <!-- Remove .DRAFT suffix if it exists in the build number -->

diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj
@@ -42,7 +42,7 @@
         </PropertyGroup>
         <MSBuild Projects="%(VsixProjects.ProjectPath)"
                  Targets="Build"
-                 Properties="Configuration=$(Configuration);IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(VsixBuildLocation);$(CustomProps)" />
+                 Properties="Configuration=$(Configuration);IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(VsixBuildLocation);DisableOutputPathCopying=true;$(CustomProps)" />
         <MSBuild Projects="%(SwixSetupProjects.ProjectPath)"
                  Targets="Build"
                  Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>

diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets
@@ -11,11 +11,6 @@
     <PackageTargetFallback>net462</PackageTargetFallback>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(CreateVsixContainer)' == 'true'">
-    <!-- Ensure VSIX packages end up in the proper location. -->
-    <OutDir>$(OutputPath)\</OutDir>
-  </PropertyGroup>
-
   <ImportGroup Condition="'$(ImportVsSDK)' == 'true'">
     <Import Project="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props" />
     <Import Project="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets" />

diff --git a/vsintegration/Templates.Directory.Build.targets b/vsintegration/Templates.Directory.Build.targets
@@ -2,10 +2,6 @@
 
   <Import Project="Directory.Build.targets" />
 
-  <PropertyGroup>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <!-- everything under the `Template` directory is not to be considered part of the project -->
     <Compile Remove="**\Template\**" />
@@ -15,8 +11,4 @@
 
   <Target Name="CoreCompile" />
 
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutputPath)\%(Filename)%(Extension)')" />
-  </Target>
-
 </Project>
diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
@@ -36,6 +36,9 @@
     <UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
     <Import Include="System" />

diff --git a/vsintegration/tests/unittests/MockTypeProviders/Directory.Build.props b/vsintegration/tests/unittests/MockTypeProviders/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <!-- empty to prevent directory crawling -->
+</Project>
diff --git a/vsintegration/tests/unittests/MockTypeProviders/Directory.Build.targets b/vsintegration/tests/unittests/MockTypeProviders/Directory.Build.targets
@@ -0,0 +1,3 @@
+<Project>
+  <!-- empty to prevent directory crawling -->
+</Project>