Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb138f65

Browse files
authored
Target files change case (#3176)
* Rename targets --part1* Rename targets --part1* Microsoft.FSharp.Targets has a T as does Microsoft.Portable.FSharp.Targets
1 parent5872b44 commitb138f65

File tree

16 files changed

+26
-26
lines changed

16 files changed

+26
-26
lines changed

‎CHANGELOG.md‎

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

‎DEVGUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ This gives a much tighter inner development loop than uninstalling/reinstalling
158158

159159
####[Optional] Clobber the F# SDK on the machine
160160

161-
**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 standardinnstall location or``Microsoft.FSharp.targets``.**Repairing Visual Studio 15 is currently the only way to revert this step.**
161+
**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 standardinstall location or``Microsoft.FSharp.Targets``.**Repairing Visual Studio 15 is currently the only way to revert this step.**
162162

163163
For**Debug**:
164164

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@
111111
</Component>
112112

113113
<ComponentId="Compiler_Redist_Microsoft.FSharp.targets"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.targets, $(var.LocaleCode)))">
114-
<FileId="Compiler_Redist_Microsoft.FSharp.targets"Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.targets" />
114+
<FileId="Compiler_Redist_Microsoft.FSharp.targets"Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.Targets" />
115115
</Component>
116116

117117
<ComponentId="Compiler_Redist_Microsoft.Portable.FSharp.targets"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Portable.FSharp.targets, $(var.LocaleCode)))">
118-
<FileId="Compiler_Redist_Microsoft.Portable.FSharp.targets"Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.targets" />
118+
<FileId="Compiler_Redist_Microsoft.Portable.FSharp.targets"Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.Targets" />
119119
</Component>
120120

121121
<ComponentId="Compiler_Redist_Microsoft.FSharp.NetSdk.props"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.NetSdk.props, $(var.LocaleCode)))">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ package name=Microsoft.FSharp.Dependencies
44
version=$(FSharpPackageVersion)
55

66
folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
7-
file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
8-
file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
7+
file "Microsoft.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"
8+
file "Microsoft.Portable.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"
99
file "Microsoft.FSharp.NetSdk.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.targets"
1010
file "Microsoft.FSharp.NetSdk.props" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.props"
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
<CompileInclude="..\FSharp.Build\Fsc.fs">
3535
<Link>Fsc.fs</Link>
3636
</Compile>
37-
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.targets">
37+
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.Targets">
3838
<Link>Microsoft.FSharp-proto.targets</Link>
3939
<TargetFilename>Microsoft.FSharp-proto.targets</TargetFilename>
4040
<Pattern1>{BuildSuffix}</Pattern1>
4141
<Replacement1>-proto</Replacement1>
4242
</CopyAndSubstituteText>
43-
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.Portable.FSharp.targets">
43+
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.Portable.FSharp.Targets">
4444
<Link>Microsoft.Portable.FSharp-proto.targets</Link>
4545
<TargetFilename>Microsoft.Portable.FSharp-proto.targets</TargetFilename>
4646
<Pattern1>{BuildSuffix}</Pattern1>

‎src/fsharp/FSharp.Build/CreateFSharpManifestResourceName.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type CreateFSharpManifestResourceName public () =
2626
//
2727
// However for non-resx resources, for some reason Visual FSharp does _not_ add the directory name to the resource name.
2828
// It is very unclear where the directory name gets dropped in the Visual FSharp implementation
29-
// - is it in Microsoft.Common.targets, Microsoft.FSharp.targets or how the base type CreateCSharpManifestResourceName
29+
// - is it in Microsoft.Common.targets, Microsoft.FSharp.Targets or how the base type CreateCSharpManifestResourceName
3030
// is created and used - who knows, the code is not easy to understand despite it doing something very simple. That's
3131
// the nature of MSBuild/XBuild....
3232
//

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
<CompileInclude="Fsc.fs" />
4040
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
4141
<CompileInclude="CreateFSharpManifestResourceName.fs" />
42-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.targets">
42+
<CopyAndSubstituteTextInclude="Microsoft.FSharp.Targets">
4343
<TargetFilename>Microsoft.FSharp.Targets</TargetFilename>
4444
<Pattern1>{BuildSuffix}</Pattern1>
4545
<Replacement1></Replacement1>
4646
</CopyAndSubstituteText>
47-
<CopyAndSubstituteTextInclude="Microsoft.Portable.FSharp.targets">
47+
<CopyAndSubstituteTextInclude="Microsoft.Portable.FSharp.Targets">
4848
<TargetFilename>Microsoft.Portable.FSharp.Targets</TargetFilename>
4949
<Pattern1>{BuildSuffix}</Pattern1>
5050
<Replacement1></Replacement1>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
4141
<OtherFlags>$(OtherFlags) --simpleresolution --nocopyfsharpcore</OtherFlags>
4242
</PropertyGroup>
4343

44-
<ImportProject="Microsoft.FSharp.targets" />
44+
<ImportProject="Microsoft.FSharp.Targets" />
4545

4646
<PropertyGroupCondition="'$(PackProjectInputFile)' == ''">
4747
<PackProjectInputFile>$(MSBuildProjectFullPath)</PackProjectInputFile>

‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎renamed to ‎src/fsharp/FSharp.Build/Microsoft.FSharp.Targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!--
44
***********************************************************************************************
5-
Microsoft.FSharp.targets
5+
Microsoft.FSharp.Targets
66
77
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
88
created a backup copy. Incorrect changes to this file will make it

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp