Skip to content

Commit e0cba76

Browse files
ejballejball
committed
Merge template/faithlife-build.
2 parents d4c9d6f + e997fd7 commit e0cba76

26 files changed

Lines changed: 426 additions & 191 deletions

‎.editorconfig‎

Lines changed: 242 additions & 45 deletions
Large diffs are not rendered by default.

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
*.cs text diff=csharp
44
*.csproj text merge=union
55
*.sln text merge=union
6+
7+
*.g.cs linguist-generated=true

‎.github/workflows/build.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Build
2+
on:
3+
push:
4+
paths-ignore:
5+
- '*.md'
6+
- 'docs/**'
7+
branches:
8+
- '**'
9+
tags-ignore:
10+
- '**'
11+
pull_request:
12+
paths-ignore:
13+
- '*.md'
14+
- 'docs/**'
15+
env:
16+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
17+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
18+
jobs:
19+
build:
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
matrix:
23+
os: [ubuntu-latest, windows-latest, macos-latest]
24+
defaults:
25+
run:
26+
shell: pwsh
27+
steps:
28+
- name: Check out code
29+
uses: actions/checkout@v1
30+
- name: Set up .NET 5
31+
uses: actions/setup-dotnet@v1
32+
with:
33+
dotnet-version: 5.0.x
34+
- name: Restore
35+
run: .\build.ps1 restore
36+
- name: Build
37+
run: .\build.ps1 build --skip restore
38+
- name: Test
39+
run: .\build.ps1 test --skip build
40+
- name: Publish
41+
if: runner.os == 'Windows' && github.repository_owner == 'FacilityApi' && github.ref == 'refs/heads/master'
42+
env:
43+
BUILD_BOT_PASSWORD: ${{ secrets.BUILD_BOT_PASSWORD }}
44+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
45+
run: .\build.ps1 publish --skip test

‎.gitignore‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
.vs/
21
bin/
32
obj/
43
release/
4+
.vs/
55
node_modules/
6-
6+
Thumbs.db
77
*.cache
8-
*.log
8+
*.user
9+
*.userprefs
910
*.ncrunchproject
1011
*.ncrunchsolution
11-
*.user
12-
launchSettings.json
1312
nCrunchTemp*
1413
_ReSharper*
14+
.DS_Store
15+
launchSettings.json

‎CONTRIBUTING.md‎

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

‎Directory.Build.props‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
<PropertyGroup>
44
<VersionPrefix>2.2.0</VersionPrefix>
5-
<LangVersion>latest</LangVersion>
5+
<LangVersion>9.0</LangVersion>
66
<Nullable>enable</Nullable>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<NeutralLanguage>en-US</NeutralLanguage>
9-
<NoWarn>$(NoWarn);1591</NoWarn>
9+
<NoWarn>$(NoWarn);1591;1998;NU5105;CA1014</NoWarn>
1010
<DebugType>embedded</DebugType>
1111
<GitHubOrganization>FacilityApi</GitHubOrganization>
1212
<RepositoryName>FacilityJavaScript</RepositoryName>
1313
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1414
<PackageProjectUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName)</PackageProjectUrl>
15-
<PackageReleaseNotes>https://github.com/$(GitHubOrganization)/$(RepositoryName)/blob/master/VersionHistory.md#released</PackageReleaseNotes>
15+
<PackageReleaseNotes>https://github.com/$(GitHubOrganization)/$(RepositoryName)/blob/master/ReleaseNotes.md</PackageReleaseNotes>
1616
<RepositoryUrl>https://github.com/$(GitHubOrganization)/$(RepositoryName).git</RepositoryUrl>
1717
<Authors>Ed Ball</Authors>
1818
<Copyright>Copyright $(Authors)</Copyright>
1919
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2020
<EmbedUntrackedSources>true</EmbedUntrackedSources>
21+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
22+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
2123
<IsPackable>false</IsPackable>
2224
<IsTestProject>false</IsTestProject>
2325
</PropertyGroup>
@@ -27,8 +29,9 @@
2729
</PropertyGroup>
2830

2931
<ItemGroup>
30-
<PackageReference Include="Faithlife.Analyzers" Version="1.0.7" PrivateAssets="All" />
32+
<PackageReference Include="Faithlife.Analyzers" Version="1.0.7" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
3133
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
34+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
3235
</ItemGroup>
3336

3437
</Project>

