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

Commit668825a

Browse files
committed
convert project template projects to the dotnet SDK
1 parentee2927d commit668825a

File tree

8 files changed

+28
-127
lines changed

8 files changed

+28
-127
lines changed

‎build-everything.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<PropertyGroupCondition="'$(BUILD_VS)'=='1'">
3838
<RestoreVSIntegration>true</RestoreVSIntegration>
3939
<RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
40+
<RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
4041
</PropertyGroup>
4142

4243
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
@@ -116,6 +117,7 @@
116117
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
117118
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj"Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
118119
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-item-templates-build.proj"Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
120+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-project-templates-build.proj"Condition="'$(RestoreVSIntegrationProjectTemplates)' == 'true'" />
119121
</ItemGroup>
120122

121123
<PropertyGroup>
Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +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">
4-
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<AssemblyName>ConsoleProject</AssemblyName>
7-
<TemplateCategory>ProjectTemplates</TemplateCategory>
8-
<IsPackage>true</IsPackage>
9-
<GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
10-
<GeneratePkgDefFile>false</GeneratePkgDefFile>
11-
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
12-
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
13-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
14-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
15-
<CreateVsixContainer>false</CreateVsixContainer>
16-
<DeployExtension>false</DeployExtension>
17-
<DeployVSTemplates>false</DeployVSTemplates>
18-
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
19-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
20-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
21-
<ProjectGuid>{604F0DAA-2D33-48DD-B162-EDF0B672803D}</ProjectGuid>
22-
</PropertyGroup>
3+
<ProjectSdk="Microsoft.NET.Sdk"ToolsVersion="15.0">
234

245
<PropertyGroup>
25-
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
26-
<TargetDotnetProfileCondition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
27-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
6+
<AssemblyName>ConsoleProject</AssemblyName>
287
</PropertyGroup>
298

30-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
31-
329
<ItemGroup>
3310
<VSTemplateInclude="Template\ConsoleApplication.vstemplate">
3411
<TranslatableResources>
@@ -38,8 +15,4 @@
3815
</VSTemplate>
3916
</ItemGroup>
4017

41-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
42-
43-
<TargetName="CoreCompile" />
44-
45-
</Project>
18+
</Project>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TemplateCategory>ProjectTemplates</TemplateCategory>
5+
</PropertyGroup>
6+
7+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('Templates.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
8+
9+
</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('Templates.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>
Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +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">
4-
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<AssemblyName>LibraryProject</AssemblyName>
7-
<TemplateCategory>ProjectTemplates</TemplateCategory>
8-
<IsPackage>true</IsPackage>
9-
<GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
10-
<GeneratePkgDefFile>false</GeneratePkgDefFile>
11-
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
12-
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
13-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
14-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
15-
<CreateVsixContainer>false</CreateVsixContainer>
16-
<DeployExtension>false</DeployExtension>
17-
<DeployVSTemplates>false</DeployVSTemplates>
18-
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
19-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
20-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
21-
<ProjectGuid>{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}</ProjectGuid>
22-
</PropertyGroup>
3+
<ProjectSdk="Microsoft.NET.Sdk"ToolsVersion="15.0">
234

245
<PropertyGroup>
25-
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
26-
<TargetDotnetProfileCondition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
27-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
6+
<AssemblyName>LibraryProject</AssemblyName>
287
</PropertyGroup>
298

30-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
31-
329
<ItemGroup>
3310
<VSTemplateInclude="Template\Library.vstemplate">
3411
<TranslatableResources>
@@ -38,8 +15,4 @@
3815
</VSTemplate>
3916
</ItemGroup>
4017

41-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
42-
43-
<TargetName="CoreCompile" />
44-
45-
</Project>
18+
</Project>
Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +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"ToolsVersion="15.0">
4+
45
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
66
<AssemblyName>TutorialProject</AssemblyName>
7-
<TemplateCategory>ProjectTemplates</TemplateCategory>
8-
<IsPackage>true</IsPackage>
9-
<GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
10-
<GeneratePkgDefFile>false</GeneratePkgDefFile>
11-
<VSToolsPathCondition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
12-
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
13-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
14-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
15-
<CreateVsixContainer>false</CreateVsixContainer>
16-
<DeployExtension>false</DeployExtension>
17-
<DeployVSTemplates>false</DeployVSTemplates>
18-
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
19-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
20-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
21-
<ProjectGuid>{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}</ProjectGuid>
22-
</PropertyGroup>
23-
<PropertyGroup>
24-
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
25-
<TargetDotnetProfileCondition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
26-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
277
</PropertyGroup>
288

29-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
30-
319
<ItemGroup>
3210
<VSTemplateInclude="Template\Tutorial.vstemplate">
3311
<TranslatableResources>
@@ -36,8 +14,4 @@
3614
</VSTemplate>
3715
</ItemGroup>
3816

39-
<ImportProject="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
40-
41-
<TargetName="CoreCompile" />
42-
43-
</Project>
17+
</Project>

‎vsintegration/fsharp-vsintegration-project-templates-build.proj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,10 @@
1111
</ItemGroup>
1212

1313
<ImportProject="..\src\root.traversal.targets"/>
14+
15+
<TargetName="Restore">
16+
<MSBuildProjects="@(ProjectFiles)"Targets="Restore" />
17+
</Target>
18+
1419
</Project>
1520

‎vsintegration/src/fsharp.common.props‎

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

0 commit comments

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