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

Commit59fadd0

Browse files
committed
convert LanguageServiceProfiling to the dotnet SDK
1 parent2a7188c commit59fadd0

File tree

6 files changed

+27
-71
lines changed

6 files changed

+27
-71
lines changed

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ILComparer", "tests\fsharpq
124124
EndProject
125125
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Utils","Utils","{D086C8C6-D00D-4C3B-9AB2-A4286C9F5922}"
126126
EndProject
127-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
127+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
128128
EndProject
129129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.UIResources","vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj","{C4586A06-1402-48BC-8E35-A1B8642F895B}"
130130
EndProject
@@ -694,10 +694,10 @@ Global
694694
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|Any CPU.Build.0=Debug|Any CPU
695695
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.ActiveCfg=Debug|Any CPU
696696
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.Build.0=Debug|Any CPU
697-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
698-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0=Proto|Any CPU
699-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg=Proto|Any CPU
700-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0=Proto|Any CPU
697+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg=Release|Any CPU
698+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0=Release|Any CPU
699+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg=Release|Any CPU
700+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0=Release|Any CPU
701701
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.ActiveCfg=Release|Any CPU
702702
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.Build.0=Release|Any CPU
703703
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|x86.ActiveCfg=Release|Any CPU

‎build-everything.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
</ItemGroup>
3737
<PropertyGroupCondition="'$(BUILD_VS)'=='1'">
3838
<RestoreVSIntegration>true</RestoreVSIntegration>
39+
<RestoreLanguageServiceProfiling>true</RestoreLanguageServiceProfiling>
3940
<RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
4041
<RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
4142
</PropertyGroup>
@@ -114,6 +115,7 @@
114115

115116
<ItemGroup>
116117
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj"Condition="'$(RestorePEVerify)' == 'true'" />
118+
<ProjectsToRestoreInclude="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj"Condition="'$(RestoreLanguageServiceProfiling)' == 'true'" />
117119
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
118120
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj"Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
119121
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-item-templates-build.proj"Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>
Lines changed: 14 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="15.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<ProjectSdk="Microsoft.NET.Sdk">
3+
44
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<ProjectLanguage>FSharp</ProjectLanguage>
7-
</PropertyGroup>
8-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
9-
<PropertyGroup>
10-
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
11-
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
12-
<SchemaVersion>2.0</SchemaVersion>
13-
<ProjectGuid>e7fa3a71-51af-4fca-9c2f-7c853e515903</ProjectGuid>
5+
<TargetFramework>net46</TargetFramework>
146
<OutputType>Exe</OutputType>
15-
<RootNamespace>LanguageServiceProfiling</RootNamespace>
16-
<AssemblyName>LanguageServiceProfiling</AssemblyName>
17-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
18-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
19-
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
20-
<Name>LanguageServiceProfiling</Name>
21-
</PropertyGroup>
22-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
23-
<DebugSymbols>true</DebugSymbols>
24-
<Optimize>false</Optimize>
25-
<Tailcalls>false</Tailcalls>
26-
<OutputPath>bin\$(Configuration)\</OutputPath>
27-
<DefineConstants>DEBUG;TRACE</DefineConstants>
28-
<WarningLevel>3</WarningLevel>
29-
<PlatformTarget>x86</PlatformTarget>
30-
<DocumentationFile>
31-
</DocumentationFile>
32-
<Prefer32Bit>true</Prefer32Bit>
33-
</PropertyGroup>
34-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
35-
<Optimize>true</Optimize>
36-
<Tailcalls>true</Tailcalls>
37-
<OutputPath>bin\$(Configuration)\</OutputPath>
38-
<DefineConstants>TRACE</DefineConstants>
39-
<WarningLevel>3</WarningLevel>
40-
<PlatformTarget>x86</PlatformTarget>
41-
<DocumentationFile>
42-
</DocumentationFile>
43-
<Prefer32Bit>true</Prefer32Bit>
7+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
8+
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
449
</PropertyGroup>
10+
4511
<ItemGroup>
4612
<CompileInclude="AssemblyInfo.fs" />
4713
<CompileInclude="ProjectCracker.fs" />
4814
<CompileInclude="Options.fs" />
4915
<CompileInclude="Program.fs" />
5016
<NoneInclude="App.config" />
51-
<ContentInclude="packages.config" />
5217
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
21+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
22+
</ItemGroup>
23+
5324
<ItemGroup>
5425
<ReferenceInclude="mscorlib" />
5526
<ReferenceInclude="System" />
5627
<ReferenceInclude="System.Core" />
5728
<ReferenceInclude="System.Numerics" />
58-
<ReferenceInclude="System.ValueTuple">
59-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
60-
</Reference>
6129
<ReferenceInclude="System.Xml" />
6230
</ItemGroup>
63-
<ItemGroup>
64-
<ProjectReferenceInclude="..\..\..\src\fsharp\FSharp.Core\FSharp.Core.fsproj">
65-
<Name>FSharp.Core</Name>
66-
<Project>{ded3bbd7-53f4-428a-8c9f-27968e768605}</Project>
67-
<Private>True</Private>
68-
</ProjectReference>
69-
<ProjectReferenceInclude="..\..\..\src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
70-
<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
71-
<Name>FSharp.Compiler.Private</Name>
72-
<Private>True</Private>
73-
</ProjectReference>
74-
<ReferenceInclude="System.ValueTuple">
75-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
76-
<Private>true</Private>
77-
</Reference>
78-
</ItemGroup>
79-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
80-
</Project>
31+
32+
</Project>

‎vsintegration/Utils/LanguageServiceProfiling/packages.config‎

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

0 commit comments

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