v4.0.0

.gitattributes

@@ -20,27 +20,9 @@
 *.filters    text eol=crlf
 *.vcxitems   text eol=crlf
 
-
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-#*.xproj     merge=binary
-#*.props     merge=binary
-#*.filters   merge=binary
-#*.vcxitems  merge=binary
-
 # C#
-*.cs     diff=csharp
+*.cs    diff=csharp
+*.g.cs  linguist-generated
 
 # Powershell
 *.ps1    text  eol=crlf

Build/Test.ps1

@@ -0,0 +1,17 @@
+$root = Resolve-Path $PSScriptRoot/..
+
+[int]$exitCode = 0
+
+# When this change is made available, we can possibly simplify below with: `dotnet test MySolution.sln`
+# Run tests only for test projects by smadala · Pull Request #1745 · Microsoft/vstest
+# https://github.com/Microsoft/vstest/pull/1745
+Get-ChildItem -Path $root -Recurse -Filter "*Tests*.csproj" | % {
+    $projectFilePath = $_.FullName
+    $projectName = [IO.Path]::GetFileNameWithoutExtension($projectFilePath)
+    $reportFilePath = [IO.Path]::GetFullPath("$root/TestResults/$projectName.xml")
+    dotnet test $projectFilePath --logger "trx;LogFileName=$reportFilePath"
+    if ($LASTEXITCODE) { $exitCode = $LASTEXITCODE }
+}
+
+Write-Host -ForegroundColor Green "All tests run."
+exit $exitCode

Build/build-functions.psm1

