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

Commit4314d69

Browse files
committed
convert VisualFSharpFull to the dotnet SDK
1 parentbe22484 commit4314d69

File tree

7 files changed

+35
-104
lines changed

7 files changed

+35
-104
lines changed

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLFile", "vsintegration\It
114114
EndProject
115115
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Vsix","Vsix","{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
116116
EndProject
117-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
117+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
118118
EndProject
119119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
120120
EndProject
@@ -646,10 +646,10 @@ Global
646646
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0=Debug|Any CPU
647647
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg=Debug|Any CPU
648648
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.Build.0=Debug|Any CPU
649-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
650-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0=Proto|Any CPU
651-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg=Proto|Any CPU
652-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0=Proto|Any CPU
649+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg=Release|Any CPU
650+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0=Release|Any CPU
651+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg=Release|Any CPU
652+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0=Release|Any CPU
653653
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.ActiveCfg=Release|Any CPU
654654
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0=Release|Any CPU
655655
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg=Release|Any CPU

‎build/targets/AssemblyVersions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@
4343
<VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
4444
<NuGetPackageVersionSuffix>$(BuildTimeStamp_Date)-$(BuildTimeStamp_Number)</NuGetPackageVersionSuffix>
4545
</PropertyGroup>
46+
47+
<TargetName="GetVsixPackageVersion"Outputs="$(VsixPackageVersion)">
48+
</Target>
49+
4650
</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/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 10 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +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>true</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 ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '')">False</DeployExtension>
49-
<DeployExtensionCondition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
50-
<ProjectGuid>{59ADCE46-9740-4079-834D-9A03A3494EBC}</ProjectGuid>
51-
<IsPackage>true</IsPackage>
52-
<RootNamespace>VisualFSharpFull</RootNamespace>
53-
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
54-
<AssemblyName>VisualFSharpFull</AssemblyName>
55-
<OutputPath>$(RootBinPath)</OutputPath>
56-
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
57-
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
58-
<DeployExtension>false</DeployExtension>
59-
</PropertyGroup>
60-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
61-
<ImportProject="$(FSharpSourcesRoot)\..\packages\$(VSSDK_BUILDTOOLS_VERSION)\build\Microsoft.VsSDK.BuildTools.props" />
62-
<PropertyGroupCondition=" '$(Configuration)' == 'Debug'">
63-
<StartAction>Program</StartAction>
64-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
65-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
66-
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
67-
<CreateVsixContainer>true</CreateVsixContainer>
68-
</PropertyGroup>
69-
<PropertyGroupCondition=" '$(Configuration)' == 'Release'">
70-
<StartAction>Program</StartAction>
71-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
72-
<CreateVsixContainer>true</CreateVsixContainer>
73-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
74-
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
8+
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
9+
<PackageTargetFallback>netcoreapp1.0</PackageTargetFallback>
7510
</PropertyGroup>
11+
7612
<ItemGroup>
7713
<NoneInclude="Source.extension.vsixmanifest">
7814
<SubType>Designer</SubType>
@@ -93,23 +29,7 @@
9329
<IncludeInVSIX>true</IncludeInVSIX>
9430
</Content>
9531
</ItemGroup>
96-
<ItemGroup>
97-
<BootstrapperPackageInclude=".NETFramework,Version=v4.6">
98-
<Visible>False</Visible>
99-
<ProductName>Microsoft .NET Framework 4.6 %28x86 and x64%29</ProductName>
100-
<Install>true</Install>
101-
</BootstrapperPackage>
102-
<BootstrapperPackageInclude="Microsoft.Net.Client.3.5">
103-
<Visible>False</Visible>
104-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
105-
<Install>false</Install>
106-
</BootstrapperPackage>
107-
<BootstrapperPackageInclude="Microsoft.Net.Framework.3.5.SP1">
108-
<Visible>False</Visible>
109-
<ProductName>.NET Framework 3.5 SP1</ProductName>
110-
<Install>false</Install>
111-
</BootstrapperPackage>
112-
</ItemGroup>
32+
11333
<ItemGroup>
11434
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
11535
<Project>{649FA588-F02E-457C-9FCF-87E46407481E}</Project>
@@ -266,12 +186,9 @@
266186
<Private>True</Private>
267187
</ProjectReference>
268188
</ItemGroup>
189+
269190
<ItemGroup>
270-
<ReferenceInclude="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
271-
<SpecificVersion>False</SpecificVersion>
272-
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
273-
</Reference>
191+
<PackageReferenceInclude="Newtonsoft.Json"Version="$(NewtonsoftJsonPackageVersion)" />
274192
</ItemGroup>
275-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
276-
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
193+
277194
</Project>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@
1010
<ProjectFilesInclude="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup>
14-
<SdkProjectsInclude="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
15-
<SdkProjectsInclude="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
16-
</ItemGroup>
17-
1813
<ImportProject="..\src\root.traversal.targets"/>
1914

2015
<TargetName="Restore">
21-
<MSBuildProjects="@(SdkProjects)"Targets="Restore" />
16+
<MSBuildProjects="@(ProjectFiles)"Targets="Restore" />
2217
</Target>
2318

2419
</Project>

0 commit comments

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