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

Commitbe22484

Browse files
committed
convert VisualFSharpOpenSource to the dotnet SDK
1 parent226ca53 commitbe22484

File tree

9 files changed

+78
-146
lines changed

9 files changed

+78
-146
lines changed

‎VisualFSharp.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.27130.2024
4+
VisualStudioVersion =15.0.27130.2036
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
@@ -116,7 +116,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vsix", "Vsix", "{141F6C23-E
116116
EndProject
117117
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
118118
EndProject
119-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
119+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
120120
EndProject
121121
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="HostedCompilerServer","tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj","{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
122122
EndProject
@@ -658,10 +658,10 @@ Global
658658
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0=Debug|Any CPU
659659
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg=Debug|Any CPU
660660
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.Build.0=Debug|Any CPU
661-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
662-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0=Proto|Any CPU
663-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg=Proto|Any CPU
664-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0=Proto|Any CPU
661+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg=Release|Any CPU
662+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0=Release|Any CPU
663+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg=Release|Any CPU
664+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0=Release|Any CPU
665665
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.ActiveCfg=Release|Any CPU
666666
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.Build.0=Release|Any CPU
667667
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.ActiveCfg=Release|Any CPU

‎vsintegration/Vsix/FSharp.Directory.Build.props‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,33 @@
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<DeployExtensionCondition=" '$(DeployExtension)' == '' and ('$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '')">False</DeployExtension>
99
<DeployExtensionCondition=" '$(DeployExtension)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
10-
<StartAction>Program</StartAction>
11-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
12-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
1310
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
1411
<CreateVsixContainer>true</CreateVsixContainer>
12+
<PublishUrl>publish\</PublishUrl>
13+
<Install>true</Install>
14+
<InstallFrom>Disk</InstallFrom>
15+
<UpdateEnabled>false</UpdateEnabled>
16+
<UpdateMode>Foreground</UpdateMode>
17+
<UpdateInterval>7</UpdateInterval>
18+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
19+
<UpdatePeriodically>true</UpdatePeriodically>
20+
<UpdateRequired>false</UpdateRequired>
21+
<MapFileExtensions>true</MapFileExtensions>
22+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
23+
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
24+
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
25+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
26+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
27+
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
28+
<IsWebBootstrapper>false</IsWebBootstrapper>
29+
<UseApplicationTrust>false</UseApplicationTrust>
30+
<BootstrapperEnabled>true</BootstrapperEnabled>
31+
<IsProductComponent>true</IsProductComponent>
32+
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
33+
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
34+
<IsPackage>true</IsPackage>
35+
<DeployExtension>false</DeployExtension>
36+
<ImportVsSDK>true</ImportVsSDK>
1537
</PropertyGroup>
1638

1739
</Project>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
11
<Project>
2+
23
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
4+
5+
<ItemGroup>
6+
<BootstrapperPackageInclude=".NETFramework,Version=v4.6">
7+
<Visible>False</Visible>
8+
<ProductName>Microsoft .NET Framework 4.6 %28x86 and x64%29</ProductName>
9+
<Install>true</Install>
10+
</BootstrapperPackage>
11+
<BootstrapperPackageInclude="Microsoft.Net.Client.3.5">
12+
<Visible>False</Visible>
13+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
14+
<Install>false</Install>
15+
</BootstrapperPackage>
16+
<BootstrapperPackageInclude="Microsoft.Net.Framework.3.5.SP1">
17+
<Visible>False</Visible>
18+
<ProductName>.NET Framework 3.5 SP1</ProductName>
19+
<Install>false</Install>
20+
</BootstrapperPackage>
21+
</ItemGroup>
22+
323
</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.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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"profiles": {
3+
"VisualFSharpOpenSource": {
4+
"commandName":"Executable",
5+
"executablePath":"$(DevEnvDir)devenv.exe",
6+
"commandLineArgs":"/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log"
7+
}
8+
}
9+
}

‎vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj‎

