From de4425bc72f279311a5effa8209fb6d3c9b79018 Mon Sep 17 00:00:00 2001
From: sergeybykov <sbykov@microsoft.com>
Date: Mon, 2 Nov 2015 16:19:46 -0800
Subject: [PATCH 1/3] Change version to 1.1.0-beta1. Update NuGetbuild script
 to handle beta versions.

---
 src/Build/Version.txt               |  2 +-
 src/NuGet/CreateOrleansPackages.bat | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/Build/Version.txt b/src/Build/Version.txt
index 7ee7020b38..0d25865a77 100644
--- a/src/Build/Version.txt
+++ b/src/Build/Version.txt
@@ -1 +1 @@
-1.0.10
+1.1.0.beta1
diff --git a/src/NuGet/CreateOrleansPackages.bat b/src/NuGet/CreateOrleansPackages.bat
index a0b5cf2a39..068e6dce44 100644
--- a/src/NuGet/CreateOrleansPackages.bat
+++ b/src/NuGet/CreateOrleansPackages.bat
@@ -9,9 +9,9 @@ set BASE_PATH=%1
 set VERSION=%2
 IF %2 == "" set VERSION=%~dp0..\Build\Version.txt
 
-@echo CreateOrleansNugetPackages running in directory =
+@echo CreateOrleansNugetPackages running in directory = %1
 @cd
