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

Commit3e4ee55

Browse files
committed
rename DLL
1 parentd6d3309 commit3e4ee55

File tree

47 files changed

+81
-81
lines changed

Some content is hidden

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

47 files changed

+81
-81
lines changed

‎FSharp.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion =15.0.26403.7
55
MinimumVisualStudioVersion =10.0.40219.1
6-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Service.Private","src\fsharp\FSharp.Compiler\FSharp.Compiler.Service.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
6+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Server.Shared","src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj","{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
99
EndProject

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build-proto: restore
2121
build:
2222
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
2323
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler/FSharp.Compiler.Service.Internal.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
2525
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
2626
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
2727
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj

‎VisualFSharp.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion =15.0.26403.7
55
MinimumVisualStudioVersion =10.0.40219.1
6-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Service.Private","src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
6+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.VS.FSI","vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj","{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}"
99
ProjectSection(ProjectDependencies) =postProject

‎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.Private/FSharp.Compiler.Service.Private.fsproj" />
12+
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.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.Private/FSharp.Compiler.Service.Private.fsproj" />
23+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.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" />

‎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.Private
1+
NAME=FSharp.Compiler.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.Private; then \
142+
@if test x-$(NAME) = x-FSharp.Compiler.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.Private.dll_$(var.LocaleCode)" />
9+
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.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.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" />
24+
<ComponentId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25+
<FileId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.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.Private.dll" />
9+
<ComponentRefId="Compiler_Redist_FSharp.Compiler.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.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" />
68+
<ComponentId="Compiler_Redist_FSharp.Compiler.Private.dll"Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Private.dll, $(var.LocaleCode)))">
69+
<FileId="Compiler_Redist_FSharp.Compiler.Private.dll"Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Private.dll"KeyPath="yes">
70+
<NetFx:NativeImageId="Compiler_Redist_FSharp.Compiler.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.Private.resources.dll" vs.file.ngen=yes
11+
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.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/absil/ilread.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2355,7 +2355,7 @@ and seekReadMethod ctxt numtypars (idx:int) =
23552355
elif pinvokethen
23562356
seekReadImplMap ctxt nm idx
23572357
elif internalcall|| abstr|| unmanaged||(codetype<>0x00)then
2358-
if codeRVA<>0x0then dprintn"non-IL or abstract method with non-zero RVA"
2358+
//if codeRVA <> 0x0 then dprintn "non-IL or abstract method with non-zero RVA"
23592359
mkMethBodyLazyAux(notlazy MethodBody.Abstract)
23602360
else
23612361
seekReadMethodRVA ctxt(idx,nm,internalcall,noinline,numtypars) codeRVA

0 commit comments

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