From 3471622ef2bfafcf0f3461d42eea029afa50ccc2 Mon Sep 17 00:00:00 2001
From: Dennis Fetterly <fetterly@microsoft.com>
Date: Fri, 4 Apr 2014 14:45:35 -0700
Subject: [PATCH] Update Calypso references and Assembly infos.  Packaging
 bits.

---
 Calypso/Calypso/Calypso.csproj                | 22 ---------
 Calypso/Calypso/Properties/AssemblyInfo.cs    |  8 ++--
 Calypso/Calypso/app.config                    |  2 +-
 Calypso/JOM/JobObjectModel.csproj             | 25 +++++++---
 Calypso/JOM/Properties/AssemblyInfo.cs        |  8 ++--
 Calypso/JOM/app.config                        | 27 +++++++++++
 Calypso/JOM/packages.config                   |  6 +--
 Calypso/Microsoft.Research.Calypso.nuspec     | 48 +++++++++++--------
 Calypso/Tools/Properties/AssemblyInfo.cs      |  8 ++--
 .../UsefulForms/Properties/AssemblyInfo.cs    |  8 ++--
 ...icrosoft.Research.DryadLinq.Samples.nuspec |  8 ++--
 samples/WordCount.cs.pp                       |  6 +++
 12 files changed, 102 insertions(+), 74 deletions(-)
 create mode 100644 Calypso/JOM/app.config