‎FacilityJavaScript.sln‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
.gitattributes = .gitattributes
1010
.gitignore = .gitignore
1111
.travis.yml = .travis.yml
12-
appveyor.yml = appveyor.yml
13-
build.sh = build.sh
12+
build.ps1 = build.ps1
13+
.github\workflows\build.yaml = .github\workflows\build.yaml
1414
Directory.Build.props = Directory.Build.props
1515
LICENSE = LICENSE
16+
nuget.config = nuget.config
1617
ts\package.json = ts\package.json
1718
README.md = README.md
18-
VersionHistory.md = VersionHistory.md
19+
ReleaseNotes.md = ReleaseNotes.md
1920
EndProjectSection
2021
EndProject
2122
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facility.CodeGen.JavaScript", "src\Facility.CodeGen.JavaScript\Facility.CodeGen.JavaScript.csproj", "{89B9867C-5124-49BE-B201-0F1D8E9F7738}"
@@ -24,14 +25,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "fsdgenjs", "src\fsdgenjs\fs
2425
EndProject
2526
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facility.CodeGen.JavaScript.UnitTests", "tests\Facility.CodeGen.JavaScript.UnitTests\Facility.CodeGen.JavaScript.UnitTests.csproj", "{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}"
2627
EndProject
27-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}"
28-
EndProject
2928
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{3A881397-73AC-426F-B31A-94EE463117C4}"
3029
ProjectSection(SolutionItems) = preProject
3130
example\ExampleApi.fsd = example\ExampleApi.fsd
3231
EndProjectSection
3332
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocTarget", "tools\XmlDocTarget\XmlDocTarget.csproj", "{59609610-A4A7-40AF-B147-63BEA7C6BE69}"
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{9D6DC519-8908-4D3A-B16B-118D682BD170}"
34+
EndProject
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocGen", "tools\XmlDocGen\XmlDocGen.csproj", "{636E5B36-4AA8-47D8-884C-AE4D80B49A14}"
3536
EndProject
3637
Global
3738
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,14 +52,14 @@ Global
5152
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Debug|Any CPU.Build.0 = Debug|Any CPU
5253
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Release|Any CPU.ActiveCfg = Release|Any CPU
5354
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{1DB8FEAA-01BF-4387-B9A1-4CBA900232B3}.Release|Any CPU.Build.0 = Release|Any CPU
58-
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59-
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Release|Any CPU.ActiveCfg = Release|Any CPU
61-
{59609610-A4A7-40AF-B147-63BEA7C6BE69}.Release|Any CPU.Build.0 = Release|Any CPU
55+
{9D6DC519-8908-4D3A-B16B-118D682BD170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56+
{9D6DC519-8908-4D3A-B16B-118D682BD170}.Debug|Any CPU.Build.0 = Debug|Any CPU
57+
{9D6DC519-8908-4D3A-B16B-118D682BD170}.Release|Any CPU.ActiveCfg = Release|Any CPU
58+
{9D6DC519-8908-4D3A-B16B-118D682BD170}.Release|Any CPU.Build.0 = Release|Any CPU
59+
{636E5B36-4AA8-47D8-884C-AE4D80B49A14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{636E5B36-4AA8-47D8-884C-AE4D80B49A14}.Debug|Any CPU.Build.0 = Debug|Any CPU
61+
{636E5B36-4AA8-47D8-884C-AE4D80B49A14}.Release|Any CPU.ActiveCfg = Release|Any CPU
62+
{636E5B36-4AA8-47D8-884C-AE4D80B49A14}.Release|Any CPU.Build.0 = Release|Any CPU
6263
EndGlobalSection
6364
GlobalSection(SolutionProperties) = preSolution
6465
HideSolutionNode = FALSE

‎FacilityJavaScript.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Build/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Build"&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CppClangTidyCleanupDescriptor /&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" ArrangeCodeBodyStyle="False" ArrangeVarStyle="True" ArrangeTrailingCommas="True" /&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;/Profile&gt;</s:String></wpf:ResourceDictionary>

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright 2020 Ed Ball
3+
Copyright 2021 Ed Ball
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Facility JavaScript and TypeScript Support
22

33
[JavaScript and TypeScript support](https://facilityapi.github.io/generate/javascript) for the [Facility API Framework](https://facilityapi.github.io/).
4-
[![AppVeyor](https://img.shields.io/appveyor/ci/ejball/facilityjavascript.svg)](https://ci.appveyor.com/project/ejball/facilityjavascript)
4+
[![Build](https://github.com/FacilityApi/FacilityJavaScript/workflows/Build/badge.svg)](https://github.com/FacilityApi/FacilityJavaScript/actions?query=workflow%3ABuild)
55
[![Travis CI](https://travis-ci.org/FacilityApi/FacilityJavaScript.svg?branch=master)](https://travis-ci.org/FacilityApi/FacilityJavaScript)
66

77
Name | Description | npm/NuGet
@@ -10,7 +10,5 @@ facility-core | Common code for the Facility API Framework. | [![npm](https://im
1010
fsdgenjs | A tool that generates JavaScript or TypeScript for a Facility Service Definition. | [![NuGet](https://img.shields.io/nuget/v/fsdgenjs.svg)](https://www.nuget.org/packages/fsdgenjs)
1111
Facility.CodeGen.JavaScript | A library that generates JavaScript or TypeScript for a Facility Service Definition. | [![NuGet](https://img.shields.io/nuget/v/Facility.CodeGen.JavaScript.svg)](https://www.nuget.org/packages/Facility.CodeGen.JavaScript)
1212

13-
* Documentation: https://facilityapi.github.io/
14-
* License: [MIT](LICENSE)
15-
* [Version History](VersionHistory.md)
16-
* [Contributing Guidelines](CONTRIBUTING.md)
13+
* [Documentation](https://facilityapi.github.io/)
14+
* [Release Notes](ReleaseNotes.md)

0 commit comments

Comments
 (0)