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

Commit4df9975

Browse files
authored
Fixes to help make VisualFSharp.sln more usable (dotnet#4555)
* fixes for VisualFSharp.sln usage* fixes for VisualFSharp.sln usage* Update FSharpEmbedResourceText.fs* move MockTypeProviders* rename vsintegration/tests/unittests --> vsintegration/VisualFSharp.UnitTests* rename again* fix paths
1 parent178fc31 commit4df9975

File tree

153 files changed

+75
-57
lines changed

Some content is hidden

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

153 files changed

+75
-57
lines changed

‎VisualFSharp.sln‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A
3232
EndProject
3333
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.Salsa","vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj","{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
3434
EndProject
35-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.UnitTests","vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
35+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.UnitTests","vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
3636
EndProject
37-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttribute","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj","{DA39AD38-4A58-47BF-9215-E49768295169}"
37+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttribute","vsintegration\tests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj","{DA39AD38-4A58-47BF-9215-E49768295169}"
3838
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttributeFileDoesnotExist","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj","{8C2439BD-0E49-4929-A8B1-29CEE228191E}"
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttributeFileDoesnotExist","vsintegration\tests\MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj","{8C2439BD-0E49-4929-A8B1-29CEE228191E}"
4040
EndProject
41-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttributeLineDoesnotExist","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj","{F47196DC-186D-4055-BAF2-658282A12F33}"
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttributeLineDoesnotExist","vsintegration\tests\MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj","{F47196DC-186D-4055-BAF2-658282A12F33}"
4242
EndProject
43-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttributeWithSpaceInTheType","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttributeWithSpaceInTheType\DefinitionLocationAttributeWithSpaceInTheType.csproj","{D4C88934-5893-467E-A55C-A11ECD6479FE}"
43+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttributeWithSpaceInTheType","vsintegration\tests\MockTypeProviders\DefinitionLocationAttributeWithSpaceInTheType\DefinitionLocationAttributeWithSpaceInTheType.csproj","{D4C88934-5893-467E-A55C-A11ECD6479FE}"
4444
EndProject
45-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="DummyProviderForLanguageServiceTesting","vsintegration\tests\unittests\MockTypeProviders\DummyProviderForLanguageServiceTesting\DummyProviderForLanguageServiceTesting.fsproj","{6AFF752D-E991-4A08-9ED2-5BF46B0E0F8B}"
45+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="DummyProviderForLanguageServiceTesting","vsintegration\tests\MockTypeProviders\DummyProviderForLanguageServiceTesting\DummyProviderForLanguageServiceTesting.fsproj","{6AFF752D-E991-4A08-9ED2-5BF46B0E0F8B}"
4646
EndProject
47-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="EditorHideMethodsAttribute","vsintegration\tests\unittests\MockTypeProviders\EditorHideMethodsAttribute\EditorHideMethodsAttribute.csproj","{0B9CDEAF-EE8F-45E0-A4E0-34A8ED6DD09E}"
47+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="EditorHideMethodsAttribute","vsintegration\tests\MockTypeProviders\EditorHideMethodsAttribute\EditorHideMethodsAttribute.csproj","{0B9CDEAF-EE8F-45E0-A4E0-34A8ED6DD09E}"
4848
EndProject
49-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="EmptyAssembly","vsintegration\tests\unittests\MockTypeProviders\EmptyAssembly\EmptyAssembly.fsproj","{004982C6-93EA-4E70-B4F0-BE7D7219926A}"
49+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="EmptyAssembly","vsintegration\tests\MockTypeProviders\EmptyAssembly\EmptyAssembly.fsproj","{004982C6-93EA-4E70-B4F0-BE7D7219926A}"
5050
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithAdequateComment","vsintegration\tests\unittests\MockTypeProviders\XmlDocAttributeWithAdequateComment\XmlDocAttributeWithAdequateComment.csproj","{243A81AC-A954-4601-833A-60EEEFB00FCD}"
51+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithAdequateComment","vsintegration\tests\MockTypeProviders\XmlDocAttributeWithAdequateComment\XmlDocAttributeWithAdequateComment.csproj","{243A81AC-A954-4601-833A-60EEEFB00FCD}"
5252
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithEmptyComment","vsintegration\tests\unittests\MockTypeProviders\XmlDocAttributeWithEmptyComment\XmlDocAttributeWithEmptyComment.csproj","{B4595EB6-053A-400E-AA1B-7727F1BC900F}"
53+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithEmptyComment","vsintegration\tests\MockTypeProviders\XmlDocAttributeWithEmptyComment\XmlDocAttributeWithEmptyComment.csproj","{B4595EB6-053A-400E-AA1B-7727F1BC900F}"
5454
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithLocalizedComment","vsintegration\tests\unittests\MockTypeProviders\XmlDocAttributeWithLocalizedComment\XmlDocAttributeWithLocalizedComment.csproj","{A559D7E8-7EFD-473A-B618-A10B41AB523B}"
55+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithLocalizedComment","vsintegration\tests\MockTypeProviders\XmlDocAttributeWithLocalizedComment\XmlDocAttributeWithLocalizedComment.csproj","{A559D7E8-7EFD-473A-B618-A10B41AB523B}"
5656
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithLongComment","vsintegration\tests\unittests\MockTypeProviders\XmlDocAttributeWithLongComment\XmlDocAttributeWithLongComment.csproj","{AC85EE6D-033C-45F9-B8BA-884BC22EC6D9}"
57+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithLongComment","vsintegration\tests\MockTypeProviders\XmlDocAttributeWithLongComment\XmlDocAttributeWithLongComment.csproj","{AC85EE6D-033C-45F9-B8BA-884BC22EC6D9}"
5858
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithNullComment","vsintegration\tests\unittests\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj","{956BBE41-ABD1-4DBA-9F3B-BA1C9821C98C}"
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XmlDocAttributeWithNullComment","vsintegration\tests\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj","{956BBE41-ABD1-4DBA-9F3B-BA1C9821C98C}"
6060
EndProject
6161
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Build","src\fsharp\FSharp.Build\FSharp.Build.fsproj","{702A7979-BCF9-4C41-853E-3ADFC9897890}"
6262
EndProject

‎build-everything.proj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
3535
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
3636
</ItemGroup>
37+
3738
<PropertyGroupCondition="'$(BUILD_VS)'=='1'">
3839
<RestoreVSIntegration>true</RestoreVSIntegration>
3940
<RestoreLanguageServiceProfiling>true</RestoreLanguageServiceProfiling>
@@ -103,9 +104,15 @@
103104
<ProjectsToRestoreInclude="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
104105
</ItemGroup>
105106

107+
<ItemGroupCondition="'$(BUILD_VS)'=='1' OR '$(TEST_VS_IDEUNIT_SUITE)'=='1'">
108+
<!-- always restore these so VisualFSharp.sln is usable-->
109+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj" />
110+
</ItemGroup>
111+
106112
<ItemGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
107113
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj" />
108114
</ItemGroup>
115+
109116
<PropertyGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
110117
<RestoreVSIntegrationUnitTests>true</RestoreVSIntegrationUnitTests>
111118
</PropertyGroup>

‎src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,16 @@ open Printf
348348
letoutFilename= Path.Combine(_outputPath, justfilename+".fs")
349349
letoutXmlFilename= Path.Combine(_outputPath, justfilename+".resx")
350350

351-
if File.Exists(outFilename)&&
352-
File.Exists(outXmlFilename)&&
353-
File.Exists(filename)&&
354-
File.GetLastWriteTimeUtc(filename)<= File.GetLastWriteTimeUtc(outFilename)&&
355-
File.GetLastWriteTimeUtc(filename)<= File.GetLastWriteTimeUtc(outXmlFilename)then
356-
printMessage(sprintf"Skipping generation of%s and%s since up-to-date" outFilename outXmlFilename)
351+
letcondition1= File.Exists(outFilename)
352+
letcondition2= condition1&& File.Exists(outXmlFilename)
353+
letcondition3= condition2&& File.Exists(filename)
354+
letcondition4= condition3&&(File.GetLastWriteTimeUtc(filename)<= File.GetLastWriteTimeUtc(outFilename))
355+
letcondition5= condition4&&(File.GetLastWriteTimeUtc(filename)<= File.GetLastWriteTimeUtc(outXmlFilename))
356+
if condition5then
357+
printMessage(sprintf"Skipping generation of%s and%s from%s since up-to-date" outFilename outXmlFilename filename)
357358
Some(filename, outFilename, outXmlFilename)
358359
else
360+
printMessage(sprintf"Generating%s and%s from%s, because condition%d is false, see FSharpEmbedResourceText.fs in the F# source" outFilename outXmlFilename filename(ifnot condition1then1elifnot condition2then2elifnot condition3then3elifnot condition4then4else5))
359361

360362
printMessage(sprintf"Reading%s" filename)
361363
letlines= File.ReadAllLines(filename)

‎tests/scripts/compiler-perf-results.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ https://github.com/manofstick/visualfsharp.git all-your-collections-are-belong-t
134134

135135
https://github.com/dsyme/visualfsharp.git weak1 58bd2bec78f01e57fecff604146a3cc55eec4966 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 MSRC-3617253 260.05 10.97 30.78 47.15 58.04 59.77
136136
https://github.com/dsyme/visualfsharp.git range1 e49ac8a2f21223e60d0d9597e52ea9e5f8705963 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 MSRC-3617253 275.83 12.79 32.57 53.38 61.94 58.03
137-
https://github.com/Microsoft/visualfsharp master 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 MSRC-3617253 273.00 12.46 32.80 51.38 60.93 58.66
137+
https://github.com/Microsoft/visualfsharp master 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 221224e6d20bd835c2b9e01e0a52bf45e740a8d0 MSRC-3617253 273.00 12.46 32.80 51.38 60.93 58.66

‎vsintegration/fsharp-vsintegration-unittests-build.proj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66

77
<ItemGroup>
88
<ProjectFilesInclude="tests\Salsa\VisualFSharp.Salsa.fsproj" />
9-
<ProjectFilesInclude="tests\unittests\VisualFSharp.UnitTests.fsproj" />
9+
<ProjectFilesInclude="tests\UnitTests\VisualFSharp.UnitTests.fsproj" />
1010
<ProjectFilesInclude="..\tests\service\data\TestTP\TestTP.fsproj" />
1111
<ProjectFilesInclude="..\tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj" />
12-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" />
13-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj" />
14-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj" />
15-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\DefinitionLocationAttributeWithSpaceInTheType\DefinitionLocationAttributeWithSpaceInTheType.csproj" />
16-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\DummyProviderForLanguageServiceTesting\DummyProviderForLanguageServiceTesting.fsproj" />
17-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\EditorHideMethodsAttribute\EditorHideMethodsAttribute.csproj" />
18-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\EmptyAssembly\EmptyAssembly.fsproj" />
19-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\XmlDocAttributeWithAdequateComment\XmlDocAttributeWithAdequateComment.csproj" />
20-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\XmlDocAttributeWithEmptyComment\XmlDocAttributeWithEmptyComment.csproj" />
21-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\XmlDocAttributeWithLocalizedComment\XmlDocAttributeWithLocalizedComment.csproj" />
22-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\XmlDocAttributeWithLongComment\XmlDocAttributeWithLongComment.csproj" />
23-
<ProjectFilesInclude="tests\unittests\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj" />
12+
<ProjectFilesInclude="tests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" />
13+
<ProjectFilesInclude="tests\MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj" />
14+
<ProjectFilesInclude="tests\MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj" />
15+
<ProjectFilesInclude="tests\MockTypeProviders\DefinitionLocationAttributeWithSpaceInTheType\DefinitionLocationAttributeWithSpaceInTheType.csproj" />
16+
<ProjectFilesInclude="tests\MockTypeProviders\DummyProviderForLanguageServiceTesting\DummyProviderForLanguageServiceTesting.fsproj" />
17+
<ProjectFilesInclude="tests\MockTypeProviders\EditorHideMethodsAttribute\EditorHideMethodsAttribute.csproj" />
18+
<ProjectFilesInclude="tests\MockTypeProviders\EmptyAssembly\EmptyAssembly.fsproj" />
19+
<ProjectFilesInclude="tests\MockTypeProviders\XmlDocAttributeWithAdequateComment\XmlDocAttributeWithAdequateComment.csproj" />
20+
<ProjectFilesInclude="tests\MockTypeProviders\XmlDocAttributeWithEmptyComment\XmlDocAttributeWithEmptyComment.csproj" />
21+
<ProjectFilesInclude="tests\MockTypeProviders\XmlDocAttributeWithLocalizedComment\XmlDocAttributeWithLocalizedComment.csproj" />
22+
<ProjectFilesInclude="tests\MockTypeProviders\XmlDocAttributeWithLongComment\XmlDocAttributeWithLongComment.csproj" />
23+
<ProjectFilesInclude="tests\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<SdkProjectsInclude="tests\Salsa\VisualFSharp.Salsa.fsproj" />
28-
<SdkProjectsInclude="tests\unittests\VisualFSharp.UnitTests.fsproj" />
28+
<SdkProjectsInclude="tests\UnitTests\VisualFSharp.UnitTests.fsproj" />
2929
</ItemGroup>
3030

3131
<ImportProject="..\src\root.traversal.targets"/>

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1313
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
14+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
@@ -20,7 +21,7 @@
2021
</ItemGroup>
2122

2223
<ItemGroup>
23-
<EmbeddedResourceUpdate="FSharp.Editor.resx">
24+
<EmbeddedResourceInclude="FSharp.Editor.resx">
2425
<GenerateSource>true</GenerateSource>
2526
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.Editor.SR</GeneratedModuleName>
2627
</EmbeddedResource>

‎vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<NoWarn>$(NoWarn);1570;1574;1587;1591;3001,3002,3003</NoWarn>
1212
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1313
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
14+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
@@ -23,7 +24,7 @@
2324
</ItemGroup>
2425

2526
<ItemGroup>
26-
<EmbeddedResourceUpdate="Microsoft.VisualStudio.Package.LanguageService.resx">
27+
<EmbeddedResourceInclude="Microsoft.VisualStudio.Package.LanguageService.resx">
2728
<Generator>ResXCodeGenerator</Generator>
2829
<LastGenOutput>Microsoft.VisualStudio.Package.LanguageService.cs</LastGenOutput>
2930
<CustomToolNamespace>Microsoft.VisualStudio.Package.LanguageServiceResources</CustomToolNamespace>

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1313
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
14+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
@@ -28,7 +29,7 @@
2829

2930
<ItemGroup>
3031
<!-- VSPackage.resx already included-->
31-
<EmbeddedResourceUpdate="FSLangSvcStrings.resx">
32+
<EmbeddedResourceInclude="FSLangSvcStrings.resx">
3233
<GenerateSource>true</GenerateSource>
3334
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
3435
</EmbeddedResource>

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<RootNamespace>Microsoft.VisualStudio.FSharp.ProjectSystem</RootNamespace>
1515
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1616
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
17+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1718
</PropertyGroup>
1819

1920
<ItemGroup>
@@ -24,7 +25,7 @@
2425
</ItemGroup>
2526

2627
<ItemGroup>
27-
<EmbeddedResourceUpdate="Microsoft.VisualStudio.Package.Project.resx">
28+
<EmbeddedResourceInclude="Microsoft.VisualStudio.Package.Project.resx">
2829
<LogicalName>Microsoft.VisualStudio.Package.Project.resources</LogicalName>
2930
<SubType>Designer</SubType>
3031
</EmbeddedResource>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1313
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1414
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
15+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1516
</PropertyGroup>
1617

1718
<ItemGroup>
@@ -25,7 +26,7 @@
2526
<XlfInput>false</XlfInput>
2627
<ResourceName>Menus.ctmenu</ResourceName>
2728
</VSCTCompile>
28-
<EmbeddedResourceUpdate="VSPackage.resx">
29+
<EmbeddedResourceInclude="VSPackage.resx">
2930
<GenerateSource>true</GenerateSource>
3031
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>
3132
<MergeWithCTO>true</MergeWithCTO>

0 commit comments

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