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

Commit7b1d303

Browse files
committed
remove '-proto' file name suffixes
1 parent2d0452a commit7b1d303

File tree

10 files changed

+39
-67
lines changed

10 files changed

+39
-67
lines changed

‎build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
702702
echo ---------------- Done with package restore, starting proto ------------------------
703703

704704
rem Decide if Proto need building
705-
ifNOTEXIST Proto\net40\bin\fsc-proto.exe (
705+
ifNOTEXIST Proto\net40\bin\fsc.exe (
706706
setBUILD_PROTO=1
707707
)
708708

@@ -727,8 +727,8 @@ if "%BUILD_PROTO%" == "1" (
727727
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
728728
)
729729

730-
echo%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
731-
%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
730+
echo%_ngenexe% install Proto\net40\bin\fsc.exe /nologo
731+
%_ngenexe% install Proto\net40\bin\fsc.exe /nologo
732732
@if ERRORLEVEL1echo Error: NGen of proto failed&&goto :failure
733733
)
734734

‎fcs/FSharp.Compiler.Service/AssemblyInfo.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ open System.Runtime.InteropServices
3434
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.UnitTests")>]
3535
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa")>]
3636
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests")>]
37-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc-proto")>]
37+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc")>]
3838
#endif
3939

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

‎src/FSharpSource.targets‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,17 @@
126126
<PropertyGroup>
127127
<OutputPathCondition=" '$(CustomOutputPath)' != 'true'">$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFrameworkOutputDirectory)\bin</OutputPath>
128128
<FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin</FscToolPath>
129-
<FscToolExe>fsc-proto.exe</FscToolExe>
130-
<FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.Portable.FSharp-proto.targets</FSharpTargetsPath>
129+
<FscToolExe>fsc.exe</FscToolExe>
130+
<FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.Portable.FSharp.targets</FSharpTargetsPath>
131131
</PropertyGroup>
132132
</When>
133133
<Otherwise>
134134
<!-- Compiling net40 with Proto-->
135135
<PropertyGroup>
136136
<OutputPathCondition=" '$(CustomOutputPath)' != 'true'">$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFrameworkOutputDirectory)\bin</OutputPath>
137137
<FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin</FscToolPath>
138-
<FscToolExe>fsc-proto.exe</FscToolExe>
139-
<FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.FSharp-proto.targets</FSharpTargetsPath>
138+
<FscToolExe>fsc.exe</FscToolExe>
139+
<FSharpTargetsPath>..\Proto\$(ProtoFlavour)\bin\Microsoft.FSharp.targets</FSharpTargetsPath>
140140
</PropertyGroup>
141141
</Otherwise>
142142
</Choose>
@@ -298,13 +298,13 @@
298298
</Target>
299299

300300
<UsingTaskTaskName="FSharpEmbedResourceText"
301-
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
301+
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build.dll"
302302
Condition="'$(Configuration)' != 'Proto'" />
303303
<UsingTaskTaskName="FSharpEmbedResXSource"
304-
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
304+
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build.dll"
305305
Condition="'$(Configuration)' != 'Proto'" />
306306
<UsingTaskTaskName="WriteCodeFragment"
307-
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
307+
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build.dll"
308308
Condition="'$(Configuration)' != 'Proto'" />
309309

