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

Commita44472c

Browse files
authored
Merge pull requestdotnet#4317 from brettfo/sdk-proj
Convert vsintegration projects to .NET Core SDK
2 parents161b3c2 +ecf4ba8 commita44472c

File tree

80 files changed

+959
-4917
lines changed

Some content is hidden

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

80 files changed

+959
-4917
lines changed

‎DEVGUIDE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ For **Release**:
212212

213213
If you are behind a proxy server, NuGet client tool must be configured to use it:
214214

215-
.nuget\nuget.exe config -set http_proxy=proxy.domain.com:8080 -ConfigFile.nuget\NuGet.Config
216-
.nuget\nuget.exe config -set http_proxy.user=user_name -ConfigFile.nuget\NuGet.Config
217-
.nuget\nuget.exe config -set http_proxy.password=user_password -ConfigFile.nuget\NuGet.Config
215+
.nuget\nuget.exe config -set http_proxy=proxy.domain.com:8080 -ConfigFile NuGet.Config
216+
.nuget\nuget.exe config -set http_proxy.user=user_name -ConfigFile NuGet.Config
217+
.nuget\nuget.exe config -set http_proxy.password=user_password -ConfigFile NuGet.Config
218218

219219
Where you should set proper proxy address, user name and password.
220220

‎FSharp.Directory.Build.props‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<Project>
2+
3+
<ImportProject="build\targets\PackageVersions.props" />
4+
<ImportProject="build\targets\CommonPackages.targets" />
5+
6+
<!-- directory locations-->
7+
<PropertyGroup>
8+
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
9+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
10+
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
11+
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13+
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
14+
</PropertyGroup>
15+
16+
<!-- nuget-->
17+
<PropertyGroup>
18+
<!-- default NuGet package restore location-->
19+
<NugetPackageRootCondition="'$(NugetPackageRoot)' == ''">$(UserProfile)\.nuget\packages\</NugetPackageRoot>
20+
</PropertyGroup>
21+
22+
<!-- signing-->
23+
<PropertyGroup>
24+
<SkipSigning>false</SkipSigning>
25+
<SignAssembly>true</SignAssembly>
26+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
27+
<StrongNames>true</StrongNames>
28+
<DelaySign>true</DelaySign>
29+
</PropertyGroup>
30+
31+
<!-- mono-->
32+
<PropertyGroup>
33+
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
34+
</PropertyGroup>
35+
36+
<!-- localization-->
37+
<PropertyGroup>
38+
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
39+
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
40+
</PropertyGroup>
41+
42+
<!-- other-->
43+
<PropertyGroup>
44+
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
45+
<UseStandardResourceNames>false</UseStandardResourceNames>
46+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
47+
</PropertyGroup>
48+
49+
<!-- SDK targets override-->
50+
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
51+
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
52+
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
53+
</PropertyGroup>
54+
55+
</Project>

‎FSharp.Directory.Build.targets‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
5+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
6+
<OutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</OutputPath>
7+
<IntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj\$(MSBuildProjectName)\</IntermediateOutputPath>
8+
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
9+
</PropertyGroup>
10+
11+
<ImportProject="build\targets\AssemblyVersions.props" />
12+
<ImportProject="build\targets\GitHash.props" />
13+
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
14+
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
15+
16+
</Project>

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(topsrcdir)mono/config.make
33
.PHONY: restore build build-proto
44

55
restore:
6-
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
6+
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile ./NuGet.Config
77
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
88
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
99
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe

‎.nuget/NuGet.Config‎renamed to ‎NuGet.Config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<packageSources>
88
<!--To inherit the global NuGet package sources remove the <clear/> line below-->
99
<clear />
10-
<addkey="artifacts"value="../artifacts" />
11-
<addkey="artifacts"value="../artifacts/4.2" />
10+
<addkey="artifacts"value="./artifacts" />
11+
<addkey="artifacts"value="./artifacts/4.2" />
1212
<addkey="myget.org fsharp-daily"value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1313
<addkey="myget.org roslyn-master-nightly"value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
1414
<addkey="dotnet-core"value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />

