remove '-proto' file name suffixes

7b1d303a · Brett V. Forsgren · 2d0452a3 · 7b1d303a · 7b1d303a · 7b1d303a
10 changed file
--- a/build.cmd
+++ b/build.cmd
@@ -702,7 +702,7 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
 echo ---------------- Done with package restore, starting proto ------------------------

 rem Decide if Proto need building
-if NOT EXIST Proto\net40\bin\fsc-proto.exe (
+if NOT EXIST Proto\net40\bin\fsc.exe (
  set BUILD_PROTO=1
 )

@@ -727,8 +727,8 @@ if "%BUILD_PROTO%" == "1" (
    @if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure
  )

-  echo %_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo 
-       %_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo 
+  echo %_ngenexe% install Proto\net40\bin\fsc.exe /nologo 
+       %_ngenexe% install Proto\net40\bin\fsc.exe /nologo 
  @if ERRORLEVEL 1 echo Error: NGen of proto failed  && goto :failure
 )


--- a/fcs/FSharp.Compiler.Service/AssemblyInfo.fs
+++ b/fcs/FSharp.Compiler.Service/AssemblyInfo.fs
@@ -34,7 +34,7 @@ open System.Runtime.InteropServices
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.UnitTests")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc-proto")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc")>]
 #endif

 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]

--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -126,8 +126,8 @@
      <PropertyGroup>
        <OutputPath Condition=" '$(CustomOutputPath)' != 'true' ">$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFrameworkOutputDirectory)\bin</OutputPath>
        <FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin</FscToolPath>
-        <FscToolExe>fsc-proto.exe</FscToolExe>
-        <FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.Portable.FSharp-proto.targets</FSharpTargetsPath>
+        <FscToolExe>fsc.exe</FscToolExe>
+        <FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.Portable.FSharp.targets</FSharpTargetsPath>
      </PropertyGroup>
    </When>
    <Otherwise>
@@ -135,8 +135,8 @@
      <PropertyGroup>
        <OutputPath Condition=" '$(CustomOutputPath)' != 'true' ">$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFrameworkOutputDirectory)\bin</OutputPath>
        <FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin</FscToolPath>
-        <FscToolExe>fsc-proto.exe</FscToolExe>
-        <FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.FSharp-proto.targets</FSharpTargetsPath>
+        <FscToolExe>fsc.exe</FscToolExe>
+        <FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.FSharp.targets</FSharpTargetsPath>
      </PropertyGroup>
    </Otherwise>
  </Choose>
@@ -298,13 +298,13 @@
  </Target>

  <UsingTask TaskName="FSharpEmbedResourceText"
-             AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
+             AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build.dll"
             Condition="'$(Configuration)' != 'Proto'" />
  <UsingTask TaskName="FSharpEmbedResXSource"
-             AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
+             AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build.dll"
             Condition="'$(Configuration)' != 'Proto'" />
  <UsingTask TaskName="WriteCodeFragment"
-             AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
+             AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build.dll"
             Condition="'$(Configuration)' != 'Proto'" />

  <Target Name="GenerateFSharpTextResources"

--- a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
+++ b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
@@ -9,7 +9,7 @@
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <AssemblyName>FSharp.Build-proto</AssemblyName>
+    <AssemblyName>FSharp.Build</AssemblyName>
    <AllowCrossTargeting>true</AllowCrossTargeting>
    <BuildWith>LKG</BuildWith>
    <ProjectGuid>{D8BC791F-C1A9-49DC-9432-0F3090537555}</ProjectGuid>
@@ -39,30 +39,18 @@
    <Compile Include="..\FSharp.Build\WriteCodeFragment.fs">
      <Link>WriteCodeFragment.fs</Link>
    </Compile>
-    <CopyAndSubstituteText Include="..\FSharp.Build\Microsoft.FSharp.Targets">
-      <Link>Microsoft.FSharp-proto.targets</Link>
-      <TargetFilename>Microsoft.FSharp-proto.targets</TargetFilename>
-      <Pattern1>{BuildSuffix}</Pattern1>
-      <Replacement1>-proto</Replacement1>
-    </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="..\FSharp.Build\Microsoft.Portable.FSharp.Targets">
-      <Link>Microsoft.Portable.FSharp-proto.targets</Link>
-      <TargetFilename>Microsoft.Portable.FSharp-proto.targets</TargetFilename>
-      <Pattern1>{BuildSuffix}</Pattern1>
-      <Replacement1>-proto</Replacement1>
-    </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="..\FSharp.Build\Microsoft.FSharp.NetSdk.props">
-      <Link>Microsoft.FSharp.NetSdk-proto.props</Link>
-      <TargetFilename>Microsoft.FSharp.NetSdk-proto.props</TargetFilename>
-      <Pattern1>{BuildSuffix}</Pattern1>
-      <Replacement1>-proto</Replacement1>
-    </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="..\FSharp.Build\Microsoft.FSharp.NetSdk.targets">
-      <Link>Microsoft.FSharp.NetSdk-proto.targets</Link>
-      <TargetFilename>Microsoft.FSharp.NetSdk-proto.targets</TargetFilename>
-      <Pattern1>{BuildSuffix}</Pattern1>
-      <Replacement1>-proto</Replacement1>
-    </CopyAndSubstituteText>
+    <None Include="..\FSharp.Build\Microsoft.FSharp.Targets" CopyToOutputDirectory="PreserveNewest">
+      <Link>Microsoft.FSharp.Targets</Link>
+    </None>
+    <None Include="..\FSharp.Build\Microsoft.Portable.FSharp.Targets" CopyToOutputDirectory="PreserveNewest">
+      <Link>Microsoft.Portable.FSharp.Targets</Link>
+    </None>
+    <None Include="..\FSharp.Build\Microsoft.FSharp.NetSdk.props" CopyToOutputDirectory="PreserveNewest">
+      <Link>Microsoft.FSharp.NetSdk.props</Link>
+    </None>
+    <None Include="..\FSharp.Build\Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest">
+      <Link>Microsoft.FSharp.NetSdk.targets</Link>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <Reference Include="mscorlib" />

