use the WriteCodeFragment task to embed each build's commit hash (#4139)

use the WriteCodeFragment task to embed each build's commit hash

build.cmd

@@ -549,12 +549,6 @@ goto :eof
 :havemsbuild
 set _nrswitch=/nr:false
 
-if defined TF_BUILD (
-    echo Adding remote 'visualfsharptools' for internal build.
-    git remote add visualfsharptools https://github.com/Microsoft/visualfsharp.git
-    git fetch --all
-)
-
 set msbuildflags=%_nrswitch% /nologo
 REM set msbuildflags=%_nrswitch% /nologo
 set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"

build/targets/GitHash.props

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<!--
+Copied from RepoToolset. Might be slightly modified to adjust for the current F# build system specifics if necessary.
+-->
+
+<Project>
+  <!--
+
+  Defines the following properties:
+    GitHeadSha
+
+  -->
+
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)..\..\</RepoRoot>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(BUILD_SOURCEVERSION)' != ''">
+      <PropertyGroup>
+        <GitHeadSha>$(BUILD_SOURCEVERSION)</GitHeadSha>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BUILD_SOURCEVERSION)' == '' and '$(GIT_COMMIT)' != ''">
+      <PropertyGroup>
+        <GitHeadSha>$(GIT_COMMIT)</GitHeadSha>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(CI)' != '1'">
+      <PropertyGroup>
+        <GitHeadSha>&lt;developer build&gt;</GitHeadSha>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <PropertyGroup>
+        <GitHeadSha></GitHeadSha>
+        <_DotGitDir>$(RepoRoot).git</_DotGitDir>
+        <_HeadFileContent Condition="Exists('$(_DotGitDir)/HEAD')">$([System.IO.File]::ReadAllText('$(_DotGitDir)/HEAD').Trim())</_HeadFileContent>
+        <_RefPath Condition="$(_HeadFileContent.StartsWith('ref: '))">$(_DotGitDir)/$(_HeadFileContent.Substring(5))</_RefPath>
+        <GitHeadSha Condition="'$(_RefPath)' != '' and Exists('$(_RefPath)')">$([System.IO.File]::ReadAllText('$(_RefPath)').Trim())</GitHeadSha>
+        <GitHeadSha Condition="'$(_HeadFileContent)' != '' and '$(_RefPath)' == ''">$(_HeadFileContent)</GitHeadSha>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+</Project>

fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj

@@ -70,8 +70,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(FSharpSourcesRoot)/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs">
-      <Link>AssemblyInfo/assemblyinfo.FSharp.Compiler.Service.dll.fs</Link>
+    <Compile Include="..\FSharp.Compiler.Service\AssemblyInfo.fs">
+      <Link>AssemblyInfo/AssemblyInfo.fs</Link>
     </Compile>
     <FsSrGen Include="$(FSharpSourcesRoot)\fsharp\FSComp.txt">
       <Link>FSComp.txt</Link>

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -48,8 +48,8 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(FSharpSourcesRoot)\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs">
-      <Link>AssemblyInfo/assemblyinfo.FSharp.Compiler.Service.dll.fs</Link>
+    <Compile Include="AssemblyInfo.fs">
+      <Link>AssemblyInfo/AssemblyInfo.fs</Link>
     </Compile>
     <FsSrGen Include="$(FSharpSourcesRoot)\fsharp\FSComp.txt">
       <Link>FSComp.txt</Link>

src/FSharpSource.Settings.targets

@@ -18,6 +18,49 @@
     <ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">Debug</ConfigurationGroup>
   </PropertyGroup>
 
