- 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
This commit is contained in:
Doug Bunting 2018-01-24 15:24:17 -08:00
Родитель 2168804a35
Коммит b1946ab7d8
5 изменённых файлов: 29 добавлений и 10 удалений

Просмотреть файл

@ -2,9 +2,9 @@
- git config --global core.autocrlf true
branches:
only:
- /^release\/.*/
- dev
- /^(.*\/)?ci-.*$/
- /^rel\/.*/
configuration:
- Debug
- Release

Просмотреть файл

@ -3,33 +3,45 @@
# top-most EditorConfig file
root = true
# Don't use tabs for indentation.
[*]
indent_style = space
# Don't use tabs for indentation.
# (Please don't specify an indent_size here; that has too many unintended consequences.)
indent_style = space
# Where supported (e.g. in VS Code but not VS), add a final newline to files.
insert_final_newline = true
charset = utf-8
# Where supported, trim trailing whitespace on all lines.
trim_trailing_whitespace = true
# Where supported (e.g. in VS Code but not VS), add a final newline to files.
insert_final_newline = true
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
dotnet_sort_system_directives_first = true:warning
# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
[*.{*proj,vcxproj.filters,projitems}]
indent_size = 2
# Xml config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct,tasks,xml,yml}]
indent_size = 2
# JSON files
[*.json]
indent_size = 2
# PowerShell
[*.{ps1,psm1}]
indent_size = 4
# Shell
[*.sh]
indent_size = 4
end_of_line = lf
# Dotnet code style settings:
[*.cs]
# Sort using and Import directives with System.* appearing first

Просмотреть файл

@ -16,8 +16,8 @@ os:
osx_image: xcode8.2
branches:
only:
- /^release\/.*/
- dev
- /^rel\/.*$/
- /^(.*\/)?ci-.*$/
before_install:
- 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

Просмотреть файл

@ -3,8 +3,8 @@
<!-- In Directory.Build.targets because $(TargetFramework) may not be set when Directory.Build.props is imported. -->
<PropertyGroup>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.1.0-preview1-26016-05</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
<!-- In Directory.Build.targets because default items are added after Directory.Build.props is imported, causing invalid duplicate entries. -->

Просмотреть файл

@ -0,0 +1,7 @@
{
"Default": {
"rules": [
"DefaultCompositeRule"
]
}
}