Skip to content

Commit

Permalink
Build improvements (#714)
Browse files Browse the repository at this point in the history 
* add .netstandard 2 build

* Use .NET Core tool

* .editorconfig update

* update build script

* update approver test

* remove pcl reference
  • Loading branch information
Oren Novotny authored Jun 9, 2018
1 parent 6fc9950 commit ed4c548
Show file tree
Hide file tree
Showing 53 changed files with 131 additions and 887 deletions.
1 change: 1 addition & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_require_accessibility_modifiers = always
dotnet_style_prefer_conditional_expression_over_return = false

# CSharp code style settings:
[*.cs]
Expand Down
9 changes: 5 additions & 4 deletions .vsts-shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ steps:
displayName: Setup Environment Variables

- task: NuGetToolInstaller@0
displayName: Use NuGet 4.6.2
displayName: Use NuGet 4.7.0
inputs:
versionSpec: 4.6.2
versionSpec: 4.7.0

- task: DotNetCoreCLI@2
inputs:
Expand All @@ -31,9 +31,10 @@ steps:
# version
nuget install NerdBank.GitVersioning -SolutionDir $(Build.SourcesDirectory) -Verbosity quiet -ExcludeVersion
$vers = & $(Build.SourcesDirectory)\packages\nerdbank.gitversioning\tools\Get-Version.ps1
$nugetVer = $vers.NuGetPackageVersion
$nugetVer = $vers.NuGetPackageVersion
$commitId = $vers.GitCommitId
ls .\NuSpecs\*.nuspec | %{ nuget pack $_.FullName -version "$nugetVer" -BasePath "src" -NoPackageAnalysis -OutputDirectory $(Build.ArtifactStagingDirectory)\Packages }
ls .\NuSpecs\*.nuspec | %{ nuget pack $_.FullName -version "$nugetVer" -BasePath "src" -NoPackageAnalysis -OutputDirectory $(Build.ArtifactStagingDirectory)\Packages -Properties "RepositoryType=git;RepositoryCommit=$commitId;RepositoryUrl=https://github.com/Humanizr/Humanizer"}
displayName: Create packages

- task: DotNetCoreCLI@2
Expand Down
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.af.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (af)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>af</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\af\*.*" target="lib\netstandard1.0\af" />
<file src="Humanizer\bin\Release\netstandard2.0\af\*.*" target="lib\netstandard2.0\af" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.ar.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (ar)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>ar</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\ar\*.*" target="lib\netstandard1.0\ar" />
<file src="Humanizer\bin\Release\netstandard2.0\ar\*.*" target="lib\netstandard2.0\ar" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.bg.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (bg)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>bg</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\bg\*.*" target="lib\netstandard1.0\bg" />
<file src="Humanizer\bin\Release\netstandard2.0\bg\*.*" target="lib\netstandard2.0\bg" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.bn-BD.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (bn-BD)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>bn-BD</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\bn-BD\*.*" target="lib\netstandard1.0\bn-BD" />
<file src="Humanizer\bin\Release\netstandard2.0\bn-BD\*.*" target="lib\netstandard2.0\bn-BD" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.cs.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (cs)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>cs</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\cs\*.*" target="lib\netstandard1.0\cs" />
<file src="Humanizer\bin\Release\netstandard2.0\cs\*.*" target="lib\netstandard2.0\cs" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.da.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (da)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>da</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\da\*.*" target="lib\netstandard1.0\da" />
<file src="Humanizer\bin\Release\netstandard2.0\da\*.*" target="lib\netstandard2.0\da" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.de.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (de)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>de</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\de\*.*" target="lib\netstandard1.0\de" />
<file src="Humanizer\bin\Release\netstandard2.0\de\*.*" target="lib\netstandard2.0\de" />
</files>
</package>
3 changes: 2 additions & 1 deletion NuSpecs/Humanizer.Core.el.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
<description>Humanizer Locale (el)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>el</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\el\*.*" target="lib\netstandard1.0\el" />
<file src="Humanizer\bin\Release\netstandard2.0\el\*.*" target="lib\netstandard2.0\el" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.es.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (es)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>es</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\es\*.*" target="lib\netstandard1.0\es" />
<file src="Humanizer\bin\Release\netstandard2.0\es\*.*" target="lib\netstandard2.0\es" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.fa.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (fa)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>fa</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\fa\*.*" target="lib\netstandard1.0\fa" />
<file src="Humanizer\bin\Release\netstandard2.0\fa\*.*" target="lib\netstandard2.0\fa" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.fi-FI.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (fi-FI)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>fi-FI</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\fi-FI\*.*" target="lib\netstandard1.0\fi-FI" />
<file src="Humanizer\bin\Release\netstandard2.0\fi-FI\*.*" target="lib\netstandard2.0\fi-FI" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.fr-BE.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (fr-BE)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>fr-BE</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\fr-BE\*.*" target="lib\netstandard1.0\fr-BE" />
<file src="Humanizer\bin\Release\netstandard2.0\fr-BE\*.*" target="lib\netstandard2.0\fr-BE" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.fr.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (fr)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>fr</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\fr\*.*" target="lib\netstandard1.0\fr" />
<file src="Humanizer\bin\Release\netstandard2.0\fr\*.*" target="lib\netstandard2.0\fr" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.he.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (he)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>he</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\he\*.*" target="lib\netstandard1.0\he" />
<file src="Humanizer\bin\Release\netstandard2.0\he\*.*" target="lib\netstandard2.0\he" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.hr.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (hr)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>hr</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\hr\*.*" target="lib\netstandard1.0\hr" />
<file src="Humanizer\bin\Release\netstandard2.0\hr\*.*" target="lib\netstandard2.0\hr" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.hu.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (hu)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>hu</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\hu\*.*" target="lib\netstandard1.0\hu" />
<file src="Humanizer\bin\Release\netstandard2.0\hu\*.*" target="lib\netstandard2.0\hu" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.id.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (id)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>id</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\id\*.*" target="lib\netstandard1.0\id" />
<file src="Humanizer\bin\Release\netstandard2.0\id\*.*" target="lib\netstandard2.0\id" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.it.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (it)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>it</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\it\*.*" target="lib\netstandard1.0\it" />
<file src="Humanizer\bin\Release\netstandard2.0\it\*.*" target="lib\netstandard2.0\it" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.ja.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (ja)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>ja</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\ja\*.*" target="lib\netstandard1.0\ja" />
<file src="Humanizer\bin\Release\netstandard2.0\ja\*.*" target="lib\netstandard2.0\ja" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.lv.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (lv)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>lv</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\lv\*.*" target="lib\netstandard1.0\lv" />
<file src="Humanizer\bin\Release\netstandard2.0\lv\*.*" target="lib\netstandard2.0\lv" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.nb-NO.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (nb-NO)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>nb-NO</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\nb-NO\*.*" target="lib\netstandard1.0\nb-NO" />
<file src="Humanizer\bin\Release\netstandard2.0\nb-NO\*.*" target="lib\netstandard2.0\nb-NO" />
</files>
</package>
2 changes: 2 additions & 0 deletions NuSpecs/Humanizer.Core.nb.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
<description>Humanizer Locale (nb)</description>
<copyright>Copyright 2012-2015 Mehdi Khalili</copyright>
<licenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</licenseUrl>
<repository type="$RepositoryType$" url="$RepositoryUrl$" commit="$RepositoryCommit$" />
<language>nb</language>
<dependencies>
<dependency id="Humanizer.Core" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="Humanizer\bin\Release\netstandard1.0\nb\*.*" target="lib\netstandard1.0\nb" />
<file src="Humanizer\bin\Release\netstandard2.0\nb\*.*" target="lib\netstandard2.0\nb" />
</files>
</package>
Loading

0 comments on commit ed4c548

Please sign in to comment.