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

Commit1cf901a

Browse files
committed
converge compiler DLLs
1 parenta53ad19 commit1cf901a

File tree

42 files changed

+73
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+73
-77
lines changed

‎build-everything.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroupCondition="'$(BUILD_NET40)'=='1'">
1111
<ProjectsWithNet40Include="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
12-
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj" />
12+
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Service.Private/FSharp.Compiler.Service.Private.fsproj" />
1313
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj"/>
1414
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
1515
<ProjectsWithNet40Include="src/fsharp/Fsc/Fsc.fsproj" />
@@ -20,7 +20,7 @@
2020
<ItemGroupCondition="'$(BUILD_CORECLR)'=='1'">
2121
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core/FSharp.Core.fsproj" />
2222
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
23-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj" />
23+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Service.Private/FSharp.Compiler.Service.Private.fsproj" />
2424
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
2525
<ProjectsWithCoreClrInclude="src/fsharp/Fsc/Fsc.fsproj" />
2626
<ProjectsWithCoreClrInclude="src/fsharp/fsi/Fsi.fsproj" />

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,6 @@
584584
<Link>Service/fsi.fs</Link>
585585
</Compile>
586586

587-
<!-- includes an old API for testing the compiler and gathering diagnostics in-memory-->
588-
<CompileInclude="..\LegacyHostedCompilerForTesting.fs">
589-
<Link>LegacyHostedCompilerForTesting.fs</Link>
590-
</Compile>
591587
</ItemGroup>
592588
<ItemGroup>
593589
<ReferenceInclude="mscorlib" />

‎mono/FSharp.Compiler.Service.Internal/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
NAME=FSharp.Compiler.Service.Internal
1+
NAME=FSharp.Compiler.Service.Private
22
ASSEMBLY =$(NAME).dll
33
TOKEN=$(SIGN_TOKEN)
44

‎mono/config.make.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ install-sdk-lib:
139139
echo "Signing $(outdir)$(ASSEMBLY) with Mono key"; \
140140
$(monobindir)/sn -q -R $(outdir)$(ASSEMBLY) $(topdir)mono/mono.snk; \
141141
fi
142-
@if test x-$(NAME) = x-FSharp.Compiler.Service.Internal; then \
142+
@if test x-$(NAME) = x-FSharp.Compiler.Service.Private; then \
143143
echo "Installing extra dependency System.Collections.Immutable.dll to $(DESTDIR)$(monodir)/fsharp/"; \
144144
$(INSTALL_LIB) $(outdir)System.Collections.Immutable.dll $(DESTDIR)$(monodir)/fsharp/; \
145145
echo "Installing extra dependency System.Reflection.Metadata.dll to $(DESTDIR)$(monodir)/fsharp/"; \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ComponentGroupId="Compiler_LangPack">
77
<ComponentRefId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
88
<ComponentRefId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
9-
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode)" />
9+
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.Service.Private.dll_$(var.LocaleCode)" />
1010
<ComponentRefId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
1111
<ComponentRefId="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
1212
<ComponentRefId="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
@@ -21,8 +21,8 @@
2121
<FileId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll"KeyPath="yes" />
2222
</Component>
2323

24-
<ComponentId="Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25-
<FileId="Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.Service.Internal.resources.dll"KeyPath="yes" />
24+
<ComponentId="Compiler_LangPack_FSharp.Compiler.Service.Private.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Service.Private.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25+
<FileId="Compiler_LangPack_FSharp.Compiler.Service.Private.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.Service.Private.resources.dll"KeyPath="yes" />
2626
</Component>
2727