-@echo CreateOrleansNugetPackages version file = %VERSION% from base dir = %BASE_DIR% using nuget location = %NUGET_EXE%
+@echo CreateOrleansNugetPackages version file = %VERSION% from base dir = %BASE_PATH% using nuget location = %NUGET_EXE%
 
 if "%BASE_PATH%" == "." (
 	if EXIST "Release" (
@@ -22,20 +22,24 @@ if "%BASE_PATH%" == "." (
 )
 @echo Using binary drop location directory %BASE_PATH%
 
-if "%PRODUCT_VERSION%" == "" (
-
-  if EXIST "%VERSION%" (
+if EXIST "%VERSION%" (
       @Echo Using version number from file %VERSION%
-      FOR /F "usebackq tokens=1,2,3,4 delims=." %%i in (`type "%VERSION%"`) do set VERSION=%%i.%%j.%%k
-  ) else (
-      @Echo ERROR: Unable to read version number from file %VERSION%
-      GOTO Usage
-  )
+      FOR /F "usebackq tokens=1,2,3,4 delims=." %%i in (`type "%VERSION%"`) do (
+
+	   set VERSION=%%i.%%j.%%k
+	   set VERSION_BETA=%%l
+	  )
+	  
 ) else (
-    set VERSION=%PRODUCT_VERSION%
-	@Echo Using version number %VERSION% from %%PRODUCT_VERSION%%
+    @Echo ERROR: Unable to read version number from file %VERSION%
+    GOTO Usage
 )
 
+if not "%VERSION_BETA%" == "" ( set VERSION=%VERSION%-%VERSION_BETA% )
+
+@echo VERSION_BETA=%VERSION_BETA%
+@echo VERSION=%VERSION%
+
 @echo CreateOrleansNugetPackages: Version = %VERSION% -- Drop location = %BASE_PATH%
 
 @set NUGET_PACK_OPTS= -Version %VERSION% 

From 509fcad53cc7d8b2e6ade1a22ae2fee4aba99c01 Mon Sep 17 00:00:00 2001
From: sergeybykov <sbykov@microsoft.com>
Date: Tue, 3 Nov 2015 08:33:21 -0800
Subject: [PATCH 2/3] Add support for including sources in symbols NuGets.

---
 src/Build/PostBuild.cmd             | 2 +-
 src/NuGet/CreateOrleansPackages.bat | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Build/PostBuild.cmd b/src/Build/PostBuild.cmd
index 4fb7457b19..3e72a3eea3 100644
--- a/src/Build/PostBuild.cmd
+++ b/src/Build/PostBuild.cmd
@@ -53,7 +53,7 @@ if not "%BuildingInsideVisualStudio%" == "true" (
         del /q *.nupkg
 
         @echo ===== Build Orleans NuGet packages from %TargetDir%
-        call "%SolutionDir%NuGet\CreateOrleansPackages.bat" . .\Version.txt
+        call "%SolutionDir%NuGet\CreateOrleansPackages.bat" . .\Version.txt %SolutionDir%
         if ERRORLEVEL 1 EXIT /B 1
     
         @echo == Copying Orleans NuGet packages to %PKG_DIR%
diff --git a/src/NuGet/CreateOrleansPackages.bat b/src/NuGet/CreateOrleansPackages.bat
index 068e6dce44..1d4a52c0dd 100644
--- a/src/NuGet/CreateOrleansPackages.bat
+++ b/src/NuGet/CreateOrleansPackages.bat
@@ -7,6 +7,7 @@ set NUGET_EXE=%~dp0..\.nuget\nuget.exe
 
 set BASE_PATH=%1
 set VERSION=%2
+set SRC_DIR=%3
 IF %2 == "" set VERSION=%~dp0..\Build\Version.txt
 
 @echo CreateOrleansNugetPackages running in directory = %1
@@ -40,11 +41,11 @@ if not "%VERSION_BETA%" == "" ( set VERSION=%VERSION%-%VERSION_BETA% )
 @echo VERSION_BETA=%VERSION_BETA%
 @echo VERSION=%VERSION%
 
-@echo CreateOrleansNugetPackages: Version = %VERSION% -- Drop location = %BASE_PATH%
+@echo CreateOrleansNugetPackages: Version = %VERSION% -- Drop location = %BASE_PATH% -- SRC_DIR=%SRC_DIR%
 
-@set NUGET_PACK_OPTS= -Version %VERSION% 
+@set NUGET_PACK_OPTS= -Version %VERSION%
 @set NUGET_PACK_OPTS=%NUGET_PACK_OPTS% -NoPackageAnalysis -Symbols
-@set NUGET_PACK_OPTS=%NUGET_PACK_OPTS% -BasePath "%BASE_PATH%"
+@set NUGET_PACK_OPTS=%NUGET_PACK_OPTS% -BasePath "%BASE_PATH%" -Properties SRC_DIR=%SRC_DIR%
 @REM @set NUGET_PACK_OPTS=%NUGET_PACK_OPTS% -Verbosity detailed
 
 FOR %%G IN ("%~dp0*.nuspec") DO (

From 55b15c2c77824a6278b9dea5eb81492f14ee3fad Mon Sep 17 00:00:00 2001
From: sergeybykov <sbykov@microsoft.com>
Date: Tue, 3 Nov 2015 08:34:44 -0800
Subject: [PATCH 3/3] Add sources to symbols NuGets.

---
 src/NuGet/Microsoft.Orleans.Core.nuspec                  | 1 +
 src/NuGet/Microsoft.Orleans.CounterControl.nuspec        | 1 +
 src/NuGet/Microsoft.Orleans.EventSourcing.nuspec         | 1 +
 src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec     | 1 +
 src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec  | 1 +
 src/NuGet/Microsoft.Orleans.OrleansHost.nuspec           | 1 +
 src/NuGet/Microsoft.Orleans.OrleansManager.nuspec        | 1 +
 src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec      | 1 +
 src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec        | 1 +
 src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec | 1 +
 src/NuGet/Microsoft.Orleans.TestingHost.nuspec           | 1 +
 11 files changed, 11 insertions(+)

diff --git a/src/NuGet/Microsoft.Orleans.Core.nuspec b/src/NuGet/Microsoft.Orleans.Core.nuspec
index c6b7ccafa7..79f43860d5 100644
--- a/src/NuGet/Microsoft.Orleans.Core.nuspec
+++ b/src/NuGet/Microsoft.Orleans.Core.nuspec
@@ -22,5 +22,6 @@
     <file src="Orleans.dll" target="lib\net45" />
     <file src="Orleans.pdb" target="lib\net45" />
 	  <file src="Orleans.xml" target="lib\net45" />
+    <file src="$SRC_DIR$Orleans\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.CounterControl.nuspec b/src/NuGet/Microsoft.Orleans.CounterControl.nuspec
index 9aff5a5157..1331a1592a 100644
--- a/src/NuGet/Microsoft.Orleans.CounterControl.nuspec
+++ b/src/NuGet/Microsoft.Orleans.CounterControl.nuspec
@@ -27,5 +27,6 @@
     <file src="OrleansCounterControl.exe" target="lib\net45" />
     <file src="OrleansCounterControl.pdb" target="lib\net45" />
     <file src="OrleansCounterControl.exe.config" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansCounterControl\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec b/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec
index cf8193ad8b..1ccb955582 100644
--- a/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec
+++ b/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec
@@ -25,5 +25,6 @@
     <file src="OrleansEventSourcing.dll" target="lib\net45" />
     <file src="OrleansEventSourcing.pdb" target="lib\net45" />
     <file src="OrleansEventSourcing.xml" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansEventSourcing\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec
index 244603febe..a2634aea54 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec
@@ -30,5 +30,6 @@
     <file src="OrleansAzureUtils.dll" target="lib\net45" />
     <file src="OrleansAzureUtils.pdb" target="lib\net45" />
     <file src="OrleansAzureUtils.xml" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansAzureUtils\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec b/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec
index f04546ff6e..29a386e5c6 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec
@@ -24,5 +24,6 @@
   </metadata>
   <files>
     <file src="OrleansCodeGenerator.dll" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansCodeGenerator\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec b/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec
index 088a37e6ac..b7f7b0f591 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec
@@ -26,5 +26,6 @@
     <file src="OrleansHost.exe" target="lib\net45" />
     <file src="OrleansHost.pdb" target="lib\net45" />
     <file src="OrleansHost.exe.config" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansHost\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec b/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec
index 46a1a5abc2..51b7e82b73 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec
@@ -26,5 +26,6 @@
     <file src="OrleansManager.pdb" target="lib\net45" />
     <file src="OrleansManager.exe.config" target="lib\net45" />
     <file src="ClientConfiguration.xml" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansManager\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec b/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec
index dc18dec811..b8cdc940df 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec
@@ -24,5 +24,6 @@
   <files>
     <file src="OrleansProviders.dll" target="lib\net45" />
     <file src="OrleansProviders.pdb" target="lib\net45" />    
+    <file src="$SRC_DIR$OrleansProviders\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec b/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec
index a485fcc3bf..b515c95a87 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec
@@ -24,5 +24,6 @@
   <files>
     <file src="OrleansRuntime.dll" target="lib\net45" />
     <file src="OrleansRuntime.pdb" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansRuntime\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec
index 74a63e7882..45dded914d 100644
--- a/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec
+++ b/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec
@@ -27,5 +27,6 @@
   <files>
     <file src="OrleansZooKeeperUtils.dll" target="lib\net45" />
     <file src="OrleansZooKeeperUtils.pdb" target="lib\net45" />
+    <file src="$SRC_DIR$OrleansZooKeeperUtils\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/NuGet/Microsoft.Orleans.TestingHost.nuspec b/src/NuGet/Microsoft.Orleans.TestingHost.nuspec
index 977bd7eed6..eefe96bc92 100644
--- a/src/NuGet/Microsoft.Orleans.TestingHost.nuspec
+++ b/src/NuGet/Microsoft.Orleans.TestingHost.nuspec
@@ -30,5 +30,6 @@
     <file src="OrleansConfigurationForTesting.xml" target="content" />
 
     <file src="TestingHost.Install.ps1" target="tools\install.ps1" />
+    <file src="$SRC_DIR$OrleansTestingHost\**\*.cs" target="src" />
   </files>
 </package>