Update samples to Cocktail v2.6.2

IdeaBlade · Mar 10, 2018 · ba66477 · ba66477
1 parent 798162c
commit ba66477
Show file tree

Hide file tree

Showing 65 changed files with 1,114 additions and 579 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ Documentation/script
 Documentation/scripts
 Documentation/stylesheets
 Documentation/flash
+.vs
diff --git a/Samples/HappyHour/02-HappyHour/HappyHour/HappyHour.SL5.csproj b/Samples/HappyHour/02-HappyHour/HappyHour/HappyHour.SL5.csproj
@@ -35,6 +35,8 @@
     </LinkedServerProject>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- This property group is only here to support building this project using the 
        MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
@@ -68,23 +70,29 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\packages\Caliburn.Micro.2.0.2\lib\sl5\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Cocktail.SL">
-      <HintPath>..\packages\IdeaBlade.Cocktail.2.6.0\lib\sl50\Cocktail.SL.dll</HintPath>
+    <Reference Include="Cocktail.SL, Version=2.6.2.0, Culture=neutral, PublicKeyToken=7d8c7326b555a04a, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.Cocktail.2.6.2\lib\sl50\Cocktail.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Cocktail.Utils.SL">
-      <HintPath>..\packages\IdeaBlade.Cocktail.Utils.2.6.0\lib\sl50\Cocktail.Utils.SL.dll</HintPath>
+    <Reference Include="Cocktail.Utils.SL, Version=2.6.2.0, Culture=neutral, PublicKeyToken=7d8c7326b555a04a, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.Cocktail.Utils.2.6.2\lib\sl50\Cocktail.Utils.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.Core.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.Core.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.Core.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.EntityModel.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.EntityModel.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.EntityModel.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.Linq.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.Linq.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.Linq.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.Validation.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.Validation.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.Validation.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\sl4\Microsoft.Threading.Tasks.dll</HintPath>
@@ -99,15 +107,18 @@
     <Reference Include="System.ComponentModel.Composition, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.ComponentModel.Composition.Initialization, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
-    <Reference Include="System.IO">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.IO.dll</HintPath>
+    <Reference Include="System.IO, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.IO.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.Runtime.dll</HintPath>
+    <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.Runtime.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Threading.Tasks">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.Threading.Tasks.dll</HintPath>
+    <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.Threading.Tasks.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="system" />
@@ -134,6 +145,7 @@
     <Resource Include="..\..\Mixers\fonts\SegoeWP.ttf">
       <Link>assets\SegoeWP.ttf</Link>
     </Resource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\AppManifest.xml" />
   </ItemGroup>
@@ -168,4 +180,11 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+  </Target>
 </Project>
diff --git a/Samples/HappyHour/02-HappyHour/HappyHour/app.config b/Samples/HappyHour/02-HappyHour/HappyHour/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Samples/HappyHour/02-HappyHour/HappyHour/packages.config b/Samples/HappyHour/02-HappyHour/HappyHour/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="Caliburn.Micro" version="2.0.2" targetFramework="sl50" />
   <package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="sl50" />
-  <package id="IdeaBlade.Cocktail" version="2.6.0" targetFramework="sl50" />
-  <package id="IdeaBlade.Cocktail.Utils" version="2.6.0" targetFramework="sl50" />
-  <package id="IdeaBlade.DevForce.Core" version="7.3.0" targetFramework="sl50" />
-  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="sl50" />
+  <package id="IdeaBlade.Cocktail" version="2.6.2" targetFramework="sl5" />
+  <package id="IdeaBlade.Cocktail.Utils" version="2.6.2" targetFramework="sl5" />
+  <package id="IdeaBlade.DevForce.Core" version="7.5.1" targetFramework="sl5" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="sl5" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="sl50" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="sl50" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="sl5" />
 </packages>
diff --git a/Samples/HappyHour/03-HappyHour/HappyHour/HappyHour.SL5.csproj b/Samples/HappyHour/03-HappyHour/HappyHour/HappyHour.SL5.csproj
@@ -35,6 +35,8 @@
     </LinkedServerProject>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- This property group is only here to support building this project using the 
        MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
@@ -68,23 +70,29 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\packages\Caliburn.Micro.2.0.2\lib\sl5\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Cocktail.SL">
-      <HintPath>..\packages\IdeaBlade.Cocktail.2.6.0\lib\sl50\Cocktail.SL.dll</HintPath>
+    <Reference Include="Cocktail.SL, Version=2.6.2.0, Culture=neutral, PublicKeyToken=7d8c7326b555a04a, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.Cocktail.2.6.2\lib\sl50\Cocktail.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Cocktail.Utils.SL">
-      <HintPath>..\packages\IdeaBlade.Cocktail.Utils.2.6.0\lib\sl50\Cocktail.Utils.SL.dll</HintPath>
+    <Reference Include="Cocktail.Utils.SL, Version=2.6.2.0, Culture=neutral, PublicKeyToken=7d8c7326b555a04a, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.Cocktail.Utils.2.6.2\lib\sl50\Cocktail.Utils.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.Core.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.Core.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.Core.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.EntityModel.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.EntityModel.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.EntityModel.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.Linq.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.Linq.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.Linq.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="IdeaBlade.Validation.SL">
-      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
+    <Reference Include="IdeaBlade.Validation.SL, Version=7.5.1.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdeaBlade.DevForce.Core.7.5.1\lib\sl5\IdeaBlade.Validation.SL.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\sl4\Microsoft.Threading.Tasks.dll</HintPath>
@@ -101,15 +109,18 @@
     </Reference>
     <Reference Include="System.ComponentModel.Composition.Initialization, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
-    <Reference Include="System.IO">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.IO.dll</HintPath>
+    <Reference Include="System.IO, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.IO.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.Runtime.dll</HintPath>
+    <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.Runtime.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Threading.Tasks">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.Threading.Tasks.dll</HintPath>
+    <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.Threading.Tasks.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="system" />
@@ -136,6 +147,7 @@
     <Resource Include="..\..\Mixers\fonts\SegoeWP.ttf">
       <Link>assets\SegoeWP.ttf</Link>
     </Resource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\AppManifest.xml" />
   </ItemGroup>
@@ -170,4 +182,11 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+  </Target>
 </Project>
diff --git a/Samples/HappyHour/03-HappyHour/HappyHour/app.config b/Samples/HappyHour/03-HappyHour/HappyHour/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Samples/HappyHour/03-HappyHour/HappyHour/packages.config b/Samples/HappyHour/03-HappyHour/HappyHour/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="Caliburn.Micro" version="2.0.2" targetFramework="sl50" />
   <package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="sl50" />
-  <package id="IdeaBlade.Cocktail" version="2.6.0" targetFramework="sl50" />
-  <package id="IdeaBlade.Cocktail.Utils" version="2.6.0" targetFramework="sl50" />
-  <package id="IdeaBlade.DevForce.Core" version="7.3.0" targetFramework="sl50" />
-  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="sl50" />
+  <package id="IdeaBlade.Cocktail" version="2.6.2" targetFramework="sl5" />
+  <package id="IdeaBlade.Cocktail.Utils" version="2.6.2" targetFramework="sl5" />
+  <package id="IdeaBlade.DevForce.Core" version="7.5.1" targetFramework="sl5" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="sl5" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="sl50" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="sl50" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="sl5" />
 </packages>