+  <!-- Version number computation -->
+  <PropertyGroup>
+    <!-- Put build number 0 and today's date if this was a local build -->
+    <BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
+
+    <!--
+    Given $(BUILD_BUILDNUMBER) = '20161225.1'
+
+    Then $(_Build_Year) = 2016
+    Then $(_Build_Month) = 12
+    Then $(_Build_Day) = 25
+    Then $(_Build_Number) = 1
+    Then $(Build_FileVersion) = 2016.12.25.1
+    -->
+    <_Build_Year>$(BUILD_BUILDNUMBER.Substring(0, 4))</_Build_Year>
+    <_Build_Month>$(BUILD_BUILDNUMBER.Substring(4, 2))</_Build_Month>
+    <_Build_Day>$(BUILD_BUILDNUMBER.Substring(6, 2))</_Build_Day>
+    <_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
+    <Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
+
+    <FSCoreVersion>4.4.1.0</FSCoreVersion>
+    <MicroBuildAssemblyVersion Condition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
+    <MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.1.0</MicroBuildAssemblyVersion>
+
+    <!--
+
+    Given $(BUILD_BUILDNUMBER) = '20161225.1'
+    Given $(MicroBuildAssemblyVersion) = '15.4.1.0'
+
+    Then $(BuildTimeStamp_Day) = 161225
+    Then $(BuildTimeStamp_Number) = 01
+    Then $(BuildTimeStamp) = 16122501
+    Then $(MicroBuildAssemblyVersion_WithoutRevision) = 15.4.1
+    Then $(VsixPackageVersion) = 15.4.1.16122501
+
+    -->
+    <BuildTimeStamp_Day>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Day>
+    <BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>
+    <BuildTimeStamp>$(BuildTimeStamp_Day)$(BuildTimeStamp_Number)</BuildTimeStamp>
+    <MicroBuildAssemblyVersion_WithoutRevision>$(MicroBuildAssemblyVersion.Substring(0, $(MicroBuildAssemblyVersion.LastIndexOf('.'))))</MicroBuildAssemblyVersion_WithoutRevision>
+    <VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Settings used all the time -->
     <Tailcalls>true</Tailcalls>

src/FSharpSource.targets

@@ -3,9 +3,11 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <FSCoreVersion>4.4.1.0</FSCoreVersion>
+    <RepoRoot>$(MSBuildThisFileDirectory)..\</RepoRoot>
   </PropertyGroup>
 
+  <Import Project="..\build\targets\GitHash.props" />
+
   <Choose>
     <When Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release' ">
       <PropertyGroup>
@@ -21,7 +23,6 @@
               <PropertyGroup>
                 <SkipSigning>true</SkipSigning>
                 <UseOpenSourceSign>false</UseOpenSourceSign>
-                <MicroBuildAssemblyVersion Condition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
                 <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
               </PropertyGroup>
             </When>
@@ -31,9 +32,6 @@
               <PropertyGroup>
                 <DelaySign>true</DelaySign>
                 <StrongNames>true</StrongNames>
-                <MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
-                <!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion -->
-                <MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.1.0</MicroBuildAssemblyVersion>
                 <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
               </PropertyGroup>
             </Otherwise>
@@ -46,7 +44,6 @@
             <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
             <StrongNames>true</StrongNames>
             <DelaySign>true</DelaySign>
-            <MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
             <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
           </PropertyGroup>
         </Otherwise>
@@ -56,7 +53,6 @@
       <PropertyGroup Condition="'$(StrongNames)' != 'true'">
         <!-- For the proto build we don't use strong names. -->
         <DefineConstants>NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
-        <MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
         <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
       </PropertyGroup>
     </Otherwise>
@@ -284,15 +280,7 @@
     </Exec>
 
     <!-- https://raw.githubusercontent.com/KevinRansom/visualfsharp/98e8c9a2ca09a36ebd024eb424fc050a831053cd/build.cmd  -->