@@ -28,7 +28,14 @@ function Update-GeneratedCode {
 
 function Start-Build([boolean] $skipUWP = $false) {
   write-host -foreground blue "Start-Build...`n---"
-  dotnet build --configuration Release "$root\UnitsNet.sln"
+
+  $fileLoggerArg = "/logger:FileLogger,Microsoft.Build;logfile=$testReportDir\UnitsNet.msbuild.log"
+
+  $appVeyorLoggerDll = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  $appVeyorLoggerNetCoreDll = "C:\Program Files\AppVeyor\BuildAgent\dotnetcore\Appveyor.MSBuildLogger.dll"
+  $appVeyorLoggerArg = if (Test-Path "$appVeyorLoggerNetCoreDll") { "/logger:$appVeyorLoggerNetCoreDll" } else { "" }
+
+  dotnet build --configuration Release "$root\UnitsNet.sln" $fileLoggerArg $appVeyorLoggerArg
   if ($lastexitcode -ne 0) { exit 1 }
 
   if ($skipUWP -eq $true)
@@ -37,11 +44,14 @@ function Start-Build([boolean] $skipUWP = $false) {
   }
   else
   {
+    $fileLoggerArg = "/logger:FileLogger,Microsoft.Build;logfile=$testReportDir\UnitsNet.WindowsRuntimeComponent.msbuild.log"
+    $appVeyorLoggerArg = if (Test-Path "$appVeyorLoggerDll") { "/logger:$appVeyorLoggerDll" } else { "" }
+
     # dontnet CLI does not support WindowsRuntimeComponent project type yet
     # msbuild does not auto-restore nugets for this project type
     write-host -foreground yellow "WindowsRuntimeComponent project not yet supported by dotnet CLI, using MSBuild15 instead"
     & "$msbuild" "$root\UnitsNet.WindowsRuntimeComponent.sln" /verbosity:minimal /p:Configuration=Release /t:restore
-    & "$msbuild" "$root\UnitsNet.WindowsRuntimeComponent.sln" /verbosity:minimal /p:Configuration=Release
+    & "$msbuild" "$root\UnitsNet.WindowsRuntimeComponent.sln" /verbosity:minimal /p:Configuration=Release $fileLoggerArg $appVeyorLoggerArg
     if ($lastexitcode -ne 0) { exit 1 }
   }
 
@@ -56,7 +66,7 @@ function Start-Tests {
     )
 
   # Parent dir must exist before xunit tries to write files to it
-  new-item -type directory $testReportDir 1> $null
+  new-item -type directory -force $testReportDir 1> $null
 
   write-host -foreground blue "Run tests...`n---"
   foreach ($projectPath in $projectPaths) {
@@ -68,7 +78,7 @@ function Start-Tests {
     # https://github.com/xunit/xunit/issues/1216
     push-location $projectDir
     # -nobuild  <-- this gives an error, but might want to use this to avoid extra builds
-    dotnet xunit -configuration Release -framework netcoreapp1.1 -xml $reportFile -nobuild
+    dotnet xunit -configuration Release -framework netcoreapp2.0 -xml $reportFile -nobuild
     if ($lastexitcode -ne 0) { exit 1 }
     pop-location
   }
@@ -79,9 +89,7 @@ function Start-Tests {
 function Start-PackNugets {
   $projectPaths = @(
     "UnitsNet\UnitsNet.csproj",
-    "UnitsNet\UnitsNet.Signed.csproj",
-    "UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.csproj",
-    "UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.Signed.csproj"
+    "UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.csproj"
     )
 
   write-host -foreground blue "Pack nugets...`n---"
@@ -91,7 +99,7 @@ function Start-PackNugets {
   }
 
   write-host -foreground yellow "WindowsRuntimeComponent project not yet supported by dotnet CLI, using nuget.exe instead"
-  & $nuget pack "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir" -Symbols
+  & $nuget pack "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"
 
   write-host -foreground blue "Pack nugets...END`n"
 }

Build/clean.ps1

@@ -1,8 +1,27 @@
+# Don't allow using undeclared variables
+Set-Strictmode -version latest
+
 $root = "$PSScriptRoot\.."
-$artifactsDir = "$root\Artifacts"
-if (test-path $artifactsDir) {
-  write-host -foreground blue "Delete Artifacts dir"
-  rm -r -fo $artifactsDir -ErrorAction Continue
+Write-Host -Foreground Blue "Delete dirs: bin, obj"
+
+[int]$deleteCount = 0
+[array]$failedToDeleteDirs = @()
+Get-ChildItem $root -Include bin,obj -Recurse -Force | %{
+  Remove-Item -Recurse -Force -ErrorAction SilentlyContinue $_.FullName
+  if ($?) { $deleteCount++ }
+  else {
+    $failedToDeleteDirs += $_
+  }
 }
-write-host -foreground blue "Delete dirs: bin, obj"
-ls $root -inc bin,obj -r -fo | ri -r -fo -ErrorAction SilentlyContinue
+
+Write-Host -Foreground Green "Deleted $deleteCount folders."
+
+if ($failedToDeleteDirs) {
+  $failCount = $failedToDeleteDirs.Count
+  Write-Host ""
+  Write-Host -Foreground Red "Failed to delete $failCount dirs:"
+  $failedToDeleteDirs | %{ 
+    Write-Host -Foreground Red $_.FullName
+  }
+  exit /B 1
+}

Build/set-version-UnitsNet.Serialization.JsonNet.ps1

@@ -48,12 +48,12 @@ Import-Module "$PSScriptRoot\set-version.psm1"
 
 $root = Resolve-Path "$PSScriptRoot\.."
 $paramSet = $PsCmdlet.ParameterSetName
-$commonPropsFile = "$root\UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.Common.props"
-$versionFiles = @($commonPropsFile)
+$projFile = "$root\UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.csproj"
+$versionFiles = @($projFile)
 $projectName = "JsonNet"
 
 # Use UnitsNet.Common.props version as base if bumping major/minor/patch
-$newVersion = Get-NewProjectVersion $commonPropsFile $paramSet $setVersion $bumpVersion
+$newVersion = Get-NewProjectVersion $projFile $paramSet $setVersion $bumpVersion
 
-Set-ProjectVersion $commonPropsFile $newVersion
-Invoke-CommitAndTagVersion $projectName $versionFiles $newVersion
+Set-ProjectVersion $projFile $newVersion
+Invoke-CommitAndTagVersion $projectName $versionFiles $newVersion

Build/set-version-UnitsNet.ps1

@@ -50,16 +50,16 @@ Import-Module "$PSScriptRoot\set-version.psm1"
 
 $root = Resolve-Path "$PSScriptRoot\.."
 $paramSet = $PsCmdlet.ParameterSetName
-$commonPropsFile = "$root\UnitsNet\UnitsNet.Common.props"
+$projFile = "$root\UnitsNet\UnitsNet.csproj"
 $winrtAssemblyInfoFile = "$root\UnitsNet\Properties\AssemblyInfo.WindowsRuntimeComponent.cs"
 $winrtNuspecFile = "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec"
-$versionFiles = @($commonPropsFile, $winrtAssemblyInfoFile, $winrtNuspecFile)
+$versionFiles = @($projFile, $winrtAssemblyInfoFile, $winrtNuspecFile)
 $projectName = "UnitsNet"
 
 # Use UnitsNet.Common.props version as base if bumping major/minor/patch
-$newVersion = Get-NewProjectVersion $commonPropsFile $paramSet $setVersion $bumpVersion
+$newVersion = Get-NewProjectVersion $projFile $paramSet $setVersion $bumpVersion
 
-Set-ProjectVersion $commonPropsFile $newVersion
+Set-ProjectVersion $projFile $newVersion
 Set-AssemblyInfoVersion $winrtAssemblyInfoFile $newVersion
 Set-NuspecVersion $winrtNuspecFile $newVersion
 Invoke-CommitAndTagVersion $projectName $versionFiles $newVersion

Build/set-version.psm1

@@ -43,11 +43,15 @@ function Invoke-CommitAndTagVersion(
 }
 
 function Set-ProjectVersion([string] $file, [string] $version) {
-  Write-Host "$file -> $version"
+  $assemblyVersion = $version  -replace "(\d+)(?:\.\d+)+.*", '$1.0.0.0'
+  Write-Host "$file -> $version (AssemblyVersion $assemblyVersion)"
   (Get-Content $file) -replace '<Version>.*?</Version>', "<Version>$version</Version>" | Set-Content $file
+  (Get-Content $file) -replace '<AssemblyVersion>.*?</AssemblyVersion>', "<AssemblyVersion>$assemblyVersion</AssemblyVersion>" | Set-Content $file
 }
 
 function Set-AssemblyInfoVersion([string] $file, [string] $version) {
+  # Strip out any suffix: "4.0.0-alpha1" => "4.0.0"
+  $version = $version.Split('-')[0]
   Write-Host "$file -> $version"
   (Get-Content $file) -replace 'Assembly(File)?Version\(".*?"\)', "Assembly`$1Version(`"$version`")" | Set-Content $file
 }
@@ -107,7 +111,7 @@ function BumpSuffix([string] $oldSuffix) {
   # Example:
   # -alpha => -alpha2
   # -alpha1 => -alpha2
-  $match = [regex]::Match($oldSuffix, '^-(\w+)(\d+)?$');
+  $match = [regex]::Match($oldSuffix, '^-([a-zA-Z]+)(\d+)?$');
   $oldSuffix = $match.Groups[1].Value
   $numberGroup = $match.Groups[2]
 
@@ -150,4 +154,4 @@ function Resolve-Error ($ErrorRecord=$Error[0])
   }
 }
 
-export-modulemember -function Get-NewProjectVersion, Set-ProjectVersion, Set-AssemblyInfoVersion, Invoke-CommitAndTagVersion, Set-NuspecVersion
+export-modulemember -function Get-NewProjectVersion, Set-ProjectVersion, Set-AssemblyInfoVersion, Invoke-CommitAndTagVersion, Set-NuspecVersion