Target files change case (#3176)

* Rename targets --part1

* Rename targets --part1

* Microsoft.FSharp.Targets has a T as does Microsoft.Portable.FSharp.Targets

CHANGELOG.md

@@ -202,7 +202,7 @@ Includes commits up to `3385e58aabc91368c8e1f551650ba48705aaa285`
 * Allow breakpoints to be set inside of quotations
 * Support "Publish" action in project system for web, Azure
 * Bugfix [#126](https://visualfsharp.codeplex.com/workitem/126): F# package installer does not honor custom install paths for express SKUs
-* Bugfix [#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.targets shim not deployed with F# SDK
+* Bugfix [#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.Targets shim not deployed with F# SDK
 * Bugfix: Fix crash in smart indent provider
 * Bugfix [#55](https://visualfsharp.codeplex.com/workitem/55): Cannot add reference to F# PCL project
 * Bugfix: Typos in tutorial project script

DEVGUIDE.md

@@ -158,7 +158,7 @@ This gives a much tighter inner development loop than uninstalling/reinstalling
 
 #### [Optional] Clobber the F# SDK on the machine
 
-**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard innstall location or ``Microsoft.FSharp.targets``.  **Repairing Visual Studio 15 is currently the only way to revert this step.**
+**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard install location or ``Microsoft.FSharp.Targets``.  **Repairing Visual Studio 15 is currently the only way to revert this step.**
 
 For **Debug**:
 

setup/FSharp.SDK/component-groups/Compiler_Redist.wxs

@@ -111,11 +111,11 @@
       </Component>      
 
       <Component Id="Compiler_Redist_Microsoft.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.targets, $(var.LocaleCode)))">
-        <File Id="Compiler_Redist_Microsoft.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.targets" />
+        <File Id="Compiler_Redist_Microsoft.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.Targets" />
       </Component>
 
       <Component Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Portable.FSharp.targets, $(var.LocaleCode)))">
-        <File Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.targets" />
+        <File Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.Targets" />
       </Component>
 
       <Component Id="Compiler_Redist_Microsoft.FSharp.NetSdk.props" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.NetSdk.props, $(var.LocaleCode)))">

setup/Swix/Microsoft.FSharp.Dependencies/Files.swr

@@ -4,8 +4,8 @@ package name=Microsoft.FSharp.Dependencies
         version=$(FSharpPackageVersion)
 
 folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
-  file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
-  file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
+  file "Microsoft.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
+  file "Microsoft.Portable.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
   file "Microsoft.FSharp.NetSdk.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.targets"
   file "Microsoft.FSharp.NetSdk.props" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.props"
 

src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj

@@ -34,13 +34,13 @@
     <Compile Include="..\FSharp.Build\Fsc.fs">
       <Link>Fsc.fs</Link>
     </Compile>
-    <CopyAndSubstituteText Include="..\FSharp.Build\Microsoft.FSharp.targets">
+    <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">
+    <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>

src/fsharp/FSharp.Build/CreateFSharpManifestResourceName.fs

@@ -26,7 +26,7 @@ type CreateFSharpManifestResourceName public () =
         //
         // However for non-resx resources, for some reason Visual FSharp does _not_ add the directory name to the resource name.
         // It is very unclear where the directory name gets dropped in the Visual FSharp implementation 
-        // - is it in Microsoft.Common.targets, Microsoft.FSharp.targets or how the base type CreateCSharpManifestResourceName 
+        // - is it in Microsoft.Common.targets, Microsoft.FSharp.Targets or how the base type CreateCSharpManifestResourceName 
         // is created and used - who knows, the code is not easy to understand despite it doing something very simple. That's
         // the nature of MSBuild/XBuild....
         //

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

@@ -39,12 +39,12 @@
     <Compile Include="Fsc.fs" />
     <Compile Include="CreateFSharpManifestResourceName.fsi" />
     <Compile Include="CreateFSharpManifestResourceName.fs" />
-    <CopyAndSubstituteText Include="Microsoft.FSharp.targets">
+    <CopyAndSubstituteText Include="Microsoft.FSharp.Targets">
         <TargetFilename>Microsoft.FSharp.Targets</TargetFilename>
         <Pattern1>{BuildSuffix}</Pattern1>
         <Replacement1></Replacement1>
     </CopyAndSubstituteText>
-    <CopyAndSubstituteText Include="Microsoft.Portable.FSharp.targets">
+    <CopyAndSubstituteText Include="Microsoft.Portable.FSharp.Targets">
       <TargetFilename>Microsoft.Portable.FSharp.Targets</TargetFilename>
       <Pattern1>{BuildSuffix}</Pattern1>
       <Replacement1></Replacement1>

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets

@@ -41,7 +41,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <OtherFlags>$(OtherFlags) --simpleresolution --nocopyfsharpcore</OtherFlags>
   </PropertyGroup>
 
-  <Import Project="Microsoft.FSharp.targets" />
+  <Import Project="Microsoft.FSharp.Targets" />
 
   <PropertyGroup Condition="'$(PackProjectInputFile)' == ''">
     <PackProjectInputFile>$(MSBuildProjectFullPath)</PackProjectInputFile>

src/fsharp/FSharp.Build/Microsoft.FSharp.targets → src/fsharp/FSharp.Build/Microsoft.FSharp.Targets

@@ -2,7 +2,7 @@
 
 <!--
 ***********************************************************************************************
-Microsoft.FSharp.targets
+Microsoft.FSharp.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

src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec

@@ -39,7 +39,7 @@
         </dependencies>
         <contentFiles>
             <files include="any/any/default.win32manifest"                       buildAction="Content" copyToOutput="true" flatten="false"  />
-            <files include="any/any/Microsoft.FSharp.targets"                    buildAction="Content" copyToOutput="true" flatten="false"  />
+            <files include="any/any/Microsoft.FSharp.Targets"                    buildAction="Content" copyToOutput="true" flatten="false"  />
             <files include="any/any/Microsoft.Portable.FSharp.targets"           buildAction="Content" copyToOutput="true" flatten="false"  />
             <files include="any/any/Microsoft.FSharp.NetSdk.targets"             buildAction="Content" copyToOutput="true" flatten="false"  />
             <files include="any/any/Microsoft.FSharp.NetSdk.props"               buildAction="Content" copyToOutput="true" flatten="false"  />
@@ -61,8 +61,8 @@
         <file src="coreclr/bin/FSharp.Build.dll"                            target="lib/netstandard1.6" />
         <file src="coreclr/bin/FSharp.Compiler.Interactive.Settings.dll"    target="lib/netstandard1.6" />
         <file src="coreclr/bin/default.win32manifest"                       target="contentFiles/any/any/"  />
-        <file src="coreclr/bin/Microsoft.FSharp.targets"                    target="contentFiles/any/any/"  />
-        <file src="coreclr/bin/Microsoft.Portable.FSharp.targets"           target="contentFiles/any/any/"  />
+        <file src="coreclr/bin/Microsoft.FSharp.Targets"                    target="contentFiles/any/any/"  />
+        <file src="coreclr/bin/Microsoft.Portable.FSharp.Targets"           target="contentFiles/any/any/"  />
         <file src="coreclr/bin/Microsoft.FSharp.NetSdk.targets"             target="contentFiles/any/any/"  />
         <file src="coreclr/bin/Microsoft.FSharp.NetSdk.props"               target="contentFiles/any/any/"  />
     </files>

src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec

@@ -53,8 +53,8 @@
         <file src="coreclr/bin/FSharp.Build.dll"                            target="lib/netstandard1.6" />
         <file src="coreclr/bin/FSharp.Compiler.Interactive.Settings.dll"    target="lib/netstandard1.6" />
         <file src="coreclr/bin/default.win32manifest"                       target="runtimes/any/native"  />
-        <file src="coreclr/bin/Microsoft.FSharp.targets"                    target="runtimes/any/native"  />
-        <file src="coreclr/bin/Microsoft.Portable.FSharp.targets"           target="runtimes/any/native"  />
+        <file src="coreclr/bin/Microsoft.FSharp.Targets"                    target="runtimes/any/native"  />
+        <file src="coreclr/bin/Microsoft.Portable.FSharp.Targets"           target="runtimes/any/native"  />
         <file src="coreclr/bin/Microsoft.FSharp.NetSdk.targets"             target="runtimes/any/native"  />
         <file src="coreclr/bin/Microsoft.FSharp.NetSdk.props"               target="runtimes/any/native"  />
     </files>

vsintegration/tests/Salsa/salsa.fs

@@ -695,7 +695,7 @@ module internal Salsa =
             Append otherProjMisc
 
             let t = targetsFileFolder.TrimEnd([|'\\'|])
-            Append (sprintf "    <Import Project=\"%s\\Microsoft.FSharp.targets\"/>" t)
+            Append (sprintf "    <Import Project=\"%s\\Microsoft.FSharp.Targets\"/>" t)
             Append "</Project>"
             sb.ToString()
 
@@ -1558,8 +1558,8 @@ module internal Salsa =
 
     let BuiltMSBuildBehaviourHooks() = Privates.MSBuildBehaviorHooks(false) :> ProjectBehaviorHooks
             
-    /// Salsa tests which create .fsproj files using the freshly built version of Microsoft.FSharp.targets and FSharp.Build
+    /// Salsa tests which create .fsproj files using the freshly built version of Microsoft.FSharp.Targets and FSharp.Build
     let BuiltMSBuildTestFlavour() = MSBuildTestFlavor(false) :> VsOps
 
-    /// Salsa tests which create .fsproj files using the installed version of Microsoft.FSharp.targets.
+    /// Salsa tests which create .fsproj files using the installed version of Microsoft.FSharp.Targets.
     let InstalledMSBuildTestFlavour() = MSBuildTestFlavor(true) :> VsOps

vsintegration/tests/unittests/Tests.LanguageService.Script.fs

@@ -1498,7 +1498,7 @@ type UsingMSBuild() as this =
                                        "Script.fsx"])           
             for line in lines do 
                 printfn "%s" line