-    <Exec Command="git rev-parse HEAD" ConsoleToMsBuild="true" Condition = " '$(TF_BUILD)' != 'True' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="LatestCommit" />
-    </Exec>
-
-    <Exec Command="git merge-base --fork-point refs/remotes/visualfsharptools/master HEAD" ConsoleToMsBuild="true" Condition = " '$(TF_BUILD)' == 'True' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="LatestCommit" />
-    </Exec>
-
-    <WriteLinesToFile File="$(IntermediateOutputPath)source_link.json" Overwrite="true" Lines='{"documents": { "$(SourceLinkRoot)\\*" : "$(RemoteUri.Replace(".git", "").Replace("github.com", "raw.githubusercontent.com"))/$(LatestCommit)/*" }}' />
+    <WriteLinesToFile File="$(IntermediateOutputPath)source_link.json" Overwrite="true" Lines='{"documents": { "$(SourceLinkRoot)\\*" : "$(RemoteUri.Replace(".git", "").Replace("github.com", "raw.githubusercontent.com"))/$(GitHeadSha)/*" }}' />
   </Target>
 
     <!-- If BuildVersionFilePath not specified then do nothing  -->
@@ -417,6 +405,53 @@
     </WriteCodeFragment>
   </Target>
 
+  <Target Name="GenerateAssemblyFileVersion"
+          BeforeTargets="CoreCompile"
+          Condition="'$(Configuration)' != 'Proto'">
+    <PropertyGroup>
+      <GeneratedFSharpAssemblyVersionFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyVersion$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyVersionFile>
+      <!-- AssemblyInformationalVersionAttribute issues a by-design warning if the value passed isn't of the form #.#.#.#, but we specifically want to suppress this to allow the commit hash to be embedded. -->
+      <NoWarn Condition="'$(Language)' == 'F#'">2003;$(NoWarn)</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyCompanyAttribute">
+        <_Parameter1>Microsoft Corporation</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyCopyrightAttribute">
+        <_Parameter1>&#169; Microsoft Corporation.  All Rights Reserved.</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyDescriptionAttribute">
+        <_Parameter1>$(AssemblyName).dll</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyFileVersionAttribute">
+        <_Parameter1>$(Build_FileVersion)</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyInformationalVersionAttribute">
+        <_Parameter1>$(MicroBuildAssemblyVersion).  Commit Hash: $(GitHeadSha).</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyProductAttribute">
+        <_Parameter1>Microsoft&#174; F#</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyTitleAttribute">
+        <_Parameter1>$(AssemblyName).dll</_Parameter1>
+      </_AssemblyVersionAttributes>
+      <_AssemblyVersionAttributes Include="System.Reflection.AssemblyVersionAttribute">
+        <_Parameter1>$(MicroBuildAssemblyVersion)</_Parameter1>
+      </_AssemblyVersionAttributes>
+    </ItemGroup>
+
+    <WriteCodeFragment AssemblyAttributes="@(_AssemblyVersionAttributes)"
+                       Language="$(Language)"
+                       OutputFile="$(GeneratedFSharpAssemblyVersionFile)">
+      <!-- For FSharp.Core, assembly version must be inserted after all Core files, as it defines F# basic types (strings) -->
+      <Output TaskParameter="OutputFile" ItemName="Compile" Condition="'$(AssemblyName)' == 'FSharp.Core'" />
+      <!-- For other assemblies, this must be inserted before all source files, to keep exe's EntryPoints (if any) as the last source file -->
+      <Output TaskParameter="OutputFile" ItemName="CompileBefore" Condition="'$(AssemblyName)' != 'FSharp.Core'" />
+      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
+    </WriteCodeFragment>
+  </Target>
+
   <UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
     <ParameterGroup>
       <InputFilename ParameterType="System.String" Required="true" />

src/Microbuild.Settings.targets

@@ -4,129 +4,10 @@
   <PropertyGroup>
     <MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
   </PropertyGroup>
-
   <Import Project="..\packages\MicroBuild.Core.$(MicroBuildCoreVersion)\build\MicroBuild.Core.props" />
 
