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

Commit24d088f

Browse files
authored
Remove express skus build (dotnet#2087)
* Add back tuples to OSS build project* Add resx file to FSharp.Editor project* Localize addnewkeyword* Remove express skus from build
1 parent7906466 commit24d088f

File tree

8 files changed

+2
-756
lines changed

8 files changed

+2
-756
lines changed

‎VisualFSharp.sln‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio14
4-
VisualStudioVersion =14.0.25420.1
3+
# Visual Studio15
4+
VisualStudioVersion =15.0.26009.0
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler","src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -129,12 +129,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
129129
EndProject
130130
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Vsix","Vsix","{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
131131
EndProject
132-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpDesktop","vsintegration\Vsix\VisualFSharpDesktop\VisualFSharpDesktop.csproj","{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}"
133-
EndProject
134132
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
135133
EndProject
136-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpWeb","vsintegration\Vsix\VisualFSharpWeb\VisualFSharpWeb.csproj","{58730C8B-16F5-4956-9291-BB68E17C9142}"
137-
EndProject
138134
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
139135
EndProject
140136
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="HostedCompilerServer","tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj","{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
@@ -702,16 +698,6 @@ Global
702698
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}.Release|Any CPU.Build.0=Release|Any CPU
703699
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}.Release|x86.ActiveCfg=Release|Any CPU
704700
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}.Release|x86.Build.0=Release|Any CPU
705-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
706-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Debug|Any CPU.Build.0=Debug|Any CPU
707-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Debug|x86.ActiveCfg=Debug|Any CPU
708-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Debug|x86.Build.0=Debug|Any CPU
709-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Proto|Any CPU.ActiveCfg=Release|Any CPU
710-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Proto|x86.ActiveCfg=Release|Any CPU
711-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|Any CPU.ActiveCfg=Release|Any CPU
712-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|Any CPU.Build.0=Release|Any CPU
713-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|x86.ActiveCfg=Release|Any CPU
714-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|x86.Build.0=Release|Any CPU
715701
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
716702
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0=Debug|Any CPU
717703
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -722,16 +708,6 @@ Global
722708
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0=Release|Any CPU
723709
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg=Release|Any CPU
724710
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.Build.0=Release|Any CPU
725-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
726-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|Any CPU.Build.0=Debug|Any CPU
727-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|x86.ActiveCfg=Debug|Any CPU
728-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|x86.Build.0=Debug|Any CPU
729-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|Any CPU.ActiveCfg=Release|Any CPU
730-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|x86.ActiveCfg=Release|Any CPU
731-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.ActiveCfg=Release|Any CPU
732-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.Build.0=Release|Any CPU
733-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.ActiveCfg=Release|Any CPU
734-
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.Build.0=Release|Any CPU
735711
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
736712
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0=Debug|Any CPU
737713
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -818,9 +794,7 @@ Global
818794
{D11FC318-8F5D-4C8C-9287-AB40A016D13C} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
819795
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
820796
{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
821-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
822797
{59ADCE46-9740-4079-834D-9A03A3494EBC} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
823-
{58730C8B-16F5-4956-9291-BB68E17C9142} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
824798
{E6A45CDF-B408-420F-B475-74611BEFC52B} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
825799
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
826800
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}

‎setup/Swix/Microsoft.FSharp.vsmanproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
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.Desktop.Core.json" />
25-
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Desktop.Resources.%(SetupLanguages.LocaleCode).json" />
26-
27-
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Web.Core.json" />
28-
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Vsix.Web.Resources.%(SetupLanguages.LocaleCode).json" />
29-
3024
<MergeManifestInclude="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
3125
</ItemGroup>
3226
</Target>

‎setup/fsharp-setup-build.proj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@
2727
<SwixSetupProjectsInclude="Microsoft.FSharp.SDK.Core.swixproj">
2828
<ProjectPath>Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj</ProjectPath>
2929
</SwixSetupProjects>
30-
<VsixProjectsInclude="VisualFSharpDesktop.csproj">
31-
<ProjectPath>..\vsintegration\Vsix\VisualFSharpDesktop\VisualFSharpDesktop.csproj</ProjectPath>
32-
</VsixProjects>
3330
<VsixProjectsInclude="VisualFSharpFull.csproj">
3431
<ProjectPath>..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj</ProjectPath>
3532
</VsixProjects>
36-
<VsixProjectsInclude="VisualFSharpWeb.csproj">
37-
<ProjectPath>..\vsintegration\Vsix\VisualFSharpWeb\VisualFSharpWeb.csproj</ProjectPath>
38-
</VsixProjects>
3933
</ItemGroup>
4034

4135
<CreateItemInclude="@(SetupLanguages)"
@@ -65,12 +59,8 @@
6559
</ItemGroup>
6660

6761
<ItemGroup>
68-
<InsertionItemsInclude="$(VsixBuildLocation)\VisualFSharpDesktop.vsix" />
6962
<InsertionItemsInclude="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
70-
<InsertionItemsInclude="$(VsixBuildLocation)\VisualFSharpWeb.vsix" />
71-
<InsertionItemsInclude="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Desktop.Core.json" />
7263
<InsertionItemsInclude="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
73-
<InsertionItemsInclude="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Web.Core.json" />
7464
</ItemGroup>
7565
</Target>
7666

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

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

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