‎VisualFSharp.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.27116.0
4+
VisualStudioVersion =15.0.27130.2024
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.VS.FSI","vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj","{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}"
8+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.VS.FSI","vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj","{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}"
99
ProjectSection(ProjectDependencies) =postProject
1010
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} ={2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}
1111
EndProjectSection
@@ -14,17 +14,17 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Server.Shar
1414
EndProject
1515
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core","src\fsharp\FSharp.Core\FSharp.Core.fsproj","{DED3BBD7-53F4-428A-8C9F-27968E768605}"
1616
EndProject
17-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.LanguageService","vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
17+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.LanguageService","vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="FSharp.LanguageService.Base","vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj","{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.LanguageService.Base","vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj","{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
2020
EndProject
21-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Editor","vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj","{65E0E82A-EACE-4787-8994-888674C2FE87}"
21+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.Editor","vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj","{65E0E82A-EACE-4787-8994-888674C2FE87}"
2222
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="ProjectSystem.Base","vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj","{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="ProjectSystem.Base","vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj","{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}"
2424
EndProject
2525
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") ="FSharp.PropertiesPages","vsintegration\src\FSharp.ProjectSystem.PropertyPages\FSharp.PropertiesPages.vbproj","{FCFB214C-462E-42B3-91CA-FC557EFEE74F}"
2626
EndProject
27-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ProjectSystem","vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj","{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}"
27+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="ProjectSystem","vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj","{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}"
2828
EndProject
2929
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="ProjectTemplates","ProjectTemplates","{C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}"
3030
EndProject
@@ -126,7 +126,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{D086C8C6
126126
EndProject
127127
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
128128
EndProject
129-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="FSharp.UIResources","vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj","{C4586A06-1402-48BC-8E35-A1B8642F895B}"
129+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.UIResources","vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj","{C4586A06-1402-48BC-8E35-A1B8642F895B}"
130130
EndProject
131131
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="CSharp_Analysis","tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj","{887630A3-4B1D-40EA-B8B3-2D842E9C40DB}"
132132
EndProject
@@ -166,10 +166,10 @@ Global
166166
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Debug|Any CPU.Build.0=Debug|Any CPU
167167
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Debug|x86.ActiveCfg=Debug|Any CPU
168168
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Debug|x86.Build.0=Debug|Any CPU
169-
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
170-
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|Any CPU.Build.0=Proto|Any CPU
171-
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|x86.ActiveCfg=Proto|Any CPU
172-
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|x86.Build.0=Proto|Any CPU
169+
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|Any CPU.ActiveCfg=Release|Any CPU
170+
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|Any CPU.Build.0=Release|Any CPU
171+
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|x86.ActiveCfg=Release|Any CPU
172+
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Proto|x86.Build.0=Release|Any CPU
173173
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Release|Any CPU.ActiveCfg=Release|Any CPU
174174
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Release|Any CPU.Build.0=Release|Any CPU
175175
{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Release|x86.ActiveCfg=Release|Any CPU
@@ -202,10 +202,10 @@ Global
202202
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|Any CPU.Build.0=Debug|Any CPU
203203
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|x86.ActiveCfg=Debug|Any CPU
204204
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|x86.Build.0=Debug|Any CPU
205-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
206-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.Build.0=Proto|Any CPU
207-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.ActiveCfg=Proto|Any CPU
208-
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.Build.0=Proto|Any CPU
205+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.ActiveCfg=Release|Any CPU
206+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.Build.0=Release|Any CPU
207+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.ActiveCfg=Release|Any CPU
208+
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.Build.0=Release|Any CPU
209209
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|Any CPU.ActiveCfg=Release|Any CPU
210210
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|Any CPU.Build.0=Release|Any CPU
211211
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|x86.ActiveCfg=Release|Any CPU
@@ -214,10 +214,10 @@ Global
214214
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Debug|Any CPU.Build.0=Debug|Any CPU
215215
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Debug|x86.ActiveCfg=Debug|Any CPU
216216
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Debug|x86.Build.0=Debug|Any CPU
217-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
218-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.Build.0=Proto|Any CPU
219-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.ActiveCfg=Proto|Any CPU
220-
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.Build.0=Proto|Any CPU
217+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.ActiveCfg=Release|Any CPU
218+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|Any CPU.Build.0=Release|Any CPU
219+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.ActiveCfg=Release|Any CPU
220+
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Proto|x86.Build.0=Release|Any CPU
221221
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Release|Any CPU.ActiveCfg=Release|Any CPU
222222
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Release|Any CPU.Build.0=Release|Any CPU
223223
{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}.Release|x86.ActiveCfg=Release|Any CPU
@@ -226,10 +226,10 @@ Global
226226
{65E0E82A-EACE-4787-8994-888674C2FE87}.Debug|Any CPU.Build.0=Debug|Any CPU
227227
{65E0E82A-EACE-4787-8994-888674C2FE87}.Debug|x86.ActiveCfg=Debug|Any CPU
228228
{65E0E82A-EACE-4787-8994-888674C2FE87}.Debug|x86.Build.0=Debug|Any CPU
229-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
230-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.Build.0=Proto|Any CPU
231-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.ActiveCfg=Proto|Any CPU
232-
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.Build.0=Proto|Any CPU
229+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.ActiveCfg=Release|Any CPU
230+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|Any CPU.Build.0=Release|Any CPU
231+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.ActiveCfg=Release|Any CPU
232+
{65E0E82A-EACE-4787-8994-888674C2FE87}.Proto|x86.Build.0=Release|Any CPU
233233
{65E0E82A-EACE-4787-8994-888674C2FE87}.Release|Any CPU.ActiveCfg=Release|Any CPU
234234
{65E0E82A-EACE-4787-8994-888674C2FE87}.Release|Any CPU.Build.0=Release|Any CPU
235235
{65E0E82A-EACE-4787-8994-888674C2FE87}.Release|x86.ActiveCfg=Release|Any CPU
@@ -238,10 +238,10 @@ Global
238238
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Debug|Any CPU.Build.0=Debug|Any CPU
239239
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Debug|x86.ActiveCfg=Debug|Any CPU
240240
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Debug|x86.Build.0=Debug|Any CPU
241-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
242-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.Build.0=Proto|Any CPU
243-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.ActiveCfg=Proto|Any CPU
244-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.Build.0=Proto|Any CPU
241+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.ActiveCfg=Release|Any CPU
242+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.Build.0=Release|Any CPU
243+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.ActiveCfg=Release|Any CPU
244+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.Build.0=Release|Any CPU
245245
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.ActiveCfg=Release|Any CPU
246246
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.Build.0=Release|Any CPU
247247
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.ActiveCfg=Release|Any CPU
@@ -262,10 +262,10 @@ Global
262262
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.Build.0=Debug|Any CPU
263263
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.ActiveCfg=Debug|Any CPU
264264
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.Build.0=Debug|Any CPU
265-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
266-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.Build.0=Proto|Any CPU
267-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.ActiveCfg=Proto|Any CPU
268-
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.Build.0=Proto|Any CPU
265+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.ActiveCfg=Release|Any CPU
266+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|Any CPU.Build.0=Release|Any CPU
267+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.ActiveCfg=Release|Any CPU
268+
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Proto|x86.Build.0=Release|Any CPU
269269
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Release|Any CPU.ActiveCfg=Release|Any CPU
270270
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Release|Any CPU.Build.0=Release|Any CPU
271271
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Release|x86.ActiveCfg=Release|Any CPU
@@ -706,10 +706,10 @@ Global
706706
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Debug|Any CPU.Build.0=Debug|Any CPU
707707
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Debug|x86.ActiveCfg=Debug|Any CPU
708708
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Debug|x86.Build.0=Debug|Any CPU
709-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
710-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.Build.0=Proto|Any CPU
711-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.ActiveCfg=Proto|Any CPU
712-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.Build.0=Proto|Any CPU
709+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.ActiveCfg=Release|Any CPU
710+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.Build.0=Release|Any CPU
711+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.ActiveCfg=Release|Any CPU
712+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.Build.0=Release|Any CPU
713713
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Release|Any CPU.ActiveCfg=Release|Any CPU
714714
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Release|Any CPU.Build.0=Release|Any CPU
715715
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Release|x86.ActiveCfg=Release|Any CPU

‎build-everything.proj‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
3535
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
3636
</ItemGroup>
37+
<PropertyGroup>
38+
<RestoreVSIntegration>true</RestoreVSIntegration>
39+
</PropertyGroup>
3740

3841
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
3942
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" />
@@ -78,17 +81,19 @@
7881
<ItemGroupCondition="'$(TEST_CORECLR_FSHARP_SUITE)'=='1'" >
7982
<ProjectsWithCoreClrInclude="tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj" />
8083
<ProjectsWithCoreClrInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
81-
82-
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
8384
</ItemGroup>
85+
<PropertyGroupCondition="'$(TEST_CORECLR_FSHARP_SUITE)'=='1'">
86+
<RestorePEVerify>true</RestorePEVerify>
87+
</PropertyGroup>
8488

8589
<ItemGroupCondition="'$(TEST_NET40_FSHARPQA_SUITE)'=='1' OR '$(TEST_NET40_FSHARP_SUITE)'=='1'" >
8690
<ProjectsWithNet40Include="tests/fsharpqa/testenv/src/ILComparer/ILComparer.fsproj" />
8791
<ProjectsWithNet40Include="tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj" />
8892
<ProjectsWithNet40Include="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
89-
90-
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" />
9193
</ItemGroup>
94+
<PropertyGroupCondition="'$(TEST_NET40_FSHARPQA_SUITE)'=='1' OR '$(TEST_NET40_FSHARP_SUITE)'=='1'">
95+
<RestorePEVerify>true</RestorePEVerify>
96+
</PropertyGroup>
9297

9398
<ItemGroupCondition="'$(TEST_FCS)'=='1'" >
9499
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
@@ -102,6 +107,11 @@
102107
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
103108
</ItemGroup>
104109

110+
<ItemGroup>
111+
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj"Condition="'$(RestorePEVerify)' == 'true'" />
112+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
113+
</ItemGroup>
114+
105115
<PropertyGroup>
106116
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
107117
</PropertyGroup>

0 commit comments

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