-                AssertNotContains(line,"error MSB") // Microsoft.FSharp.targets(135,9): error MSB6006: "fsc.exe" exited with code -532462766.
+                AssertNotContains(line,"error MSB") // Microsoft.FSharp.Targets(135,9): error MSB6006: "fsc.exe" exited with code -532462766.
 
         Assert.IsTrue(not(build.BuildSucceeded), "Expected build to fail")                                  
         

vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs

@@ -411,7 +411,7 @@ type Miscellaneous() =
                 // ensure that <PreBuildEvent> is after <Import> declaration
                 let fsprojFileText = File.ReadAllText(projFileName)
                 printfn "%s" fsprojFileText
-                let regexStr = "<Import Project=.*?Microsoft.FSharp.targets(.|\\n)*?<PreBuildEvent>"
+                let regexStr = "<Import Project=.*?Microsoft.FSharp.Targets(.|\\n)*?<PreBuildEvent>"
                 TheTests.HelpfulAssertMatches '<' regexStr fsprojFileText
                 // ensure it runs
                 let outputWindowPaneErrors : string list ref = ref [] 
@@ -480,7 +480,7 @@ type Miscellaneous() =
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>", fun project configChangeNotifier projFile -> 
             let projFileText = File.ReadAllText(projFile)
-            // We need to add text _after_ the import of Microsoft.FSharp.targets.  
+            // We need to add text _after_ the import of Microsoft.FSharp.Targets.  
             let i = projFileText.IndexOf("<Import Project=")
             let i = projFileText.IndexOf(">", i)
             let newProjFileText = projFileText.Insert(i+1, @"

vsintegration/update-vsintegration.cmd

@@ -53,8 +53,8 @@ copy /y "%BINDIR%\fsi.exe" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsi.exe.config" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsiAnyCpu.exe" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsiAnyCpu.exe.config" "%COMPILERSDKPATH%"
-copy /y "%BINDIR%\Microsoft.FSharp.targets" "%COMPILERSDKPATH%"
-copy /y "%BINDIR%\Microsoft.Portable.FSharp.targets" "%COMPILERSDKPATH%"
+copy /y "%BINDIR%\Microsoft.FSharp.Targets" "%COMPILERSDKPATH%"
+copy /y "%BINDIR%\Microsoft.Portable.FSharp.Targets" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\Microsoft.FSharp.NetSdk.props" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\Microsoft.FSharp.NetSdk.targets" "%COMPILERSDKPATH%"
 copy /y "%TOPDIR%\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" "%COMPILERSDKPATH%"