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

Skip to content

Commit 92dbf56

Browse files
ejballejball
committed
Upgrade to new csproj, etc.
1 parent e17f875 commit 92dbf56

27 files changed

+340
-567
lines changed

‎.editorconfig

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,74 @@ root = true
22

33
[*]
44
charset = utf-8
5-
indent_size = 2
65
indent_style = space
7-
insert_final_newline = true
6+
indent_size = 2
87
trim_trailing_whitespace = true
8+
insert_final_newline = true
9+
end_of_line = lf
910

10-
[*.{cake,cs,fsd,ts}]
11-
indent_size = 4
11+
[*.{cake,fsd}]
1212
indent_style = tab
13+
indent_size = 4
14+
15+
[*.{ps1,sh}]
16+
indent_size = 4
17+
18+
[*.csproj]
19+
insert_final_newline = false
1320

14-
[*.ps1]
21+
[*.cs]
22+
indent_style = tab
1523
indent_size = 4
24+
25+
# changes from VS2017 defaults
26+
csharp_style_expression_bodied_methods = true : suggestion
27+
csharp_style_expression_bodied_constructors = true : suggestion
28+
csharp_style_expression_bodied_operators = true : suggestion
29+
csharp_prefer_braces = false : none
30+
csharp_indent_switch_labels = false
31+
csharp_space_after_cast = true
32+
csharp_preserve_single_line_statements = false
33+
34+
# use VS2017 defaults, but make them warnings (instead of none)
35+
dotnet_style_qualification_for_field = false : warning
36+
dotnet_style_qualification_for_property = false : warning
37+
dotnet_style_qualification_for_method = false : warning
38+
dotnet_style_qualification_for_event = false : warning
39+
dotnet_style_predefined_type_for_locals_parameters_members = true : warning
40+
dotnet_style_explicit_tuple_names = true : warning
41+
dotnet_style_coalesce_expression = true : warning
42+
43+
# use VS2017 defaults, but make them suggestions (instead of none)
44+
csharp_style_var_for_built_in_types = true : suggestion
45+
csharp_style_var_when_type_is_apparent = true : suggestion
46+
csharp_style_var_elsewhere = true : suggestion
47+
csharp_style_expression_bodied_properties = true : suggestion
48+
csharp_style_expression_bodied_indexers = true : suggestion
49+
csharp_style_expression_bodied_accessors = true : suggestion
50+
51+
# explicitly use VS2017 defaults
52+
dotnet_style_object_initializer = true : suggestion
53+
dotnet_style_collection_initializer = true : suggestion
54+
dotnet_style_null_propagation = true : suggestion
55+
csharp_style_pattern_matching_over_is_with_cast_check = true : suggestion
56+
csharp_style_pattern_matching_over_as_with_null_check = true : suggestion
57+
csharp_style_inlined_variable_declaration = true : suggestion
58+
csharp_prefer_simple_default_expression = true : suggestion
59+
csharp_style_throw_expression = true : suggestion
60+
csharp_style_conditional_delegate_call = true : suggestion
61+
dotnet_sort_system_directives_first = true
62+
csharp_new_line_before_open_brace = all
63+
csharp_new_line_before_else = true
64+
csharp_new_line_before_catch = true
65+
csharp_new_line_before_finally = true
66+
csharp_new_line_before_members_in_object_initializers = true
67+
csharp_new_line_before_members_in_anonymous_types = true
68+
csharp_new_line_within_query_expression_clauses = true
69+
csharp_indent_case_contents = true
70+
csharp_indent_labels = one_less
71+
csharp_space_after_keywords_in_control_flow_statements = true
72+
csharp_space_between_method_declaration_parameter_list_parentheses = false
73+
csharp_space_between_method_call_parameter_list_parentheses = false
74+
csharp_space_between_parentheses = false
75+
csharp_preserve_single_line_blocks = true

‎.gitattributes

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
* text=auto
1+
* text=auto eol=lf
2+
3+
*.cs text diff=csharp
4+
*.csproj text merge=union
5+
*.sln text eol=crlf merge=union

‎.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
.vs/
2-
.vscode/
32
bin/
43
cake/
5-
node_modules/
64
obj/
7-
packages/
85
release/
96

107
*.cache
11-
*.log
128
*.ncrunchproject
139
*.ncrunchsolution
1410
*.user
11+
nCrunchTemp*
12+
*.log

