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

Commit47772f9

Browse files
authored
Merge pull request #3842 from Microsoft/merges/dev15.5-to-dev15.6-20171030-070000
Merge dev15.5 to dev15.6
2 parents29e27d2 +726f56f commit47772f9

File tree

8 files changed

+111
-65
lines changed

8 files changed

+111
-65
lines changed

‎setup/publish-assets.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ try {
3030
"microbuild" {
3131
$requestUrl="https://dotnet.myget.org/F/fsharp/vsix/upload"
3232
}
33-
"microbuild-dev15-rtm" {
33+
"microbuild-dev15.5" {
3434
$requestUrl="https://dotnet.myget.org/F/fsharp-preview/vsix/upload"
3535
}
3636
default {

‎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/VisualFSharpFull/Source.extension.vsixmanifest‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@
4747
<AssetType="Microsoft.VisualStudio.MefComponent"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|"AssemblyName="|FSharp.Editor;AssemblyName|" />
4848
<AssetType="Microsoft.VisualStudio.Analyzer"d:Source="Project"d:ProjectName="FSharp.Editor"Path="|FSharp.Editor|" />
4949
<AssetType="Microsoft.VisualStudio.MefComponent"d:Source="Project"d:ProjectName="ProjectSystem.Base"Path="|ProjectSystem.Base|" />
50+
51+
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|AppConfig;TemplateProjectOutputGroup|"d:ProjectName="AppConfig"d:VsixSubPath="ItemTemplates" />
52+
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|CodeFile;TemplateProjectOutputGroup|"d:ProjectName="CodeFile"d:VsixSubPath="ItemTemplates" />
53+
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|ScriptFile;TemplateProjectOutputGroup|"d:ProjectName="ScriptFile"d:VsixSubPath="ItemTemplates" />
54+
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|SignatureFile;TemplateProjectOutputGroup|"d:ProjectName="SignatureFile"d:VsixSubPath="ItemTemplates" />
55+
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|TextFile;TemplateProjectOutputGroup|"d:ProjectName="TextFile"d:VsixSubPath="ItemTemplates" />
56+
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|XMLFile;TemplateProjectOutputGroup|"d:ProjectName="XMLFile"d:VsixSubPath="ItemTemplates" />
57+
5058
</Assets>
5159
<Prerequisites>
5260
<PrerequisiteId="Microsoft.VisualStudio.Component.CoreEditor"Version="[15.0,16.0)"DisplayName="Visual Studio core editor" />

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,62 @@
207207
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
208208
<Private>True</Private>
209209
</ProjectReference>
210+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\AppConfig\AppConfig.csproj">
211+
<Project>{6ba13aa4-c25f-480f-856b-8e8000299a72}</Project>
212+
<Name>AppConfig</Name>
213+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
214+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
215+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
216+
<Private>True</Private>
217+
</ProjectReference>
218+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\CodeFile\CodeFile.csproj">
219+
<Project>{12ac2813-e895-4aaa-ae6c-94e21da09f64}</Project>
220+
<Name>CodeFile</Name>
221+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
222+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
223+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
224+
<Private>True</Private>
225+
</ProjectReference>
226+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\ResourceFile\ResourceFile.csproj">
227+
<Project>{0385564F-07B4-4264-AB8A-17C393E9140C}</Project>
228+
<Name>ResourceFile</Name>
229+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
230+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
231+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
232+
<Private>True</Private>
233+
</ProjectReference>
234+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\ScriptFile\ScriptFile.csproj">
235+
<Project>{a333b85a-dc23-49b6-9797-b89a7951e92d}</Project>
236+
<Name>ScriptFile</Name>
237+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
238+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
239+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
240+
<Private>True</Private>
241+
</ProjectReference>
242+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\SignatureFile\SignatureFile.csproj">
243+
<Project>{e3fdd4ac-46b6-4b9f-b672-317d1202cc50}</Project>
244+
<Name>SignatureFile</Name>
245+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
246+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
247+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
248+
<Private>True</Private>
249+
</ProjectReference>
250+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\TextFile\TextFile.csproj">
251+
<Project>{d11fc318-8f5d-4c8c-9287-ab40a016d13c}</Project>
252+
<Name>TextFile</Name>
253+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
254+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
255+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
256+
<Private>True</Private>
257+
</ProjectReference>
258+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\XMLFile\XMLFile.csproj">
259+
<Project>{1fb1dd07-06aa-45b4-b5ac-20ff5bee98b6}</Project>
260+
<Name>XMLFile</Name>
261+
<VSIXSubPath>ItemTemplates</VSIXSubPath>
262+
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
263+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
264+
<Private>True</Private>
265+
</ProjectReference>
210266
</ItemGroup>
211267
<ItemGroup>
212268
<ReferenceInclude="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎vsintegration/Vsix/VisualFSharpTemplates/Source.extension.vsixmanifest‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Metadata>
66
<IdentityId="VisualFSharpTemplates"Version="|%CurrentProject%;GetVsixPackageVersion|"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />
77
<DisplayName>Visual F# Templates</DisplayName>
8-
<Descriptionxml:space="preserve">Deploy Visual F# Tools Templates to Visual Studio</Description>
8+
<Descriptionxml:space="preserve">Deploy Visual F# ToolsDesktop ProjectTemplates to Visual Studio</Description>
99
<PackageId>Microsoft.FSharp.VSIX.Templates</PackageId>
1010
<MoreInfo>https://docs.microsoft.com/en-us/dotnet/articles/fsharp/</MoreInfo>
1111
</Metadata>
@@ -23,13 +23,6 @@
2323
<AssetType="Microsoft.VisualStudio.ProjectTemplate"d:Source="Project"Path="ProjectTemplates"d:TargetPath="|TutorialProject;TemplateProjectOutputGroup|"d:ProjectName="TutorialProject"d:VsixSubPath="ProjectTemplates" />
2424
<AssetType="Microsoft.VisualStudio.ProjectTemplate"d:Source="Project"Path="ProjectTemplates"d:TargetPath="|ConsoleProject;TemplateProjectOutputGroup|"d:ProjectName="ConsoleProject"d:VsixSubPath="ProjectTemplates" />
2525
<AssetType="Microsoft.VisualStudio.ProjectTemplate"d:Source="Project"Path="ProjectTemplates"d:TargetPath="|LibraryProject;TemplateProjectOutputGroup|"d:ProjectName="LibraryProject"d:VsixSubPath="ProjectTemplates" />
26-
27-
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|AppConfig;TemplateProjectOutputGroup|"d:ProjectName="AppConfig"d:VsixSubPath="ItemTemplates" />
28-
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|CodeFile;TemplateProjectOutputGroup|"d:ProjectName="CodeFile"d:VsixSubPath="ItemTemplates" />
29-
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|ScriptFile;TemplateProjectOutputGroup|"d:ProjectName="ScriptFile"d:VsixSubPath="ItemTemplates" />
30-
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|SignatureFile;TemplateProjectOutputGroup|"d:ProjectName="SignatureFile"d:VsixSubPath="ItemTemplates" />
31-
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|TextFile;TemplateProjectOutputGroup|"d:ProjectName="TextFile"d:VsixSubPath="ItemTemplates" />
32-
<AssetType="Microsoft.VisualStudio.ItemTemplate"d:Source="Project"Path="ItemTemplates"d:TargetPath="|XMLFile;TemplateProjectOutputGroup|"d:ProjectName="XMLFile"d:VsixSubPath="ItemTemplates" />
3326
</Assets>
3427
<Prerequisites>
3528
<PrerequisiteId="Microsoft.VisualStudio.Component.CoreEditor"Version="[15.0,16.0)"DisplayName="Visual Studio core editor" />

‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -92,62 +92,6 @@
9292
</BootstrapperPackage>
9393
</ItemGroup>
9494
<ItemGroup>
95-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\AppConfig\AppConfig.csproj">
96-
<Project>{6ba13aa4-c25f-480f-856b-8e8000299a72}</Project>
97-
<Name>AppConfig</Name>
98-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
99-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
100-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
101-
<Private>True</Private>
102-
</ProjectReference>
103-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\CodeFile\CodeFile.csproj">
104-
<Project>{12ac2813-e895-4aaa-ae6c-94e21da09f64}</Project>
105-
<Name>CodeFile</Name>
106-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
107-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
108-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
109-
<Private>True</Private>
110-
</ProjectReference>
111-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\ResourceFile\ResourceFile.csproj">
112-
<Project>{0385564F-07B4-4264-AB8A-17C393E9140C}</Project>
113-
<Name>ResourceFile</Name>
114-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
115-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
116-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
117-
<Private>True</Private>
118-
</ProjectReference>
119-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\ScriptFile\ScriptFile.csproj">
120-
<Project>{a333b85a-dc23-49b6-9797-b89a7951e92d}</Project>
121-
<Name>ScriptFile</Name>
122-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
123-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
124-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
125-
<Private>True</Private>
126-
</ProjectReference>
127-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\SignatureFile\SignatureFile.csproj">
128-
<Project>{e3fdd4ac-46b6-4b9f-b672-317d1202cc50}</Project>
129-
<Name>SignatureFile</Name>
130-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
131-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
132-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
133-
<Private>True</Private>
134-
</ProjectReference>
135-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\TextFile\TextFile.csproj">
136-
<Project>{d11fc318-8f5d-4c8c-9287-ab40a016d13c}</Project>
137-
<Name>TextFile</Name>
138-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
139-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
140-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
141-
<Private>True</Private>
142-
</ProjectReference>
143-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\XMLFile\XMLFile.csproj">
144-
<Project>{1fb1dd07-06aa-45b4-b5ac-20ff5bee98b6}</Project>
145-
<Name>XMLFile</Name>
146-
<VSIXSubPath>ItemTemplates</VSIXSubPath>
147-
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
148-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
149-
<Private>True</Private>
150-
</ProjectReference>
15195
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\ConsoleProject\ConsoleProject.csproj">
15296
<Project>{604f0daa-2d33-48dd-b162-edf0b672803d}</Project>
15397
<Name>ConsoleProject</Name>
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