diff --git a/Calypso/Calypso/Calypso.csproj b/Calypso/Calypso/Calypso.csproj
index cf28249..32ec137 100644
--- a/Calypso/Calypso/Calypso.csproj
+++ b/Calypso/Calypso/Calypso.csproj
@@ -80,28 +80,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PublicAssemblies\EnvDTE.dll</HintPath>
-    </Reference>
-    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PublicAssemblies\EnvDTE80.dll</HintPath>
-    </Reference>
-    <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PublicAssemblies\EnvDTE90.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Hpc.Scheduler, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Daphne\Dependences\Microsoft.Hpc.Scheduler.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Hpc.Scheduler.Properties, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Daphne\Dependences\Microsoft.Hpc.Scheduler.Properties.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Msagl, Version=3.0.0.0, Culture=neutral, PublicKeyToken=7f84f738e1fc245c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Research.DryadLINQ.MSAGL.3.0.0.1\lib\Microsoft.Msagl.dll</HintPath>
diff --git a/Calypso/Calypso/Properties/AssemblyInfo.cs b/Calypso/Calypso/Properties/AssemblyInfo.cs
index b8cdbbd..628ac4c 100644
--- a/Calypso/Calypso/Properties/AssemblyInfo.cs
+++ b/Calypso/Calypso/Properties/AssemblyInfo.cs
@@ -28,9 +28,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("DryadAnalysis")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("MSIT")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("DryadAnalysis")]
-[assembly: AssemblyCopyright("Copyright © MSIT 2008")]
+[assembly: AssemblyCopyright("Copyright © Microsoft Corporation.  All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/Calypso/Calypso/app.config b/Calypso/Calypso/app.config
index 2f0dfd0..864c815 100644
--- a/Calypso/Calypso/app.config
+++ b/Calypso/Calypso/app.config
@@ -31,7 +31,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.1" newVersion="3.1.0.1" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Calypso/JOM/JobObjectModel.csproj b/Calypso/JOM/JobObjectModel.csproj
index 05ab868..050018f 100644
--- a/Calypso/JOM/JobObjectModel.csproj
+++ b/Calypso/JOM/JobObjectModel.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.props" Condition="Exists('..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -103,11 +104,11 @@
     </Reference>
     <Reference Include="Microsoft.Research.Peloponnese.HadoopBridge, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Research.Peloponnese.0.7.0-beta023\lib\net45\Microsoft.Research.Peloponnese.HadoopBridge.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\lib\net45\Microsoft.Research.Peloponnese.HadoopBridge.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Research.Peloponnese.Utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="Microsoft.Research.Peloponnese.Utils, Version=0.7.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Research.Peloponnese.0.7.0-beta023\lib\net45\Microsoft.Research.Peloponnese.Utils.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\lib\net45\Microsoft.Research.Peloponnese.Utils.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
@@ -121,12 +122,13 @@
     <Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core">
       <HintPath>..\packages\Microsoft.Hadoop.Client.1.1.0.7\lib\net40\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=3.1.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\WindowsAzure.Storage.3.1.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\packages\WindowsAzure.Storage.3.1.0.1\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -180,10 +182,19 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Research.Peloponnese.0.7.0-beta023\build\Microsoft.Research.Peloponnese.targets" Condition="Exists('..\packages\Microsoft.Research.Peloponnese.0.7.0-beta023\build\Microsoft.Research.Peloponnese.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.targets" Condition="Exists('..\packages\Microsoft.Research.Peloponnese.0.7.1-beta\build\Microsoft.Research.Peloponnese.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Calypso/JOM/Properties/AssemblyInfo.cs b/Calypso/JOM/Properties/AssemblyInfo.cs
index f51b2bc..4b3319d 100644
--- a/Calypso/JOM/Properties/AssemblyInfo.cs
+++ b/Calypso/JOM/Properties/AssemblyInfo.cs
@@ -28,9 +28,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("DistributedDataCollection")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("DistributedDataCollection")]
-[assembly: AssemblyCopyright("Copyright ©  2009")]
+[assembly: AssemblyCopyright("Copyright © Microsoft Corporation.  All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/Calypso/JOM/app.config b/Calypso/JOM/app.config
new file mode 100644
index 0000000..932f99f
--- /dev/null
+++ b/Calypso/JOM/app.config
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.1" newVersion="3.1.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Calypso/JOM/packages.config b/Calypso/JOM/packages.config
index 1f0f2bb..6cc3081 100644
--- a/Calypso/JOM/packages.config
+++ b/Calypso/JOM/packages.config
@@ -4,10 +4,10 @@
   <package id="Microsoft.Data.OData" version="5.6.1" targetFramework="net45" />
   <package id="Microsoft.Data.Services.Client" version="5.6.1" targetFramework="net45" />
   <package id="Microsoft.Hadoop.Client" version="1.1.0.7" targetFramework="net45" />
-  <package id="Microsoft.Research.Peloponnese" version="0.7.0-beta023" targetFramework="net45" />
+  <package id="Microsoft.Research.Peloponnese" version="0.7.1-beta" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.1.0.7" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.1" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="3.1.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="3.1.0.1" targetFramework="net45" />
 </packages>
diff --git a/Calypso/Microsoft.Research.Calypso.nuspec b/Calypso/Microsoft.Research.Calypso.nuspec
index bcdb207..67ad440 100644
--- a/Calypso/Microsoft.Research.Calypso.nuspec
+++ b/Calypso/Microsoft.Research.Calypso.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
-    <metadata minClientVersion="2.5">
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+    <metadata>
         <id>Microsoft.Research.Calypso</id>
         <version>0.7.0-beta024</version>
         <title>Calypso Job Browser for DryadLINQ</title>
@@ -19,24 +19,30 @@
                 <dependency id="Microsoft.Research.Peloponnese" version="0.7.0-beta024" />
             </group>
         </dependencies>
-      <frameworkAssemblies>
-        <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Data" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Data.DataSetExtensions" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Data.Linq" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Deployment" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Drawing" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.ServiceModel" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Windows.Forms" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.5" />
-        <frameworkAssembly assemblyName="System.Xml.Linq" targetFramework=".NETFramework4.5" />
-      </frameworkAssemblies>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Data" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Data.DataSetExtensions" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Data.Linq" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Deployment" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Drawing" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.ServiceModel" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Windows.Forms" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.5" />
+            <frameworkAssembly assemblyName="System.Xml.Linq" targetFramework=".NETFramework4.5" />
+        </frameworkAssemblies>
     </metadata>
-  <files>
-    <file src="Calypso\bin\x64\Release\DistributedDataCollection.dll" target="content\DistributedDataCollection.dll" />
-    <file src="Calypso\bin\x64\Release\DistributedDataCollection.pdb" target="content\DistributedDataCollection.pdb" />
-      
-  </files>
+    <files>
+        <file src="Calypso\bin\x64\Release\DistributedDataCollection.dll" target="lib\DistributedDataCollection.dll" />
+        <file src="Calypso\bin\x64\Release\DistributedDataCollection.pdb" target="lib\DistributedDataCollection.pdb" />
+        <file src="Calypso\bin\x64\Release\JobBrowser.exe" target="lib\JobBrowser.exe" />
+        <file src="Calypso\bin\x64\Release\JobBrowser.exe.config" target="lib\JobBrowser.exe.config" />
+        <file src="Calypso\bin\x64\Release\JobBrowser.pdb" target="lib\JobBrowser.pdb" />
+        <file src="Calypso\bin\x64\Release\Microsoft.Research.Calypso.Tools.dll" target="lib\Microsoft.Research.Calypso.Tools.dll" />
+        <file src="Calypso\bin\x64\Release\Microsoft.Research.Calypso.Tools.pdb" target="lib\Microsoft.Research.Calypso.Tools.pdb" />
+        <file src="Calypso\bin\x64\Release\Microsoft.Research.Calypso.UsefulForms.dll" target="lib\Microsoft.Research.Calypso.UsefulForms.dll" />
+        <file src="Calypso\bin\x64\Release\Microsoft.Research.Calypso.UsefulForms.pdb" target="lib\Microsoft.Research.Calypso.UsefulForms.pdb" />
+    </files>
 </package>
\ No newline at end of file
diff --git a/Calypso/Tools/Properties/AssemblyInfo.cs b/Calypso/Tools/Properties/AssemblyInfo.cs
index 2bcfed4..ca06971 100644
--- a/Calypso/Tools/Properties/AssemblyInfo.cs
+++ b/Calypso/Tools/Properties/AssemblyInfo.cs
@@ -28,9 +28,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Tools")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("MSIT")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("Tools")]
-[assembly: AssemblyCopyright("Copyright © MSIT 2008")]
+[assembly: AssemblyCopyright("Copyright © Microsoft Corporation.  All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/Calypso/UsefulForms/Properties/AssemblyInfo.cs b/Calypso/UsefulForms/Properties/AssemblyInfo.cs
index 334a73e..74404d8 100644
--- a/Calypso/UsefulForms/Properties/AssemblyInfo.cs
+++ b/Calypso/UsefulForms/Properties/AssemblyInfo.cs
@@ -28,9 +28,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("UsefulForms")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("UsefulForms")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyCopyright("Copyright © Microsoft Corporation.  All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/samples/Microsoft.Research.DryadLinq.Samples.nuspec b/samples/Microsoft.Research.DryadLinq.Samples.nuspec
index 402d3e9..82e57cf 100644
--- a/samples/Microsoft.Research.DryadLinq.Samples.nuspec
+++ b/samples/Microsoft.Research.DryadLinq.Samples.nuspec
@@ -2,10 +2,10 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
     <metadata minClientVersion="2.5">
         <id>Microsoft.Research.DryadLinq.Samples</id>
-        <version>0.7.0-beta032</version>
+        <version>0.1.0-beta</version>
         <title>Sample DryadLINQ Programs</title>
-        <authors>bigdatadev@microsoft.com</authors>
-        <owners>bigdatadev@microsoft.com,Microsoft</owners>
+        <authors>msrsvc</authors>
+        <owners>msrsvc</owners>
         <licenseUrl>http://research.microsoft.com/en-us/projects/dryad/</licenseUrl>
         <projectUrl>http://research.microsoft.com/en-us/projects/dryad/</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -14,7 +14,7 @@
         <language>en-US</language>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="Microsoft.Research.Dryad" version="0.7.0-beta032" />
+                <dependency id="Microsoft.Research.Dryad" version="0.1.0-beta" />
             </group>
         </dependencies>
         <frameworkAssemblies>
diff --git a/samples/WordCount.cs.pp b/samples/WordCount.cs.pp
index 34ee627..9329058 100644
--- a/samples/WordCount.cs.pp
+++ b/samples/WordCount.cs.pp
@@ -13,7 +13,13 @@ namespace $rootnamespace$
 			string accountName = "Replace with your account name";
 			string storageKey = "Replace with your storage key";
 			string containerName = "Replace with the default container name for your HDInsight cluster";
+			
+			// If you have multiple HDInsight clusters, modify the DryadLinqContext to include the clusterName
             var config = new DryadLinqContext(accountName, storageKey, containerName);            
+			
+			// the LocalExecution flag determines if the computation is run locally or on a cluster
+			config.LocalExecution = false;
+			
 			var input = config.FromStore<LineRecord>(AzureUtils.ToAzureUri(accountName, storageKey, containerName, 
 					                                 "example/data/gutenberg/davinci.txt"));
             var words = input.SelectMany(x => x.Line.Split(' '));