Lines changed: 11 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
3-
<ProjectToolsVersion="15.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectSdk="Microsoft.NET.Sdk">
4+
45
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<TargetDotnetProfileCondition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>
7-
<MinimumVisualStudioVersionCondition="'$(MinimumVisualStudioVersion)' == ''">15.0</MinimumVisualStudioVersion>
8-
<VisualStudioVersionCondition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
9-
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(FSharpSourcesRoot)\..\packages\Microsoft.VSSDK.BuildTools.$(RoslynVSPackagesVersion)\tools</VSToolsPath>
10-
<FileUpgradeFlags>
11-
</FileUpgradeFlags>
12-
<OldToolsVersion>15.0</OldToolsVersion>
13-
<SchemaVersion>2.0</SchemaVersion>
14-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<UpgradeBackupLocation>
16-
</UpgradeBackupLocation>
17-
<PublishUrl>publish\</PublishUrl>
18-
<Install>true</Install>
19-
<InstallFrom>Disk</InstallFrom>
20-
<UpdateEnabled>false</UpdateEnabled>
21-
<UpdateMode>Foreground</UpdateMode>
22-
<UpdateInterval>7</UpdateInterval>
23-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
24-
<UpdatePeriodically>true</UpdatePeriodically>
25-
<UpdateRequired>false</UpdateRequired>
26-
<MapFileExtensions>true</MapFileExtensions>
27-
<ApplicationRevision>0</ApplicationRevision>
28-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
29-
<GeneratePkgDefFile>false</GeneratePkgDefFile>
30-
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
31-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
32-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
33-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
34-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
35-
<IsWebBootstrapper>false</IsWebBootstrapper>
36-
<UseApplicationTrust>false</UseApplicationTrust>
37-
<BootstrapperEnabled>true</BootstrapperEnabled>
38-
<IsProductComponent>false</IsProductComponent>
39-
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
40-
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
41-
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
42-
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
43-
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
6+
<TargetFramework>net46</TargetFramework>
447
<OutputType>Library</OutputType>
45-
<AppDesignerFolder>Properties</AppDesignerFolder>
46-
<VSRootSuffix>RoslynDev</VSRootSuffix>
47-
<UseCodebase>true</UseCodebase>
48-
<DeployExtensionCondition=" '$(DeployExtension)' == '' and '$(CI)' != '1'">True</DeployExtension>
49-
<DeployExtensionCondition=" '$(DeployExtension)' == '' and '$(CI)' == '1'">False</DeployExtension>
50-
<ProjectGuid>{E6A45CDF-B408-420F-B475-74611BEFC52B}</ProjectGuid>
51-
<IsPackage>true</IsPackage>
52-
<RootNamespace>VisualFSharpOpenSource</RootNamespace>
53-
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
54-
<AssemblyName>VisualFSharpOpenSource</AssemblyName>
55-
<OutputPath>$(RootBinPath)</OutputPath>
56-
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
57-
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
58-
</PropertyGroup>
59-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
60-
<ImportProject="$(FSharpSourcesRoot)\..\packages\$(VSSDK_BUILDTOOLS_VERSION)\build\Microsoft.VsSDK.BuildTools.props" />
61-
<PropertyGroupCondition=" '$(Configuration)' == 'Debug'">
62-
<StartAction>Program</StartAction>
63-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
64-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
65-
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
66-
<CreateVsixContainer>true</CreateVsixContainer>
67-
</PropertyGroup>
68-
<PropertyGroupCondition=" '$(Configuration)' == 'Release'">
69-
<StartAction>Program</StartAction>
70-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
71-
<CreateVsixContainer>true</CreateVsixContainer>
72-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
73-
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
8+
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
9+
<PackageTargetFallback>netcoreapp1.0</PackageTargetFallback>
7410
</PropertyGroup>
11+
7512
<ItemGroup>
7613
<NoneInclude="Source.extension.vsixmanifest">
7714
<SubType>Designer</SubType>
@@ -92,23 +29,7 @@
9229
<IncludeInVSIX>true</IncludeInVSIX>
9330
</Content>
9431
</ItemGroup>
95-
<ItemGroup>
96-
<BootstrapperPackageInclude=".NETFramework,Version=v4.6">
97-
<Visible>False</Visible>
98-
<ProductName>Microsoft .NET Framework 4.6 %28x86 and x64%29</ProductName>
99-
<Install>true</Install>
100-
</BootstrapperPackage>
101-
<BootstrapperPackageInclude="Microsoft.Net.Client.3.5">
102-
<Visible>False</Visible>
103-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
104-
<Install>false</Install>
105-
</BootstrapperPackage>
106-
<BootstrapperPackageInclude="Microsoft.Net.Framework.3.5.SP1">
107-
<Visible>False</Visible>
108-
<ProductName>.NET Framework 3.5 SP1</ProductName>
109-
<Install>false</Install>
110-
</BootstrapperPackage>
111-
</ItemGroup>
32+
11233
<ItemGroup>
11334
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
11435
<Project>{649FA588-F02E-457C-9FCF-87E46407481E}</Project>
@@ -289,15 +210,10 @@
289210
<Private>True</Private>
290211
</ProjectReference>
291212
</ItemGroup>
213+
292214
<ItemGroup>
293-
<ReferenceInclude="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
294-
<SpecificVersion>False</SpecificVersion>
295-
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
296-
</Reference>
297-
<ReferenceInclude="System.Collections.Immutable">
298-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
299-
</Reference>
215+
<PackageReferenceInclude="Newtonsoft.Json"Version="$(NewtonsoftJsonPackageVersion)" />
216+
<PackageReferenceInclude="System.Collections.Immutable"Version="$(SystemCollectionsImmutablePackageVersion)" />
300217
</ItemGroup>
301-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
302-
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
218+
303219
</Project>

‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,7 @@
66
<AssemblyName>VisualFSharpTemplate</AssemblyName>
77
<TargetFramework>net46</TargetFramework>
88
<OutputType>Library</OutputType>
9-
<PublishUrl>publish\</PublishUrl>
10-
<Install>true</Install>
11-
<InstallFrom>Disk</InstallFrom>
12-
<UpdateEnabled>false</UpdateEnabled>
13-
<UpdateMode>Foreground</UpdateMode>
14-
<UpdateInterval>7</UpdateInterval>
15-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
16-
<UpdatePeriodically>true</UpdatePeriodically>
17-
<UpdateRequired>false</UpdateRequired>
18-
<MapFileExtensions>true</MapFileExtensions>
19-
<GeneratePkgDefFile>false</GeneratePkgDefFile>
20-
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
21-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
22-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
23-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
24-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
25-
<IsWebBootstrapper>false</IsWebBootstrapper>
26-
<UseApplicationTrust>false</UseApplicationTrust>
27-
<BootstrapperEnabled>true</BootstrapperEnabled>
28-
<IsProductComponent>true</IsProductComponent>
29-
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
309
<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
31-
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
32-
<IsPackage>true</IsPackage>
33-
<DeployExtension>false</DeployExtension>
3410
</PropertyGroup>
3511

3612
<ItemGroup>
@@ -39,24 +15,6 @@
3915
</None>
4016
</ItemGroup>
4117

42-
<ItemGroup>
43-
<BootstrapperPackageInclude=".NETFramework,Version=v4.6">
44-
<Visible>False</Visible>
45-
<ProductName>Microsoft .NET Framework 4.6 %28x86 and x64%29</ProductName>
46-
<Install>true</Install>
47-
</BootstrapperPackage>
48-
<BootstrapperPackageInclude="Microsoft.Net.Client.3.5">
49-
<Visible>False</Visible>
50-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
51-
<Install>false</Install>
52-
</BootstrapperPackage>
53-
<BootstrapperPackageInclude="Microsoft.Net.Framework.3.5.SP1">
54-
<Visible>False</Visible>
55-
<ProductName>.NET Framework 3.5 SP1</ProductName>
56-
<Install>false</Install>
57-
</BootstrapperPackage>
58-
</ItemGroup>
59-
6018
<ItemGroup>
6119
<ProjectReferenceInclude="..\..\ProjectTemplates\ConsoleProject\ConsoleProject.csproj">
6220
<Project>{604f0daa-2d33-48dd-b162-edf0b672803d}</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<ItemGroup>
1414
<SdkProjectsInclude="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
15+
<SdkProjectsInclude="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
1516
</ItemGroup>
1617

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

0 commit comments

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