-  <UsingTask TaskName="GenerateAssemblyFileVersionTask" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-    <ParameterGroup>
-      <Language ParameterType="System.String" Required="true" />
-      <ProductVersion ParameterType="System.String" Required="true" />
-      <BuildNumber ParameterType="System.String" Required="true" />
-      <AssemblyName ParameterType="System.String" Required="true" />
-      <AssemblyFileVersionPath ParameterType="System.String" Output="true" />
-    </ParameterGroup>
-    
-    <Task>
-      <Using Namespace="System"/>
-      <Using Namespace="System.Text.RegularExpressions"/>
-      
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-        // Remove DRAFT version string inserted by Microbuild (if it exists)
-        BuildNumber = BuildNumber.Replace(".DRAFT", string.Empty);
-        var buildNumberMatch = Regex.Match(BuildNumber, "(\\d{4})(\\d{2})(\\d{2})\\.(\\d+)");
-        
-        if (buildNumberMatch.Success == false)
-        {
-            throw new ArgumentException("Invalid build number: " + BuildNumber);
-        }
-        
-        var productFileVersion = string.Join(".", buildNumberMatch.Groups[1].Value, buildNumberMatch.Groups[2].Value, buildNumberMatch.Groups[3].Value, buildNumberMatch.Groups[4].Value);
-        
-        Log.LogMessage("Using ProductVersion: " + ProductVersion, MessageImportance.High);
-        Log.LogMessage("Using ProductFileVersion: " + productFileVersion, MessageImportance.High);
-        
-        var stringBuilder = new StringBuilder();
-        
-        switch (Language.ToLower())
-        {
-            case "cs":
-                stringBuilder.AppendLine("[assembly: System.Reflection.AssemblyInformationalVersion(\"" + ProductVersion + "\")]");
-                stringBuilder.AppendLine("[assembly: System.Reflection.AssemblyVersion(\"" + ProductVersion + "\")]");
-                stringBuilder.AppendLine("[assembly: System.Reflection.AssemblyFileVersion(\"" + productFileVersion + "\")]");
-                break;
-            case "fs":
-                stringBuilder.AppendLine("namespace AssemblyInfo");
-                stringBuilder.AppendLine("[<assembly: System.Reflection.AssemblyInformationalVersion(\"" + ProductVersion + "\")>]");
-                stringBuilder.AppendLine("[<assembly: System.Reflection.AssemblyVersion(\"" + ProductVersion + "\")>]");
-                stringBuilder.AppendLine("[<assembly: System.Reflection.AssemblyFileVersion(\"" + productFileVersion + "\")>]");
-                stringBuilder.AppendLine("do ()");
-                break;
-            case "vb":
-                stringBuilder.AppendLine("<Assembly: Reflection.AssemblyInformationalVersion(\"" + ProductVersion + "\")>");
-                stringBuilder.AppendLine("<Assembly: Reflection.AssemblyVersion(\"" + ProductVersion + "\")>");
-                stringBuilder.AppendLine("<Assembly: Reflection.AssemblyFileVersion(\"" + productFileVersion + "\")>");
-                break;
-            default:
-                throw new ArgumentException("Language " + Language + " is not supported");
-        }
-        
-        var fileContents = stringBuilder.ToString();
-        AssemblyFileVersionPath = Path.Combine(Path.GetTempPath(), string.Join(".", AssemblyName, ProductVersion, "AssemblyFileVersion", Language));
-        
-        if (File.Exists(AssemblyFileVersionPath) && File.ReadAllText(AssemblyFileVersionPath) == fileContents)
-        {
-            Log.LogMessage("Assembly file version already exists. Using: " + AssemblyFileVersionPath, MessageImportance.High);
-        }
-        else
-        {
-            Log.LogMessage("Generating AssemblyFileVersion file: " + AssemblyFileVersionPath, MessageImportance.High);
-            File.WriteAllText(AssemblyFileVersionPath, fileContents);
-        }
-        ]]>
-      </Code>
-    </Task>
-  </UsingTask>
-
-  <Target Name="GenerateAssemblyFileVersion" BeforeTargets="CoreCompile">
-    <!-- Put build number 0 and today's date if this was a local build -->
-    <PropertyGroup>
-      <BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
-    </PropertyGroup>
-  
-    <GenerateAssemblyFileVersionTask
-      Language="$(MicroBuildAssemblyFileLanguage)"
-      ProductVersion="$(MicroBuildAssemblyVersion)"
-      BuildNumber="$(BUILD_BUILDNUMBER)"
-      AssemblyName="$(AssemblyName)"
-      Condition="'$(MicroBuildAssemblyFileLanguage)' != '' and '$(MicroBuildAssemblyVersion)' != ''">
-      <Output TaskParameter="AssemblyFileVersionPath" PropertyName="AssemblyFileVersionPath"/>
-    </GenerateAssemblyFileVersionTask>
-    
-      <!-- For FSharp.Core, assembly version must be inserted after all Core files, as it defines F# basic types (strings) -->
-    <ItemGroup Condition="'$(AssemblyName)' == 'FSharp.Core'">
-      <Compile Include="$(AssemblyFileVersionPath)" />
-    </ItemGroup>
-      <!-- For other assemblies, this must be inserted before all source files, to keep exe's EntryPoints (if any) as the last source file -->
-    <ItemGroup Condition="'$(AssemblyName)' != 'FSharp.Core'">
-      <TempCompile Include="$(AssemblyFileVersionPath)" />
-      <TempCompile Include="@(Compile)" />
-      <Compile Remove="@(Compile)" />
-      <Compile Include="@(TempCompile)" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="GetVsixPackageVersion" Outputs="$(VsixPackageVersion)">
-   <PropertyGroup>
-     <!--
-
-     Given $(BUILD_BUILDNUMBER) = '20161225.1'
-     Given $(MicroBuildAssemblyVersion) = '15.4.1.0'
-
-     Then $(BuildTimeStamp_Day) = 161225
-     Then $(BuildTimeStamp_Number) = 01
-     Then $(BuildTimeStamp) = 16122501
-     Then $(MicroBuildAssemblyVersion_WithoutRevision) = 15.4.1
-     Then $(VsixPackageVersion) = 15.4.1.16122501
-
-     -->
-     <BuildTimeStamp_Day>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Day>
-     <BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>
-     <BuildTimeStamp>$(BuildTimeStamp_Day)$(BuildTimeStamp_Number)</BuildTimeStamp>
-     <MicroBuildAssemblyVersion_WithoutRevision>$(MicroBuildAssemblyVersion.Substring(0, $(MicroBuildAssemblyVersion.LastIndexOf('.'))))</MicroBuildAssemblyVersion_WithoutRevision>
-     <VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
-   </PropertyGroup>
- </Target>
+  </Target>
 
   <Import Project="..\packages\MicroBuild.Core.$(MicroBuildCoreVersion)\build\MicroBuild.Core.targets" />
 </Project>