2828
<ComponentId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ComponentGroupId="Compiler_Redist">
77
<ComponentRefId="Compiler_Redist_FSharp.Core.dll" />
88
<ComponentRefId="Compiler_Redist_FSharp.Build.dll" />
9-
<ComponentRefId="Compiler_Redist_FSharp.Compiler.Service.Internal.dll" />
9+
<ComponentRefId="Compiler_Redist_FSharp.Compiler.Service.Private.dll" />
1010
<ComponentRefId="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" />
1111
<ComponentRefId="Compiler_Redist_FSharp.Data.TypeProviders.dll" />
1212
<ComponentRefId="Compiler_Redist_fsc.exe" />
@@ -65,9 +65,9 @@
6565
</File>
6666
</Component>
6767

68-
<ComponentId="Compiler_Redist_FSharp.Compiler.Service.Internal.dll"Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Service.Internal.dll, $(var.LocaleCode)))">
69-
<FileId="Compiler_Redist_FSharp.Compiler.Service.Internal.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Service.Internal,dll"KeyPath="yes">
70-
<NetFx:NativeImageId="Compiler_Redist_FSharp.Compiler.Service.Internal.Native.dll"Priority="0"Dependencies="no"Platform="all"AssemblyApplication="Compiler_Redist_fsc.exe" />
68+
<ComponentId="Compiler_Redist_FSharp.Compiler.Service.Private.dll"Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Service.Private.dll, $(var.LocaleCode)))">
69+
<FileId="Compiler_Redist_FSharp.Compiler.Service.Private.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Service.Private,dll"KeyPath="yes">
70+
<NetFx:NativeImageId="Compiler_Redist_FSharp.Compiler.Service.Private.Native.dll"Priority="0"Dependencies="no"Platform="all"AssemblyApplication="Compiler_Redist_fsc.exe" />
7171
</File>
7272
</Component>
7373

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleParentCulture)"
88
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
99

1010
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentCulture)"
11-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.Service.Internal.resources.dll" vs.file.ngen=yes
11+
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.Service.Private.resources.dll" vs.file.ngen=yes
1212
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
1313
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.LanguageService.Base.resources.dll" vs.file.ngen=yes
1414
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.LanguageService.resources.dll" vs.file.ngen=yes

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs‎renamed to ‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Private.dll.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ namespace Microsoft.FSharp
44
openSystem.Reflection
55
openSystem.Runtime.InteropServices
66

7-
[<assembly:AssemblyDescription("FSharp.Compiler.Service.Internal.dll")>]
7+
[<assembly:AssemblyDescription("FSharp.Compiler.Service.Private.dll")>]
88
[<assembly:AssemblyCompany("Microsoft Corporation")>]
9-
[<assembly:AssemblyTitle("FSharp.Compiler.Service.Internal.dll")>]
9+
[<assembly:AssemblyTitle("FSharp.Compiler.Service.Private.dll")>]
1010
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
1111
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
1212
[<assembly:ComVisible(false)>]

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ namespace Microsoft.FSharp
44
openSystem.Reflection
55
openSystem.Runtime.InteropServices
66

7-
[<assembly:AssemblyDescription("FSharp.Compiler.Service.Internal.dll")>]
7+
[<assembly:AssemblyDescription("FSharp.Compiler.Service.Private.dll")>]
88
[<assembly:AssemblyCompany("Microsoft Corporation")>]
9-
[<assembly:AssemblyTitle("FSharp.Compiler.Service.Internal.dll")>]
9+
[<assembly:AssemblyTitle("FSharp.Compiler.Service.Private.dll")>]
1010
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
1111
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
1212
[<assembly:ComVisible(false)>]

‎src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</metadata>
4242
<files>
4343
<filesrc="fsc.exe"target="lib/netstandard1.6" />
44-
<filesrc="FSharp.Compiler.Service.Internal.dll"target="lib/netstandard1.6" />
44+
<filesrc="FSharp.Compiler.Service.Private.dll"target="lib/netstandard1.6" />
4545
<filesrc="default.win32manifest"target="runtimes/any/native/" />
4646
<filesrc="FSharp.Build.dll"target="lib/netstandard1.6" />
4747
<filesrc="Microsoft.FSharp.targets"target="runtimes/any/native/" />

0 commit comments

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