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

Commitcb33a22

Browse files
authored
Merge pull request #3780 from Microsoft/merge-vs2017-rtm-to-master
Merge vs2017 rtm to master
2 parents129a9b0 +bf4d5f7 commitcb33a22

File tree

14 files changed

+40
-5
lines changed

14 files changed

+40
-5
lines changed

‎setup/Swix/Microsoft.FSharp.vsmanproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json" />
2222
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json" />
2323

24+
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.VSIX.Templates.json" />
2425
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
2526
</ItemGroup>
2627
</Target>

‎setup/fsharp-setup-build.proj‎

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

5151
<ItemGroup>
5252
<InsertionItemsInclude="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
53+
<InsertionItemsInclude="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
5354
<InsertionItemsInclude="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
55+
<InsertionItemsInclude="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
5456
</ItemGroup>
5557
</Target>
5658

‎src/buildfromsource/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ImportProject="..\BuildFromSource.targets" />
1515
<ItemGroup>
1616
<FsSrGenInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSBuild.txt" />
17+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\InternalsVisibleTo.fs" />
1718
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs" />
1819
<CompileInclude="..\..\utils\CompilerLocationUtils.fs" />
1920
<CompileInclude="..\..\utils\reshapedreflection.fs" />

‎src/buildfromsource/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<ImportProject="..\BuildFromSource.targets" />
1717
<ItemGroup>
1818
<FsSrGenInclude="$(FSharpSourcesRoot)\fsharp\FSInteractiveSettings.txt" />
19+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\InternalsVisibleTo.fs" />
1920
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs" />
2021
<CompileInclude="InternalsVisibleTo.fs" />
2122
<CompileInclude="..\..\utils\reshapedreflection.fs" />

‎src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@
613613
<Link>Misc/LegacyHostedCompilerForTesting.fs</Link>
614614
</Compile>
615615
</ItemGroup>
616+
<Import Project ="..\BuildFromSource.targets" />
616617

617618
<!--
618619
"System.Collections.Immutable":"1.3.1",

‎src/buildfromsource/Fsc/Fsc.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<ImportProject="..\BuildFromSource.targets" />
1717
<ItemGroup>
18+
<CompileInclude="$(FSharpSourcesRoot)\fsharp\Fsc\InternalsVisibleTo.fs" />
1819
<CompileInclude="..\..\assemblyinfo\assemblyinfo.fsc.exe.fs">
1920
<Link>Resources/assemblyinfo.fsc.exe.fs</Link>
2021
</Compile>

‎src/buildfromsource/Fsi/Fsi.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>fsi</AssemblyName>
1010
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1111
<AllowCrossTargeting>true</AllowCrossTargeting>
12-
<DefineConstants>$(DefineConstants);COMPILER;EXTENSIONTYPING</DefineConstants>
12+
<DefineConstants>$(DefineConstants);BUILD_FROM_SOURCE;COMPILER;EXTENSIONTYPING</DefineConstants>
1313
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1414
</PropertyGroup>
1515

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.FSharp
4+
5+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
6+
do()
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.FSharp
4+
openSystem.Reflection
5+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
6+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
7+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
8+
9+
do()
10+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.FSharp
4+
openSystem.Reflection
5+
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
6+
7+
do()
8+

0 commit comments

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