Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3f830bd

Browse files
ejballejball
committed
Merge template/faithlife-build.
2 parents 7ff8c45 + a6474ba commit 3f830bd

File tree

10 files changed

+35
-49
lines changed

10 files changed

+35
-49
lines changed

‎src/Directory.Build.props renamed to ‎Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<LangVersion>latest</LangVersion>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<NeutralLanguage>en-US</NeutralLanguage>
8-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
98
<NoWarn>$(NoWarn);1591</NoWarn>
109
<DebugType>portable</DebugType>
1110
<DebugSymbols>True</DebugSymbols>
@@ -20,7 +19,7 @@
2019
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2120
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2221
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
23-
<IsPackable>true</IsPackable>
22+
<IsPackable>false</IsPackable>
2423
<IsTestProject>false</IsTestProject>
2524
</PropertyGroup>
2625

‎FacilityJavaScript.sln

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
.travis.yml = .travis.yml
1212
appveyor.yml = appveyor.yml
1313
build.sh = build.sh
14+
Directory.Build.props = Directory.Build.props
1415
LICENSE = LICENSE
1516
README.md = README.md
1617
VersionHistory.md = VersionHistory.md
@@ -29,20 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{3A88
2930
example\ExampleApi.fsd = example\ExampleApi.fsd
3031
EndProjectSection
3132
EndProject
32-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5B489C2-B001-4F3D-94ED-62DB3FA8106D}"
33-
ProjectSection(SolutionItems) = preProject
34-
src\Directory.Build.props = src\Directory.Build.props
35-
EndProjectSection
36-
EndProject
37-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7F884B8E-BD32-4940-A1D6-CA9987DF519B}"
38-
ProjectSection(SolutionItems) = preProject
39-
tests\Directory.Build.props = tests\Directory.Build.props
40-
EndProjectSection
41-
EndProject
42-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4839A660-1B17-46A1-910A-9DEC39CC9709}"
43-
ProjectSection(SolutionItems) = preProject
44-
tools\Directory.Build.props = tools\Directory.Build.props
45-
EndProjectSection
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocTarget", "tools\XmlDocTarget\XmlDocTarget.csproj", "{59609610-A4A7-40AF-B147-63BEA7C6BE69}"
4634
EndProject
4735
Global
4836
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -66,15 +54,16 @@ Global
6654
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
6755
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
6856
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Release|Any CPU.Build.0 = Release|Any CPU
6961
EndGlobalSection
7062
GlobalSection(SolutionProperties) = preSolution
7163
HideSolutionNode = FALSE
7264
EndGlobalSection
7365
GlobalSection(NestedProjects) = preSolution
7466
{3A881397-73AC-426F-B31A-94EE463117C4} = {A219E328-B15A-41FF-BAA5-5F46679EF9C8}
75-
{A5B489C2-B001-4F3D-94ED-62DB3FA8106D} = {A219E328-B15A-41FF-BAA5-5F46679EF9C8}
76-
{7F884B8E-BD32-4940-A1D6-CA9987DF519B} = {A219E328-B15A-41FF-BAA5-5F46679EF9C8}
77-
{4839A660-1B17-46A1-910A-9DEC39CC9709} = {A219E328-B15A-41FF-BAA5-5F46679EF9C8}
7867
EndGlobalSection
7968
GlobalSection(ExtensibilityGlobals) = postSolution
8069
SolutionGuid = {258EAD6F-902F-4B6D-83A2-EA3AD001A385}

‎src/Facility.CodeGen.JavaScript/Facility.CodeGen.JavaScript.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Description>Used by fsdgenjs to generate JavaScript or TypeScript for a Facility Service Definition.</Description>
66
<PackageTags>Facility FSD JavaScript TypeScript CodeGen</PackageTags>
7+
<IsPackable>true</IsPackable>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
79
</PropertyGroup>
810

911
<ItemGroup>

‎src/fsdgenjs/fsdgenjs.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<TargetFramework>netcoreapp2.1</TargetFramework>
66
<Description>A .NET Core Global Tool that generates JavaScript or TypeScript for a Facility Service Definition.</Description>
77
<PackageTags>Facility FSD JavaScript TypeScript CodeGen</PackageTags>
8-
<PackAsTool>True</PackAsTool>
8+
<IsPackable>true</IsPackable>
9+
<PackAsTool>true</PackAsTool>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎tests/Directory.Build.props

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

‎tools/Build/Build.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static int Main(string[] args) => BuildRunner.Execute(args, build =>
2424
GitAuthor = new GitAuthorInfo("FacilityApiBot", "[email protected]"),
2525
GitBranchName = Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH"),
2626
SourceCodeUrl = "https://github.com/FacilityApi/FacilityJavaScript/tree/master/src",
27+
ProjectHasDocs = name => !name.StartsWith("fsdgen", StringComparison.Ordinal),
2728
},
2829
DotNetTools = dotNetTools,
2930
SourceLinkSettings = new SourceLinkSettings

‎tools/Build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Faithlife.Build" Version="3.2.0" />
10+
<PackageReference Include="Faithlife.Build" Version="3.7.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎tools/Directory.Build.props

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

‎tools/XmlDocTarget/Program.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using System;
2+
3+
namespace XmlDocTarget
4+
{
5+
internal sealed class Program
6+
{
7+
private static void Main() => Console.WriteLine("Used for building documentation.");
8+
}
9+
}

‎tools/XmlDocTarget/XmlDocTarget.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\..\src\Facility.CodeGen.JavaScript\Facility.CodeGen.JavaScript.csproj" />
11+
</ItemGroup>
12+
13+
</Project>

0 commit comments

Comments
 (0)