updates

Rx.NET/Source/GitVersion.yml

@@ -1,2 +1,62 @@
+assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDeployment
-next-version: 3.0.0-bld-
+tag-prefix: '[vV]'
+continuous-delivery-fallback-tag: ci
+next-version: 3.0.0-beta
+major-version-bump-message: '\+semver:\s?(breaking|major)'
+minor-version-bump-message: '\+semver:\s?(feature|minor)'
+patch-version-bump-message: '\+semver:\s?(fix|patch)'
+legacy-semver-padding: 4
+build-metadata-padding: 4
+commits-since-version-source-padding: 4
+commit-message-incrementing: Enabled
+branches:
+  master:
+    mode: ContinuousDeployment
+    tag: ''
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+  core-port:
+    mode: ContinuousDeployment
+    tag: ''
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+  releases?[/-]:
+    mode: ContinuousDeployment
+    tag: beta
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+  features?[/-]:
+    mode: ContinuousDeployment
+    tag: useBranchName
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: false
+  (pull|pull\-requests|pr)[/-]:
+    mode: ContinuousDeployment
+    tag: PullRequest
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    tag-number-pattern: '[/-](?<number>\d+)[-/]'
+    track-merge-target: false
+  hotfix(es)?[/-]:
+    mode: ContinuousDeployment
+    tag: beta
+    increment: Patch
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: false
+  support[/-]:
+    mode: ContinuousDeployment
+    tag: ''
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+  dev(elop)?(ment)?$:
+    mode: ContinuousDeployment
+    tag: unstable
+    increment: Minor
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: true

Rx.NET/Source/NuSpecs/System.Reactive.Aliases.nuspec → Rx.NET/Source/NuSpecs/System.Reactive.Observable.Aliases.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
     <metadata>
-        <id>System.Reactive.Aliases</id>
+        <id>System.Reactive.Observable.Aliases</id>
         <version>$version$</version>
         <title>Reactive Extensions - Aliases</title>
         <authors>Microsoft</authors>
@@ -20,6 +20,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="..\System.Reactive.Aliases\bin\$configuration$\**\*.*" target="lib" />
+        <file src="..\System.Reactive.Observable.Aliases\bin\$configuration$\**\*.*" target="lib" />
     </files>
 </package>

Rx.NET/Source/NuSpecs/System.Reactive.Providers.nuspec

@@ -24,4 +24,5 @@
     </metadata>
     <files>
         <file src="..\System.Reactive.Providers\bin\$configuration$\**\*.*" target="lib" />
+    </files>
 </package>

Rx.NET/Source/build-new.ps1

@@ -2,7 +2,7 @@ $scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
 
 $configuration = "Release"
 
-wget "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -outfile nuget.exe
+wget "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -outfile .\.nuget\nuget.exe
 
 $msbuild = Get-ItemProperty "hklm:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0"
 
@@ -10,10 +10,17 @@ $msbuild = Get-ItemProperty "hklm:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0
 $msbuildExe = Join-Path $msbuild.MSBuildToolsPath "msbuild.exe"
 
 # get version
-.\nuget install -excludeversion -pre gitversion.commandline -outputdirectory tools
-.\tools\gitversion.commandline\tools\gitversion.exe /l console /output buildserver
+.\.nuget\nuget.exe install -excludeversion -pre gitversion.commandline -outputdirectory packages
+.\packages\gitversion.commandline\tools\gitversion.exe /l console /output buildserver
 
-$version = $env:NuGetVersionV2
+$versionObj = .\packages\gitversion.commandline\tools\gitversion.exe | ConvertFrom-Json 
+
+$ver1 = $versionObj.NuGetVersionV2
+$ver2 = $versionObj.CommitsSinceVersionSourcePadded
+
+$version = "$ver1-$ver2"
+
+Write-Host "Version: $version"
 
 Write-Host "Restoring packages" -Foreground Green
 dotnet restore $scriptPath | out-null