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

Commit226ca53

Browse files
committed
convert VisualFSharpTemplates to the dotnet SDK
1 parent59fadd0 commit226ca53

File tree

8 files changed

+57
-52
lines changed

8 files changed

+57
-52
lines changed

‎build-everything.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<RestoreLanguageServiceProfiling>true</RestoreLanguageServiceProfiling>
4040
<RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
4141
<RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
42+
<RestoreVSIntegrationVsix>true</RestoreVSIntegrationVsix>
4243
</PropertyGroup>
4344

4445
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
@@ -120,6 +121,7 @@
120121
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj"Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
121122
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-item-templates-build.proj"Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
122123
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-project-templates-build.proj"Condition="'$(RestoreVSIntegrationProjectTemplates)' == 'true'" />
124+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-vsix-build.proj"Condition="'$(RestoreVSIntegrationVsix)' == 'true'" />
123125
</ItemGroup>
124126

125127
<PropertyGroup>

‎vsintegration/FSharp.Directory.Build.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<PackageTargetFallback>net462</PackageTargetFallback>
1212
</PropertyGroup>
1313

14+
<PropertyGroupCondition="'$(CreateVsixContainer)' == 'true'">
15+
<!-- Ensure VSIX packages end up in the proper location.-->
16+
<OutDir>$(OutputPath)\</OutDir>
17+
</PropertyGroup>
18+
1419
<ImportGroupCondition="'$(ImportVsSDK)' == 'true'">
1520
<ImportProject="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props" />
1621
<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets" />
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
3+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
5+
<PropertyGroup>
6+
<VSRootSuffix>RoslynDev</VSRootSuffix>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<DeployExtensionCondition=" '$(DeployExtension)' == '' and ('$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '')">False</DeployExtension>
9+
<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>
13+
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
14+
<CreateVsixContainer>true</CreateVsixContainer>
15+
</PropertyGroup>
16+
17+
</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: 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: 12 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
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></FileUpgradeFlags>
11-
<OldToolsVersion>15.0</OldToolsVersion>
12-
<SchemaVersion>2.0</SchemaVersion>
13-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<UpgradeBackupLocation></UpgradeBackupLocation>
6+
<AssemblyName>VisualFSharpTemplate</AssemblyName>
7+
<TargetFramework>net46</TargetFramework>
8+
<OutputType>Library</OutputType>
159
<PublishUrl>publish\</PublishUrl>
1610
<Install>true</Install>
1711
<InstallFrom>Disk</InstallFrom>
@@ -22,8 +16,6 @@
2216
<UpdatePeriodically>true</UpdatePeriodically>
2317
<UpdateRequired>false</UpdateRequired>
2418
<MapFileExtensions>true</MapFileExtensions>
25-
<ApplicationRevision>0</ApplicationRevision>
26-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
2719
<GeneratePkgDefFile>false</GeneratePkgDefFile>
2820
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
2921
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -37,43 +29,16 @@
3729
<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
3830
<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
3931
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
40-
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
41-
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
42-
<OutputType>Library</OutputType>
43-
<AppDesignerFolder>Properties</AppDesignerFolder>
44-
<VSRootSuffix>RoslynDev</VSRootSuffix>
45-
<UseCodebase>true</UseCodebase>
46-
<DeployExtensionCondition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '')">False</DeployExtension>
47-
<DeployExtensionCondition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
48-
<ProjectGuid>{385035C1-9171-408A-8EAA-67DDC14E2CF3}</ProjectGuid>
4932
<IsPackage>true</IsPackage>
50-
<RootNamespace>VisualFSharpTemplate</RootNamespace>
51-
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
52-
<AssemblyName>VisualFSharpTemplate</AssemblyName>
53-
<OutputPath>$(RootBinPath)</OutputPath>
54-
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
55-
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
5633
<DeployExtension>false</DeployExtension>
5734
</PropertyGroup>
58-
<PropertyGroupCondition=" '$(Configuration)' == 'Debug'">
59-
<StartAction>Program</StartAction>
60-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
61-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
62-
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
63-
<CreateVsixContainer>true</CreateVsixContainer>
64-
</PropertyGroup>
65-
<PropertyGroupCondition=" '$(Configuration)' == 'Release'">
66-
<StartAction>Program</StartAction>
67-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
68-
<CreateVsixContainer>true</CreateVsixContainer>
69-
<StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
70-
<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
71-
</PropertyGroup>
35+
7236
<ItemGroup>
7337
<NoneInclude="Source.extension.vsixmanifest">
7438
<SubType>Designer</SubType>
7539
</None>
7640
</ItemGroup>
41+
7742
<ItemGroup>
7843
<BootstrapperPackageInclude=".NETFramework,Version=v4.6">
7944
<Visible>False</Visible>
@@ -91,24 +56,25 @@
9156
<Install>false</Install>
9257
</BootstrapperPackage>
9358
</ItemGroup>
59+
9460
<ItemGroup>
95-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\ConsoleProject\ConsoleProject.csproj">
61+
<ProjectReferenceInclude="..\..\ProjectTemplates\ConsoleProject\ConsoleProject.csproj">
9662
<Project>{604f0daa-2d33-48dd-b162-edf0b672803d}</Project>
9763
<Name>ConsoleProject</Name>
9864
<VSIXSubPath>ProjectTemplates</VSIXSubPath>
9965
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
10066
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
10167
<Private>True</Private>
10268
</ProjectReference>
103-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\LibraryProject\LibraryProject.csproj">
69+
<ProjectReferenceInclude="..\..\ProjectTemplates\LibraryProject\LibraryProject.csproj">
10470
<Project>{01678cda-a11f-4dee-9344-2edf91cf1ae7}</Project>
10571
<Name>LibraryProject</Name>
10672
<VSIXSubPath>ProjectTemplates</VSIXSubPath>
10773
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
10874
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
10975
<Private>True</Private>
11076
</ProjectReference>
111-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\TutorialProject\TutorialProject.csproj">
77+
<ProjectReferenceInclude="..\..\ProjectTemplates\TutorialProject\TutorialProject.csproj">
11278
<Project>{2facee44-48bd-40b5-a2ee-b54a0c9bb7c4}</Project>
11379
<Name>TutorialProject</Name>
11480
<VSIXSubPath>ProjectTemplates</VSIXSubPath>
@@ -117,6 +83,5 @@
11783
<Private>True</Private>
11884
</ProjectReference>
11985
</ItemGroup>
120-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
121-
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
86+
12287
</Project>

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,19 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<VsixProjectsInclude="Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
9-
<VsixProjectsInclude="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
10-
<VsixProjectsInclude="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
8+
<ProjectFilesInclude="Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
9+
<ProjectFilesInclude="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
10+
<ProjectFilesInclude="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
1111
</ItemGroup>
1212

13-
<TargetName="Build">
14-
<MSBuildProjects="@(VsixProjects)"Targets="Build"Properties="Configuration=$(Configuration)" />
13+
<ItemGroup>
14+
<SdkProjectsInclude="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
15+
</ItemGroup>
16+
17+
<ImportProject="..\src\root.traversal.targets"/>
18+
19+
<TargetName="Restore">
20+
<MSBuildProjects="@(SdkProjects)"Targets="Restore" />
1521
</Target>
22+
1623
</Project>

0 commit comments

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