Skip to content
This repository was archived by the owner on Oct 18, 2018. It is now read-only.

Commit b1946ab

Browse files
committed
Clean up build infrastructure
- missing NuGetPackageVerifier.json - correct `$(RuntimeFrameworkVersion)` settings that weren't using properties - build release branches on AppVeyor and Travis - copy a couple of .editorconfig from Universe just in case
1 parent 2168804 commit b1946ab

File tree

5 files changed

+29
-10
lines changed

5 files changed

+29
-10
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
- git config --global core.autocrlf true
33
branches:
44
only:
5+
- /^release\/.*/
56
- dev
67
- /^(.*\/)?ci-.*$/
7-
- /^rel\/.*/
88
configuration:
99
- Debug
1010
- Release

.editorconfig

+18-6
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,45 @@
33
# top-most EditorConfig file
44
root = true
55

6-
# Don't use tabs for indentation.
76
[*]
8-
indent_style = space
7+
# Don't use tabs for indentation.
98
# (Please don't specify an indent_size here; that has too many unintended consequences.)
9+
indent_style = space
1010

11-
# Where supported (e.g. in VS Code but not VS), add a final newline to files.
12-
insert_final_newline = true
11+
charset = utf-8
1312

1413
# Where supported, trim trailing whitespace on all lines.
1514
trim_trailing_whitespace = true
1615

16+
# Where supported (e.g. in VS Code but not VS), add a final newline to files.
17+
insert_final_newline = true
18+
1719
# Code files
1820
[*.{cs,csx,vb,vbx}]
1921
indent_size = 4
22+
dotnet_sort_system_directives_first = true:warning
2023

2124
# Xml project files
22-
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
25+
[*.{*proj,vcxproj.filters,projitems}]
2326
indent_size = 2
2427

2528
# Xml config files
26-
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
29+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct,tasks,xml,yml}]
2730
indent_size = 2
2831

2932
# JSON files
3033
[*.json]
3134
indent_size = 2
3235

36+
# PowerShell
37+
[*.{ps1,psm1}]
38+
indent_size = 4
39+
40+
# Shell
41+
[*.sh]
42+
indent_size = 4
43+
end_of_line = lf
44+
3345
# Dotnet code style settings:
3446
[*.cs]
3547
# Sort using and Import directives with System.* appearing first

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ os:
1616
osx_image: xcode8.2
1717
branches:
1818
only:
19+
- /^release\/.*/
1920
- dev
20-
- /^rel\/.*$/
2121
- /^(.*\/)?ci-.*$/
2222
before_install:
2323
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi

Directory.Build.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<!-- In Directory.Build.targets because $(TargetFramework) may not be set when Directory.Build.props is imported. -->
55
<PropertyGroup>
6-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
7-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.1.0-preview1-26016-05</RuntimeFrameworkVersion>
6+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
7+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
88
</PropertyGroup>
99

1010
<!-- In Directory.Build.targets because default items are added after Directory.Build.props is imported, causing invalid duplicate entries. -->

NuGetPackageVerifier.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"Default": {
3+
"rules": [
4+
"DefaultCompositeRule"
5+
]
6+
}
7+
}

0 commit comments

Comments
 (0)