310310
<TargetName="GenerateFSharpTextResources"

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

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
1010
<PropertyGroup>
1111
<OutputType>Library</OutputType>
12-
<AssemblyName>FSharp.Build-proto</AssemblyName>
12+
<AssemblyName>FSharp.Build</AssemblyName>
1313
<AllowCrossTargeting>true</AllowCrossTargeting>
1414
<BuildWith>LKG</BuildWith>
1515
<ProjectGuid>{D8BC791F-C1A9-49DC-9432-0F3090537555}</ProjectGuid>
@@ -39,30 +39,18 @@
3939
<CompileInclude="..\FSharp.Build\WriteCodeFragment.fs">
4040
<Link>WriteCodeFragment.fs</Link>
4141
</Compile>
42-
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.Targets">
43-
<Link>Microsoft.FSharp-proto.targets</Link>
44-
<TargetFilename>Microsoft.FSharp-proto.targets</TargetFilename>
45-
<Pattern1>{BuildSuffix}</Pattern1>
46-
<Replacement1>-proto</Replacement1>
47-
</CopyAndSubstituteText>
48-
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.Portable.FSharp.Targets">
49-
<Link>Microsoft.Portable.FSharp-proto.targets</Link>
50-
<TargetFilename>Microsoft.Portable.FSharp-proto.targets</TargetFilename>
51-
<Pattern1>{BuildSuffix}</Pattern1>
52-
<Replacement1>-proto</Replacement1>
53-
</CopyAndSubstituteText>
54-
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.NetSdk.props">
55-
<Link>Microsoft.FSharp.NetSdk-proto.props</Link>
56-
<TargetFilename>Microsoft.FSharp.NetSdk-proto.props</TargetFilename>
57-
<Pattern1>{BuildSuffix}</Pattern1>
58-
<Replacement1>-proto</Replacement1>
59-
</CopyAndSubstituteText>
60-
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.NetSdk.targets">
61-
<Link>Microsoft.FSharp.NetSdk-proto.targets</Link>
62-
<TargetFilename>Microsoft.FSharp.NetSdk-proto.targets</TargetFilename>
63-
<Pattern1>{BuildSuffix}</Pattern1>
64-
<Replacement1>-proto</Replacement1>
65-
</CopyAndSubstituteText>
42+
<NoneInclude="..\FSharp.Build\Microsoft.FSharp.Targets"CopyToOutputDirectory="PreserveNewest">
43+
<Link>Microsoft.FSharp.Targets</Link>
44+
</None>
45+
<NoneInclude="..\FSharp.Build\Microsoft.Portable.FSharp.Targets"CopyToOutputDirectory="PreserveNewest">
46+
<Link>Microsoft.Portable.FSharp.Targets</Link>
47+
</None>
48+
<NoneInclude="..\FSharp.Build\Microsoft.FSharp.NetSdk.props"CopyToOutputDirectory="PreserveNewest">
49+
<Link>Microsoft.FSharp.NetSdk.props</Link>
50+
</None>
51+
<NoneInclude="..\FSharp.Build\Microsoft.FSharp.NetSdk.targets"CopyToOutputDirectory="PreserveNewest">
52+
<Link>Microsoft.FSharp.NetSdk.targets</Link>
53+
</None>
6654
</ItemGroup>
6755
<ItemGroup>
6856
<ReferenceInclude="mscorlib" />

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,10 @@
3131
<CompileInclude="FSharpEmbedResXSource.fs" />
3232
<CompileInclude="WriteCodeFragment.fs" />
3333
<CompileInclude="CreateFSharpManifestResourceName.fs" />
34-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.Targets">
35-
<TargetFilename>Microsoft.FSharp.Targets</TargetFilename>
36-
<Pattern1>{BuildSuffix}</Pattern1>
37-
<Replacement1></Replacement1>
38-
</CopyAndSubstituteText>
39-
<CopyAndSubstituteTextInclude="Microsoft.Portable.FSharp.Targets">
40-
<TargetFilename>Microsoft.Portable.FSharp.Targets</TargetFilename>
41-
<Pattern1>{BuildSuffix}</Pattern1>
42-
<Replacement1></Replacement1>
43-
</CopyAndSubstituteText>
44-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.NetSdk.props">
45-
<TargetFilename>Microsoft.FSharp.NetSdk.props</TargetFilename>
46-
<Pattern1>{BuildSuffix}</Pattern1>
47-
<Replacement1></Replacement1>
48-
</CopyAndSubstituteText>
49-
<CopyAndSubstituteTextInclude="Microsoft.FSharp.NetSdk.targets">
50-
<TargetFilename>Microsoft.FSharp.NetSdk.targets</TargetFilename>
51-
<Pattern1>{BuildSuffix}</Pattern1>
52-
<Replacement1></Replacement1>
53-
</CopyAndSubstituteText>
34+
<NoneInclude="Microsoft.FSharp.Targets"CopyToOutputDirectory="PreserveNewest" />
35+
<NoneInclude="Microsoft.Portable.FSharp.Targets"CopyToOutputDirectory="PreserveNewest" />
36+
<NoneInclude="Microsoft.FSharp.NetSdk.props"CopyToOutputDirectory="PreserveNewest" />
37+
<NoneInclude="Microsoft.FSharp.NetSdk.targets"CopyToOutputDirectory="PreserveNewest" />
5438
</ItemGroup>
5539

5640
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr'">

‎src/fsharp/FSharp.Build/Microsoft.FSharp.Targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ this file.
2121
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
2222
</PropertyGroup>
2323

24-
<UsingTaskTaskName="Fsc"AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
25-
<UsingTaskTaskName="FSharpEmbedResourceText"AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
26-
<UsingTaskTaskName="FSharpEmbedResXSource"AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
27-
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
28-
<UsingTaskTaskName="WriteCodeFragment"AssemblyFile="FSharp.Build{BuildSuffix}.dll" />
24+
<UsingTaskTaskName="Fsc"AssemblyFile="FSharp.Build.dll" />
25+
<UsingTaskTaskName="FSharpEmbedResourceText"AssemblyFile="FSharp.Build.dll" />
26+
<UsingTaskTaskName="FSharpEmbedResXSource"AssemblyFile="FSharp.Build.dll" />
27+
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="FSharp.Build.dll" />
28+
<UsingTaskTaskName="WriteCodeFragment"AssemblyFile="FSharp.Build.dll" />
2929

3030
<PropertyGroup>
3131
<ImportByWildcardBeforeMicrosoftFSharpTargetsCondition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>

‎src/fsharp/FSharp.Build/Microsoft.Portable.FSharp.Targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

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

2121
<ImportProject="$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.targets"Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\Portable\Microsoft.Portable.Core.props')"/>
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroupCondition="'$(Configuration)' != 'Proto'">
37-
<CustomAdditionalCompileInputsInclude="$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin\fsc-proto.exe">
37+
<CustomAdditionalCompileInputsInclude="$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin\fsc.exe">
3838
<Visible>false</Visible>
3939
</CustomAdditionalCompileInputs>
4040
</ItemGroup>

‎src/fsharp/Fsc-proto/Fsc-proto.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PlatformTarget>x86</PlatformTarget>
1111
<OutputType>Exe</OutputType>
1212
<NoWarn>$(NoWarn);62</NoWarn>
13-
<AssemblyName>fsc-proto</AssemblyName>
13+
<AssemblyName>fsc</AssemblyName>
1414
<DefineConstants>NO_EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
1515
<DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
1616
<NoWarn>$(NoWarn);35;44;62;9;60;86;47;1203</NoWarn>

‎src/utils/sformat.fsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// all 4 cases the layout types are really different types.
1616

1717
#if COMPILER
18-
// fsc-proto.exe:
18+
// fsc.exe:
1919
// FSharp.Compiler.Service.dll:
2020
namespaceInternal.Utilities.StructuredFormat
2121
#else
@@ -36,7 +36,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
3636
typeinternalTaggedText=
3737
abstractTag:LayoutTag
3838
abstractText:string
39-
#else// FSharp.Compiler.Service.dll, fsc-proto.exe
39+
#else// FSharp.Compiler.Service.dll, fsc.exe
4040

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp