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

Commit03ecab2

Browse files
Vasily KirichenkoVasily Kirichenko
Vasily Kirichenko
authored and
Vasily Kirichenko
committed
Merge remote-tracking branch 'origin/master' into typed-open-declarations-2
2 parents5e1255b +28f0262 commit03ecab2

File tree

23 files changed

+315
-27
lines changed

23 files changed

+315
-27
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,6 @@ source_link.json
118118
/VSRelease/net40/bin
119119
System.ValueTuple.dll
120120
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
121+
*/.fake
122+
/fcs/packages/
123+
*/paket-files/

‎fcs/.paket/Paket.Restore.targets‎

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Prevent dotnet template engine to parse this file-->
3+
<!--/-:cnd:noEmit-->
4+
<PropertyGroup>
5+
<!-- make MSBuild track this file for incremental builds.-->
6+
<!-- ref https://blogs.msdn.microsoft.com/msbuild/2005/09/26/how-to-ensure-changes-to-a-custom-target-file-prompt-a-rebuild/-->
7+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
8+
<!-- Mark that this target file has been loaded.-->
9+
<IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>
10+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
11+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
12+
<PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
13+
<PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
14+
<MonoPathCondition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
15+
<MonoPathCondition="'$(MonoPath)' == ''">mono</MonoPath>
16+
<!-- Paket command-->
17+
<PaketExePathCondition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
18+
<PaketExePathCondition=" '$(PaketExePath)' == ''">$(PaketToolsPath)paket.exe</PaketExePath>
19+
<PaketCommandCondition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
20+
<PaketCommandCondition=" '$(OS)' != 'Windows_NT'">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
21+
<PaketBootStrapperExePathCondition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
22+
<PaketBootStrapperExePathCondition=" '$(PaketBootStrapperExePath)' == ''">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
23+
<PaketBootStrapperCommandCondition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
24+
<PaketBootStrapperCommandCondition=" '$(OS)' != 'Windows_NT'">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
25+
26+
<!-- Disable automagic references for F# dotnet sdk-->
27+
<!-- This will not do anything for other project types-->
28+
<!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md-->
29+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
30+
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
31+
</PropertyGroup>
32+
33+
<TargetName="PaketRestore"BeforeTargets="_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
34+
35+
<!-- Step 1 Check if lockfile is properly restored-->
36+
<PropertyGroup>
37+
<PaketRestoreRequired>true</PaketRestoreRequired>
38+
<NoWarn>$(NoWarn);NU1603</NoWarn>
39+
</PropertyGroup>
40+
41+
<PropertyGroupCondition="Exists('$(PaketRestoreCacheFile)')">
42+
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
43+
<PaketRestoreLockFileHash>$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
44+
<PaketRestoreRequired>true</PaketRestoreRequired>
45+
<PaketRestoreRequiredCondition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)'">false</PaketRestoreRequired>
46+
<PaketRestoreRequiredCondition=" '$(PaketRestoreLockFileHash)' == ''">true</PaketRestoreRequired>
47+
</PropertyGroup>
48+
49+
<!-- Do a global restore if required-->
50+
<ExecCommand='$(PaketBootStrapperCommand)'Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))"ContinueOnError="false" />
51+
<ExecCommand='$(PaketCommand) restore'Condition=" '$(PaketRestoreRequired)' == 'true'"ContinueOnError="false" />
52+
53+
<!-- Step 2 Detect project specific changes-->
54+
<PropertyGroup>
55+
<PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath>
56+
<!-- MyProject.fsproj.paket.references has the highest precedence-->
57+
<PaketOriginalReferencesFilePath>$(MSBuildProjectFullPath).paket.references</PaketOriginalReferencesFilePath>
58+
<!-- MyProject.paket.references-->
59+
<PaketOriginalReferencesFilePathCondition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
60+
<!-- paket.references-->
61+
<PaketOriginalReferencesFilePathCondition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
62+
<PaketResolvedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved</PaketResolvedFilePath>
63+
<PaketRestoreRequired>true</PaketRestoreRequired>
64+
<PaketRestoreRequiredReason>references-file-or-cache-not-found</PaketRestoreRequiredReason>
65+
</PropertyGroup>
66+
67+
<!-- Step 2 a Detect changes in references file-->
68+
<PropertyGroupCondition="Exists('$(PaketOriginalReferencesFilePath)') AND Exists('$(PaketReferencesCachedFilePath)')">
69+
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)'))</PaketRestoreCachedHash>
70+
<PaketRestoreReferencesFileHash>$([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)'))</PaketRestoreReferencesFileHash>
71+
<PaketRestoreRequiredReason>references-file</PaketRestoreRequiredReason>
72+
<PaketRestoreRequiredCondition=" '$(PaketRestoreReferencesFileHash)' == '$(PaketRestoreCachedHash)'">false</PaketRestoreRequired>
73+
</PropertyGroup>
74+
75+
<PropertyGroupCondition="!Exists('$(PaketOriginalReferencesFilePath)') AND !Exists('$(PaketReferencesCachedFilePath)')">
76+
<!-- If both don't exist there is nothing to do.-->
77+
<PaketRestoreRequired>false</PaketRestoreRequired>
78+
</PropertyGroup>
79+
80+
<!-- Step 2 b detect relevant changes in project file (new targetframework)-->
81+
<PropertyGroupCondition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != ''">
82+
<PaketRestoreRequired>true</PaketRestoreRequired>
83+
<PaketRestoreRequiredReason>target-framework '$(TargetFramework)'</PaketRestoreRequiredReason>
84+
</PropertyGroup>
85+
86+
<!-- Step 3 Restore project specific stuff if required-->
87+
<MessageCondition=" '$(PaketRestoreRequired)' == 'true'"Importance="low"Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
88+
<ExecCommand='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"'Condition=" '$(PaketRestoreRequired)' == 'true'"ContinueOnError="false" />
89+
90+
<!-- This shouldn't actually happen, but just to be sure.-->
91+
<ErrorCondition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != ''"Text="A paket file for the framework '$(TargetFramework)' is missing. Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
92+
93+
<!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild-->
94+
<ReadLinesFromFileCondition="Exists('$(PaketResolvedFilePath)')"File="$(PaketResolvedFilePath)" >
95+
<OutputTaskParameter="Lines"ItemName="PaketReferencesFileLines"/>
96+
</ReadLinesFromFile>
97+
98+
<ItemGroupCondition=" Exists('$(PaketResolvedFilePath)') AND '@(PaketReferencesFileLines)' != ''" >
99+
<PaketReferencesFileLinesInfoInclude="@(PaketReferencesFileLines)" >
100+
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
101+
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
102+
</PaketReferencesFileLinesInfo>
103+
<PackageReferenceInclude="%(PaketReferencesFileLinesInfo.PackageName)">
104+
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
105+
</PackageReference>
106+
</ItemGroup>
107+
108+
<PropertyGroup>
109+
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
110+
</PropertyGroup>
111+
112+
</Target>
113+
114+
<TargetName="PaketDisableDirectPack"AfterTargets="_IntermediatePack"BeforeTargets="GenerateNuspec"Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
115+
<PropertyGroup>
116+
<ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec>
117+
</PropertyGroup>
118+
</Target>
119+
120+
<TargetName="PaketOverrideNuspec"AfterTargets="GenerateNuspec"Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
121+
<PropertyGroup>
122+
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
123+
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
124+
<UseNewPack>false</UseNewPack>
125+
<UseNewPackCondition=" '$(NuGetToolVersion)' != '4.0.0'">true</UseNewPack>
126+
</PropertyGroup>
127+
128+
<ItemGroup>
129+
<_NuspecFilesInclude="$(BaseIntermediateOutputPath)*.nuspec"/>
130+
</ItemGroup>
131+
132+
<ExecCommand='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)"'Condition="@(_NuspecFiles) != ''" />
133+
134+
<ConvertToAbsolutePathCondition="@(_NuspecFiles) != ''"Paths="@(_NuspecFiles)">
135+
<OutputTaskParameter="AbsolutePaths"PropertyName="NuspecFileAbsolutePath" />
136+
</ConvertToAbsolutePath>
137+
138+
<!-- Call Pack-->
139+
<PackTaskCondition="$(UseNewPack)"
140+
PackItem="$(PackProjectInputFile)"
141+
PackageFiles="@(_PackageFiles)"
142+
PackageFilesToExclude="@(_PackageFilesToExclude)"
143+
PackageVersion="$(PackageVersion)"
144+
PackageId="$(PackageId)"
145+
Title="$(Title)"
146+
Authors="$(Authors)"
147+
Description="$(Description)"
148+
Copyright="$(Copyright)"
149+
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
150+
LicenseUrl="$(PackageLicenseUrl)"
151+
ProjectUrl="$(PackageProjectUrl)"
152+
IconUrl="$(PackageIconUrl)"
153+
ReleaseNotes="$(PackageReleaseNotes)"
154+
Tags="$(PackageTags)"
155+
DevelopmentDependency="$(DevelopmentDependency)"
156+
BuildOutputInPackage="@(_BuildOutputInPackage)"
157+
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
158+
TargetFrameworks="@(_TargetFrameworks)"
159+
AssemblyName="$(AssemblyName)"
160+
PackageOutputPath="$(PackageOutputAbsolutePath)"
161+
IncludeSymbols="$(IncludeSymbols)"
162+
IncludeSource="$(IncludeSource)"
163+
PackageTypes="$(PackageType)"
164+
IsTool="$(IsTool)"
165+
RepositoryUrl="$(RepositoryUrl)"
166+
RepositoryType="$(RepositoryType)"
167+
SourceFiles="@(_SourceFiles->Distinct())"
168+
NoPackageAnalysis="$(NoPackageAnalysis)"
169+
MinClientVersion="$(MinClientVersion)"
170+
Serviceable="$(Serviceable)"
171+
FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
172+
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
173+
NuspecOutputPath="$(BaseIntermediateOutputPath)"
174+
IncludeBuildOutput="$(IncludeBuildOutput)"
175+
BuildOutputFolder="$(BuildOutputTargetFolder)"
176+
ContentTargetFolders="$(ContentTargetFolders)"
177+
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
178+
NuspecFile="$(NuspecFileAbsolutePath)"
179+
NuspecBasePath="$(NuspecBasePath)"
180+
NuspecProperties="$(NuspecProperties)"/>
181+
182+
<PackTaskCondition="! $(UseNewPack)"
183+
PackItem="$(PackProjectInputFile)"
184+
PackageFiles="@(_PackageFiles)"
185+
PackageFilesToExclude="@(_PackageFilesToExclude)"
186+
PackageVersion="$(PackageVersion)"
187+
PackageId="$(PackageId)"
188+
Title="$(Title)"
189+
Authors="$(Authors)"
190+
Description="$(Description)"
191+
Copyright="$(Copyright)"
192+
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
193+
LicenseUrl="$(PackageLicenseUrl)"
194+
ProjectUrl="$(PackageProjectUrl)"
195+
IconUrl="$(PackageIconUrl)"
196+
ReleaseNotes="$(PackageReleaseNotes)"
197+
Tags="$(PackageTags)"
198+
TargetPathsToAssemblies="@(_TargetPathsToAssemblies->'%(FinalOutputPath)')"
199+
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
200+
TargetFrameworks="@(_TargetFrameworks)"
201+
AssemblyName="$(AssemblyName)"
202+
PackageOutputPath="$(PackageOutputAbsolutePath)"
203+
IncludeSymbols="$(IncludeSymbols)"
204+
IncludeSource="$(IncludeSource)"
205+
PackageTypes="$(PackageType)"
206+
IsTool="$(IsTool)"
207+
RepositoryUrl="$(RepositoryUrl)"
208+
RepositoryType="$(RepositoryType)"
209+
SourceFiles="@(_SourceFiles->Distinct())"
210+
NoPackageAnalysis="$(NoPackageAnalysis)"
211+
MinClientVersion="$(MinClientVersion)"
212+
Serviceable="$(Serviceable)"
213+
AssemblyReferences="@(_References)"
214+
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
215+
NuspecOutputPath="$(BaseIntermediateOutputPath)"
216+
IncludeBuildOutput="$(IncludeBuildOutput)"
217+
BuildOutputFolder="$(BuildOutputTargetFolder)"
218+
ContentTargetFolders="$(ContentTargetFolders)"
219+
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
220+
NuspecFile="$(NuspecFileAbsolutePath)"
221+
NuspecBasePath="$(NuspecBasePath)"
222+
NuspecProperties="$(NuspecProperties)"/>
223+
</Target>
224+
<!--/+:cnd:noEmit-->
225+
</Project>

‎fcs/.paket/paket.bootstrapper.exe‎

-27.5 KB
Binary file not shown.

‎fcs/.paket/paket.exe‎

62.3 KB
Binary file not shown.

‎fcs/build.cmd‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
@echooff
2+
3+
dotnet --version
24
.nuget\NuGet.exe restore -PackagesDirectory packages
35
setlocal
46
cd fcs
5-
.paket\paket.bootstrapper.exe
7+
68
dotnet restore tools.fsproj
79
iferrorlevel1 (
810
endlocal

‎fcs/build.sh‎

100644100755
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ then
44
# use .Net
55
cmd fcs/build.cmd$@
66
else
7+
dotnet --version
8+
79
mono .nuget/NuGet.exe restore -PackagesDirectory packages
810

911
cd fcs
@@ -15,12 +17,6 @@ else
1517

1618
dotnet restore tools.fsproj
1719

18-
mono .paket/paket.bootstrapper.exe
19-
exit_code=$?
20-
if [$exit_code-ne 0 ];then
21-
exit$exit_code
22-
fi
23-
2420
mono .paket/paket.exe restore
2521
exit_code=$?
2622
if [$exit_code-ne 0 ];then

‎netci.groovy‎

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ def static getBuildJobName(def configuration, def os) {
1212

1313
[true,false].each {isPullRequest->
1414
osList.each {os->
15-
def configurations= ['Debug','Release_ci_part1','Release_ci_part2','Release_ci_part3','Release_net40_no_vs' ];
16-
if (os!='Windows_NT') {
17-
// Only build one configuration on Linux/... so far
18-
configurations= ['Release'];
15+
def configurations= [];
16+
if (os=='Windows_NT') {
17+
configurations= ['Debug','Release_ci_part1','Release_ci_part2','Release_ci_part3','Release_net40_no_vs','Release_fcs' ];
18+
}
19+
else
20+
{
21+
// Linux
22+
configurations= ['Release','Release_fcs' ];
1923
}
2024
configurations.each {configuration->
2125

@@ -24,10 +28,28 @@ def static getBuildJobName(def configuration, def os) {
2428
// Calculate job name
2529
def jobName= getBuildJobName(configuration, os)
2630

31+
def buildPath='';
32+
if (os=='Windows_NT') {
33+
buildPath=".\\"
34+
}
35+
else {
36+
buildPath="./"
37+
}
2738
def buildCommand='';
28-
2939
def buildFlavor='';
30-
if (configuration=="Debug") {
40+
41+
if (configuration=="Release_fcs") {
42+
// Build and test FCS NuGet package
43+
buildPath="./fcs/"
44+
buildFlavor=""
45+
if (os=='Windows_NT') {
46+
build_args="TestAndNuget"
47+
}
48+
else {
49+
build_args="Build"
50+
}
51+
}
52+
elseif (configuration=="Debug") {
3153
buildFlavor="debug"
3254
build_args=""
3355
}
@@ -51,10 +73,10 @@ def static getBuildJobName(def configuration, def os) {
5173
}
5274

5375
if (os=='Windows_NT') {
54-
buildCommand=".\\build.cmd${buildFlavor}${build_args}"
76+
buildCommand="${buildPath}build.cmd${buildFlavor}${build_args}"
5577
}
5678
else {
57-
buildCommand="./build.sh${buildFlavor}${build_args}"
79+
buildCommand="${buildPath}build.sh${buildFlavor}${build_args}"
5880
}
5981

6082
def newJobName=Utilities.getFullJobName(project, jobName, isPullRequest)
@@ -64,7 +86,7 @@ def static getBuildJobName(def configuration, def os) {
6486
batchFile("""
6587
echo *** Build Visual F# Tools ***
6688
67-
.\\build.cmd${buildFlavor}${build_args}""")
89+
${buildPath}build.cmd${buildFlavor}${build_args}""")
6890
}
6991
else {
7092
// Shell
@@ -79,9 +101,15 @@ echo *** Build Visual F# Tools ***
79101
def affinity= configuration=='Release_net40_no_vs'?'latest-or-auto': (os=='Windows_NT'?'latest-or-auto-dev15-0':'latest-or-auto')
80102
Utilities.setMachineAffinity(newJob, os, affinity)
81103
Utilities.standardJobSetup(newJob, project, isPullRequest,"*/${branch}")
82-
Utilities.addArchival(newJob,"tests/TestResults/*.*","", skipIfNoTestFiles,false)
83-
Utilities.addArchival(newJob,"${buildFlavor}/**")
84104

105+
106+
Utilities.addArchival(newJob,"tests/TestResults/*.*","", skipIfNoTestFiles,false)
107+
if (configuration=="Release_fcs") {
108+
Utilities.addArchival(newJob,"Release/fcs/**")
109+
}
110+
else {
111+
Utilities.addArchival(newJob,"${buildFlavor}/**")
112+
}
85113
if (isPullRequest) {
86114
Utilities.addGithubPRTriggerForBranch(newJob, branch,"${os}${configuration} Build")
87115
}

‎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" />

0 commit comments

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