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

Commitbb20848

Browse files
Merge remote-tracking branch 'origin/master' into typed-open-declarations-2
2 parentsba6e2b8 +0bb0a00 commitbb20848

File tree

5 files changed

+48
-2
lines changed

5 files changed

+48
-2
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ For historical reasons this repository is called "visualfsharp" and currently al
1919
|| Ubuntu (Build)| Windows (Debug Build)| Windows (Release Tests 1)| Windows (Release Tests 2)| Windows (Release Tests 3)|
2020
|:----------:|:----------------:|:----------------:|:------------------:|:-----------------------:|:---------------------:|
2121
|**master** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part3_windows_nt/)|
22-
|**vs2017-rtm** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part3_windows_nt/)|
22+
|**dev15.5** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.5/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.5/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.5/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.5/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.5/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.5/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.5/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.5/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.5/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.5/job/release_ci_part3_windows_nt/)|
23+
|**dev15.6** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part3_windows_nt/)|
2324

2425

2526
##Help improve the Quality of the Tools by Using the Nightly Releases of Visual F# Tools

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,48 @@ this file.
328328
============================================================
329329
-->
330330

331+
<!--
332+
============================================================
333+
Override _GenerateCompileDependencyCache
334+
335+
Workaround for Issue #3824 and #3739
336+
337+
MsBuild does some optimisations around CompileInputs
338+
The project system erroneously uses this to determine whether
339+
to notify language services of CommandLine Information changes.
340+
C# accidently changes it's file lists every build ... and so
341+
gets the notifications.
342+
F# doesn't ... so we don't get CL notifications following rebuilds
343+
or build.
344+
This workaround is basically to adds the current time (in ticks)
345+
into the hash of CoreCompileInputs.cache at design time so that
346+
we always appear to have different options and overcome the
347+
brokencache behaviour.
348+
349+
Both msbuild and the project-system will fix their code at which time
350+
this can go away.
351+
352+
============================================================
353+
-->
354+
<TargetName="_GenerateCompileDependencyCache"DependsOnTargets="ResolveAssemblyReferences"Condition="'$(DesignTimeBuild)' == 'true'">
355+
<ItemGroup>
356+
<CustomAdditionalCompileInputsInclude="$(IntermediateOutputPath)$(MSBuildProjectFile).CoreCompileInputs.cache" />
357+
<CoreCompileCacheRemove="@(Compile)" />
358+
<CoreCompileCacheInclude="@(ReferencePath)" />
359+
<CoreCompileCacheInclude="$([System.DateTime]::Now.Ticks)" />
360+
</ItemGroup>
361+
362+
<HashItemsToHash="@(CoreCompileCache)">
363+
<OutputTaskParameter="HashResult"PropertyName="CoreCompileDependencyHash" />
364+
</Hash>
365+
366+
<WriteLinesToFileLines="$(CoreCompileDependencyHash)"File="$(IntermediateOutputPath)$(MSBuildProjectFile).CoreCompileInputs.cache"Overwrite="True"WriteOnlyWhenDifferent="True" />
367+
368+
<ItemGroup>
369+
<FileWritesInclude="$(IntermediateOutputPath)$(MSBuildProjectFile).CoreCompileInputs.cache" />
370+
</ItemGroup>
371+
</Target>
372+
331373
<TargetName="GenerateTargetFrameworkMonikerAttribute"BeforeTargets="BeforeCompile"DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths"Inputs="$(MSBuildThisFileFullPath)"Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)"Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
332374

333375
<PropertyGroup>

‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<BootstrapperEnabled>true</BootstrapperEnabled>
3636
<IsProductComponent>true</IsProductComponent>
3737
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
38-
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
38+
<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
3939
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
4040
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
4141
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
Binary file not shown.

‎vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,9 @@
278278
<dataname="4017"type="System.Resources.ResXFileRef, System.Windows.Forms">
279279
<value>Resources\FSharpResources.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
280280
</data>
281+
<dataname="4018"type="System.Resources.ResXFileRef, System.Windows.Forms">
282+
<value>Resources\FSharpTestLibrary.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
283+
</data>
281284
<dataname="4100"type="System.Resources.ResXFileRef, System.Windows.Forms">
282285
<value>Resources\ProjectNode.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
283286
</data>

0 commit comments

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