src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs → src/buildfromsource/FSharp.Build/AssemblyInfo.fs

@@ -2,18 +2,13 @@
 
 namespace Microsoft.FSharp
 open System.Reflection
+
 [<assembly:AssemblyDescription("FSharp.Build.dll")>]
 [<assembly:AssemblyCompany("Microsoft Corporation")>]
 [<assembly:AssemblyTitle("FSharp.Build.dll")>]
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
-do()
-
-// Until dotnet sdk can version assemblies, use this
-#if BUILD_FROM_SOURCE
-[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyFileVersion("2017.06.27.0")>]
-#endif
-
+[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
+[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/FSharp.Build/FSharp.Build.fsproj

@@ -18,7 +18,7 @@
     </EmbeddedResource>
     <Compile Include="FSBuild.fs" />
     <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.Build\InternalsVisibleTo.fs" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs" />
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="..\..\utils\CompilerLocationUtils.fs" />
     <Compile Include="..\..\utils\reshapedreflection.fs" />
     <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharpCommandLineBuilder.fs" />

src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs → src/buildfromsource/FSharp.Compiler.Interactive.Settings/AssemblyInfo.fs

@@ -10,12 +10,7 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
-
-// Until dotnet sdk can version assemblies, use this
-#if BUILD_FROM_SOURCE
-[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyFileVersion("2017.06.27.0")>]
-#endif
-
+[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
+[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj

@@ -19,7 +19,7 @@
     </EmbeddedResource>
     <Compile Include="FSInteractiveSettings.fs" />
     <Compile Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\InternalsVisibleTo.fs" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs" />
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="InternalsVisibleTo.fs" />
     <Compile Include="..\..\utils\reshapedreflection.fs" />
     <Compile Include="$(FSharpSourcesRoot)\fsharp\fsiattrs.fs" />

src/assemblyinfo/assemblyinfo.FSharp.Compiler.Private.dll.fs → src/buildfromsource/FSharp.Compiler.Private/AssemblyInfo.fs

@@ -10,12 +10,7 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
-
-// Until dotnet sdk can version assemblies, use this
-#if BUILD_FROM_SOURCE
-[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyFileVersion("2017.06.27.0")>]
-#endif
-
+[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
+[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

@@ -14,9 +14,7 @@
 
   <Import Project="..\BuildFromSource.targets" />
   <ItemGroup>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Private.dll.fs">
-      <Link>assemblyinfo.FSharp.Compiler.Private.dll.fs</Link>
-    </Compile>
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="InternalsVisibleTo.fs" />
     <EmbeddedResource Include="FSComp.resx">
       <Link>FSComp.resx</Link>

src/assemblyinfo/assemblyinfo.FSharp.Core.dll.fs → src/buildfromsource/FSharp.Core/AssemblyInfo.fs

@@ -18,12 +18,8 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyFlags(System.Reflection.AssemblyNameFlags.Retargetable)>]
 #endif
 
-// Until dotnet sdk can version assemblies, use this
-#if BUILD_FROM_SOURCE
-[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyFileVersion("2017.06.27.0")>]
-#endif
-
+[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
+[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()
 

src/buildfromsource/FSharp.Core/FSharp.Core.fsproj

@@ -197,9 +197,7 @@
     <Compile Include="$(FsCoreDir)\fslib-extra-pervasives.fs">
       <Link>Extras/fslib-extra-pervasives.fs</Link>
     </Compile>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Core.dll.fs">
-      <Link>assemblyinfo.FSharp.Core.dll.fs</Link>
-    </Compile>
+    <Compile Include="AssemblyInfo.fs" />
   </ItemGroup>
 
   <ItemGroup>

src/assemblyinfo/assemblyinfo.fsc.exe.fs → src/buildfromsource/Fsc/AssemblyInfo.fs

@@ -10,12 +10,7 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
-
-// Until dotnet sdk can version assemblies, use this
-#if BUILD_FROM_SOURCE
-[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyFileVersion("2017.06.27.0")>]
-#endif
-
+[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
+[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/Fsc/Fsc.fsproj

@@ -16,8 +16,8 @@
   <Import Project="..\BuildFromSource.targets" />
   <ItemGroup>
     <Compile Include="$(FSharpSourcesRoot)\fsharp\Fsc\InternalsVisibleTo.fs" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.fsc.exe.fs">
-      <Link>Resources/assemblyinfo.fsc.exe.fs</Link>
+    <Compile Include="AssemblyInfo.fs">
+      <Link>Resources/AssemblyInfo.fs</Link>
     </Compile>
     <Compile Include="$(FSharpSourcesRoot)\fsharp\fscmain.fs">
       <Link>fscmain.fs</Link>

src/assemblyinfo/assemblyinfo.fsi.exe.fs → src/buildfromsource/Fsi/AssemblyInfo.fs

@@ -7,12 +7,7 @@ open System.Reflection
 [<assembly:AssemblyTitle("fsi.exe")>]
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
-
-// Until dotnet sdk can version assemblies, use this
-#if BUILD_FROM_SOURCE
-[<assembly: System.Reflection.AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyVersion("4.4.1.0")>]
-[<assembly: System.Reflection.AssemblyFileVersion("2017.06.27.0")>]
-#endif
-
+[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
+[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/Fsi/Fsi.fsproj

@@ -19,10 +19,7 @@
     <Win32Resource>$(FsiDir)\fsi.res</Win32Resource>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.fsi.exe.fs">
-      <Link>assemblyinfo.fsi.exe.fs</Link>
-    </Compile>
-
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="$(FsiDir)\console.fs">
       <Link>console.fs</Link>
     </Compile>

src/fsharp/FSharp.Build/FSharp.Build.fsproj

@@ -23,7 +23,6 @@
     </FilesToLocalize>
     <InternalsVisibleTo Include="VisualFSharp.UnitTests" />
     <EmbeddedText Include="FSBuild.txt" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs" />
     <Compile Include="..\..\utils\CompilerLocationUtils.fs" />
     <Compile Include="..\..\utils\reshapedreflection.fs" />
     <Compile Include="FSharpCommandLineBuilder.fs" />

src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj

@@ -22,7 +22,6 @@
 
   <ItemGroup>
     <EmbeddedText Include="..\FSInteractiveSettings.txt" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs" />
     <Compile Include="..\..\utils\reshapedreflection.fs" />
     <Compile Include="..\fsiattrs.fs" />
     <Compile Include="..\fsiaux.fsi" />

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

@@ -58,9 +58,6 @@
     <InternalsVisibleTo Include="LanguageServiceProfiling" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Private.dll.fs">
-      <Link>assemblyinfo.FSharp.Compiler.Private.dll.fs</Link>
-    </Compile>
     <EmbeddedText Include="..\FSComp.txt">
       <Link>FSComp.txt</Link>
     </EmbeddedText>

src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs

@@ -5,10 +5,5 @@ namespace Microsoft.FSharp
 open System.Reflection
 open System.Runtime.InteropServices
 
-[<assembly:AssemblyDescription("FSharp.Compiler.Server.Shared.dll")>]
-[<assembly:AssemblyCompany("Microsoft Corporation")>]
-[<assembly:AssemblyTitle("FSharp.Compiler.Server.Shared.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
-[<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
 do()

src/fsharp/FSharp.Core/FSharp.Core.fsproj

@@ -225,9 +225,6 @@
     <Compile Include="fslib-extra-pervasives.fs">
       <Link>Extras/fslib-extra-pervasives.fs</Link>
     </Compile>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Core.dll.fs">
-      <Link>assemblyinfo.FSharp.Core.dll.fs</Link>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetDotnetProfile)' != 'coreclr'">

src/fsharp/Fsc/Fsc.fsproj

@@ -28,9 +28,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.fsc.exe.fs">
-      <Link>Resources/assemblyinfo.fsc.exe.fs</Link>
-    </Compile>
     <Compile Include="..\fscmain.fs">
       <Link>fscmain.fs</Link>
     </Compile>

src/fsharp/fsi/Fsi.fsproj

@@ -27,10 +27,6 @@
     <TargetFrameworkVersion Condition="'$(TargetDotnetProfile)' != 'coreclr'">v4.6</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.fsi.exe.fs">
-      <Link>assemblyinfo.fsi.exe.fs</Link>
-    </Compile>
-
     <Compile Include="console.fs">
       <Link>console.fs</Link>
     </Compile>

src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj

@@ -22,9 +22,6 @@
     <TargetFrameworkVersion Condition="'$(TargetDotnetProfile)' != 'coreclr'">v4.6</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.fsi.exe.fs">
-      <Link>assemblyinfo.fsi.exe.fs</Link>
-    </Compile>
     <Compile Include="..\fsi\console.fs">
       <Link>console.fs</Link>
     </Compile>