--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -31,26 +31,10 @@
    <Compile Include="FSharpEmbedResXSource.fs" />
    <Compile Include="WriteCodeFragment.fs" />
    <Compile Include="CreateFSharpManifestResourceName.fs" />
-    <CopyAndSubstituteText Include="Microsoft.FSharp.Targets">
-        <TargetFilename>Microsoft.FSharp.Targets</TargetFilename>
-        <Pattern1>{BuildSuffix}</Pattern1>
-        <Replacement1></Replacement1>
-    </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="Microsoft.Portable.FSharp.Targets">
-      <TargetFilename>Microsoft.Portable.FSharp.Targets</TargetFilename>
-      <Pattern1>{BuildSuffix}</Pattern1>
-      <Replacement1></Replacement1>
-    </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="Microsoft.FSharp.NetSdk.props">
-        <TargetFilename>Microsoft.FSharp.NetSdk.props</TargetFilename>
-        <Pattern1>{BuildSuffix}</Pattern1>
-        <Replacement1></Replacement1>
-    </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="Microsoft.FSharp.NetSdk.targets">
-        <TargetFilename>Microsoft.FSharp.NetSdk.targets</TargetFilename>
-        <Pattern1>{BuildSuffix}</Pattern1>
-        <Replacement1></Replacement1>
-    </CopyAndSubstituteText>
+    <None Include="Microsoft.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.Portable.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.FSharp.NetSdk.props" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetDotnetProfile)' != 'coreclr'">

--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
@@ -21,11 +21,11 @@ this file.
        <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
    </PropertyGroup>

-    <UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
-    <UsingTask TaskName="FSharpEmbedResourceText" AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
-    <UsingTask TaskName="FSharpEmbedResXSource" AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
-    <UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
-    <UsingTask TaskName="WriteCodeFragment" AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
+    <UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build.dll" />
+    <UsingTask TaskName="FSharpEmbedResourceText" AssemblyFile="FSharp.Build.dll" />
+    <UsingTask TaskName="FSharpEmbedResXSource" AssemblyFile="FSharp.Build.dll" />
+    <UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build.dll" />
+    <UsingTask TaskName="WriteCodeFragment" AssemblyFile="FSharp.Build.dll" />

    <PropertyGroup>
        <ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>

--- a/src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets
+++ b/src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets
@@ -15,8 +15,8 @@

  <!-- Cope with both .targets and .Targets on case-sensitive file-systems -->
  <!-- .targets is used by F# .NET Core SDKs, .Targets is used by F# .NET Framework SDKs -->
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.FSharp{BuildSuffix}.Targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.FSharp{BuildSuffix}.Targets') AND !Exists('$(MSBuildThisFileDirectory)Microsoft.FSharp{BuildSuffix}.targets')"/>
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.FSharp{BuildSuffix}.targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.FSharp{BuildSuffix}.targets')"/>
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.FSharp.Targets') AND !Exists('$(MSBuildThisFileDirectory)Microsoft.FSharp.targets')"/>
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.FSharp.targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.FSharp.targets')"/>

  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props')"/>
  

--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -34,7 +34,7 @@
  </ItemGroup>

  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
-    <CustomAdditionalCompileInputs Include="$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin\fsc-proto.exe">
+    <CustomAdditionalCompileInputs Include="$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin\fsc.exe">
      <Visible>false</Visible>
    </CustomAdditionalCompileInputs>
  </ItemGroup>

--- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj
+++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
@@ -10,7 +10,7 @@
    <PlatformTarget>x86</PlatformTarget>
    <OutputType>Exe</OutputType>
    <NoWarn>$(NoWarn);62</NoWarn>
-    <AssemblyName>fsc-proto</AssemblyName>
+    <AssemblyName>fsc</AssemblyName>
    <DefineConstants>NO_EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
    <DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
    <NoWarn>$(NoWarn);35;44;62;9;60;86;47;1203</NoWarn>

--- a/src/utils/sformat.fsi
+++ b/src/utils/sformat.fsi
@@ -15,7 +15,7 @@
 // all 4 cases the layout types are really different types.

 #if COMPILER
-// fsc-proto.exe:
+// fsc.exe:
 // FSharp.Compiler.Service.dll:
 namespace Internal.Utilities.StructuredFormat
 #else
@@ -36,7 +36,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
    type internal TaggedText =
        abstract Tag: LayoutTag
        abstract Text: string
-#else  // FSharp.Compiler.Service.dll, fsc-proto.exe
+#else  // FSharp.Compiler.Service.dll, fsc.exe

    /// Data representing joints in structured layouts of terms.  The representation
    /// of this data type is only for the consumption of formatting engines.