‎CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Contributing to FacilityJavaScript
2+
3+
## Prerequisites
4+
5+
* Install [Visual Studio 2017](https://www.visualstudio.com/downloads/) or [Visual Studio Code](https://code.visualstudio.com/) with the [editorconfig extension](https://github.com/editorconfig/editorconfig-vscode).
6+
* Install [.NET Core 2.0](https://www.microsoft.com/net/core).
7+
8+
## Guidelines
9+
10+
* All new code **must** have complete unit tests.
11+
* All public classes, methods, interfaces, enums, etc. **must** have correct XML documentation comments.
12+
* Update [VersionHistory](VersionHistory.md) with a human-readable description of the change.
13+
14+
## How to Build
15+
16+
* Clone the repository: `git clone https://github.com/FacilityApi/FacilityJavaScript.git`
17+
* `cd FacilityJavaScript`
18+
* `.\build.ps1 --target=Test` or `./build.sh --target=Test`

‎FacilityJavaScript.sln

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27130.2036
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{A219E328-B15A-41FF-BAA5-5F46679EF9C8}"
77
ProjectSection(SolutionItems) = preProject
@@ -18,37 +18,40 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{A219E328-B
1818
SolutionInfo.cs = SolutionInfo.cs
1919
EndProjectSection
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fsdgenjs", "src\fsdgenjs\fsdgenjs.csproj", "{3B9A5F61-E874-4A5A-BB5F-436990E521F3}"
22-
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facility.CodeGen.JavaScript", "src\Facility.CodeGen.JavaScript\Facility.CodeGen.JavaScript.csproj", "{B6EA1C94-27CD-4602-8544-6D16D225917F}"
24-
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facility.CodeGen.JavaScript.UnitTests", "tests\Facility.CodeGen.JavaScript.UnitTests\Facility.CodeGen.JavaScript.UnitTests.csproj", "{EADECDC8-65A8-47A7-91ED-10CA49F15B97}"
26-
EndProject
2721
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{F6D4394D-08C3-4BB8-9D56-0462BCCF4BE9}"
2822
ProjectSection(SolutionItems) = preProject
2923
example\ExampleApi.fsd = example\ExampleApi.fsd
3024
EndProjectSection
3125
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facility.CodeGen.JavaScript", "src\Facility.CodeGen.JavaScript\Facility.CodeGen.JavaScript.csproj", "{89B9867C-5124-49BE-B201-0F1D8E9F7738}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "fsdgenjs", "src\fsdgenjs\fsdgenjs.csproj", "{7AA54CE8-D908-4FBB-9D81-111DE0C29E8F}"
29+
EndProject
30+
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}"
31+
EndProject
3232
Global
3333
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3434
Debug|Any CPU = Debug|Any CPU
3535
Release|Any CPU = Release|Any CPU
3636
EndGlobalSection
3737
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38-
{3B9A5F61-E874-4A5A-BB5F-436990E521F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{3B9A5F61-E874-4A5A-BB5F-436990E521F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{3B9A5F61-E874-4A5A-BB5F-436990E521F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{3B9A5F61-E874-4A5A-BB5F-436990E521F3}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{B6EA1C94-27CD-4602-8544-6D16D225917F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{B6EA1C94-27CD-4602-8544-6D16D225917F}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{B6EA1C94-27CD-4602-8544-6D16D225917F}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{B6EA1C94-27CD-4602-8544-6D16D225917F}.Release|Any CPU.Build.0 = Release|Any CPU
46-
{EADECDC8-65A8-47A7-91ED-10CA49F15B97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{EADECDC8-65A8-47A7-91ED-10CA49F15B97}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{EADECDC8-65A8-47A7-91ED-10CA49F15B97}.Release|Any CPU.ActiveCfg = Release|Any CPU
49-
{EADECDC8-65A8-47A7-91ED-10CA49F15B97}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{89B9867C-5124-49BE-B201-0F1D8E9F7738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{89B9867C-5124-49BE-B201-0F1D8E9F7738}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{89B9867C-5124-49BE-B201-0F1D8E9F7738}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{89B9867C-5124-49BE-B201-0F1D8E9F7738}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{7AA54CE8-D908-4FBB-9D81-111DE0C29E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{7AA54CE8-D908-4FBB-9D81-111DE0C29E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{7AA54CE8-D908-4FBB-9D81-111DE0C29E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{7AA54CE8-D908-4FBB-9D81-111DE0C29E8F}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{E4E67F1B-A9E3-47A9-A05B-D517A50EA606}.Release|Any CPU.Build.0 = Release|Any CPU
5050
EndGlobalSection
5151
GlobalSection(SolutionProperties) = preSolution
5252
HideSolutionNode = FALSE
5353
EndGlobalSection
54+
GlobalSection(ExtensibilityGlobals) = postSolution
55+
SolutionGuid = {258EAD6F-902F-4B6D-83A2-EA3AD001A385}
56+
EndGlobalSection
5457
EndGlobal

‎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 (c) 2016-2017 Ed Ball
3+
Copyright (c) 2016-2018 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: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
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-
5-
[![Build Status](https://travis-ci.org/FacilityApi/FacilityJavaScript.svg?branch=master)](https://travis-ci.org/FacilityApi/FacilityJavaScript)
6-
[![Build Status](https://ci.appveyor.com/api/projects/status/hpyavxt83gfqd491?svg=true)](https://ci.appveyor.com/project/ejball/facilityjavascript)
7-
[![Coverage Status](https://coveralls.io/repos/github/FacilityApi/FacilityJavaScript/badge.svg?branch=master)](https://coveralls.io/github/FacilityApi/FacilityJavaScript?branch=master)
4+
[![AppVeyor](https://img.shields.io/appveyor/ci/ejball/facilityjavascript.svg)](https://ci.appveyor.com/project/ejball/facilityjavascript)
5+
[![Travis CI](https://travis-ci.org/FacilityApi/FacilityJavaScript.svg?branch=master)](https://travis-ci.org/FacilityApi/FacilityJavaScript)
86

97
## facility-core
108

@@ -17,3 +15,10 @@ A tool that generates JavaScript or TypeScript for a Facility Service Definition
1715
## Facility.CodeGen.JavaScript
1816

1917
Used by fsdgenjs to generate 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)
18+
19+
## Documentation
20+
21+
* https://facilityapi.github.io/
22+
* License: [MIT](LICENSE)
23+
* [Version History](VersionHistory.md)
24+
* [Contributing Guidelines](CONTRIBUTING.md)

‎SolutionInfo.cs

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

‎SolutionInfo.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<VersionPrefix>2.0.0</VersionPrefix>
5+
<Copyright>Copyright 2016-2018 Ed Ball</Copyright>
6+
<Authors>Ed Ball</Authors>
7+
<PackageLicenseUrl>https://raw.githubusercontent.com/FacilityApi/FacilityJavaScript/master/LICENSE</PackageLicenseUrl>
8+
<PackageProjectUrl>https://github.com/FacilityApi/FacilityJavaScript</PackageProjectUrl>
9+
<PackageReleaseNotes>https://github.com/FacilityApi/FacilityJavaScript/blob/master/VersionHistory.md#released</PackageReleaseNotes>
10+
<RepositoryUrl>https://github.com/FacilityApi/FacilityJavaScript.git</RepositoryUrl>
11+
<SourceLinkUrl>https://raw.githubusercontent.com/FacilityApi/FacilityJavaScript/{commit}/*</SourceLinkUrl>
12+
<SourceLinkOriginUrl>https://github.com/FacilityApi/FacilityJavaScript.git</SourceLinkOriginUrl>
13+
</PropertyGroup>
14+
15+
</Project>

‎VersionHistory.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Version History
2+
3+
## Pending
4+
5+
Add changes here when they're committed to the `master` branch. Move them to "Released" once the version number
6+
is updated in preparation for publishing an updated NuGet package.
7+
8+
Prefix the description of the change with `[major]`, `[minor]` or `[patch]` in accordance with [SemVer](http://semver.org).
9+
10+
* [major] Upgrade to .NET Standard 2.0 and .NET 4.6.1. Upgrade NuGet dependencies.
11+
12+
## Released
13+
14+
### 1.3.0
15+
16+
* Start tracking version history.

‎appveyor.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
version: '{build}'
2+
image:
3+
- Visual Studio 2017
4+
- Ubuntu
25
environment:
3-
COVERALLSAPIKEY:
4-
secure: +3piz+KU6kTBtLXxADrKxJmnKQcJTHwpBICVolk5bH/8GbNgW5ZrGr6WYEp9KWSm
6+
NUGETAPIKEY:
7+
secure: eBKIUm4YxcrbL3oVC/ZCBUA/inEu+7OMbKpgftpOc18ievKNwH8UAUB2t4w+89Xv
8+
BUILD_BOT_PASSWORD:
9+
secure: U2EQbBdxNIC2FL8YeOP3bVixlZ4xLBdN71Szraw+ATqAhYZwEd6JCjCJZLJPu9kN
10+
APPVEYOR_YML_DISABLE_PS_LINUX: true
511
build_script:
6-
- ps: .\build.ps1 -target=CoveragePublish -configuration=Debug "-coverallsApiKey=$env:COVERALLSAPIKEY"
12+
- ps: .\build.ps1 --target=NuGetPublish """--trigger=$env:APPVEYOR_REPO_TAG_NAME""" "--nugetApiKey=$env:NUGETAPIKEY"
13+
- sh: ./build.sh --target=NuGetPackage "--trigger=$APPVEYOR_REPO_TAG_NAME"
714
test: off

0 commit comments

Comments
 (0)