Fixed build (updated Microsoft.Bcl.Build nuget)

Boddlnagg · Sep 17, 2013 · 62f8d7c · 62f8d7c
1 parent 8cf46f5
commit 62f8d7c
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 14 deletions.
diff --git a/WordsLive.Core.Tests/WordsLive.Core.Tests.csproj b/WordsLive.Core.Tests/WordsLive.Core.Tests.csproj
@@ -111,7 +111,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.7\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- 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/WordsLive.Core.Tests/packages.config b/WordsLive.Core.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40-Client" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40-Client" />
-  <package id="Microsoft.Bcl.Build" version="1.0.7" targetFramework="net40-Client" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40-Client" />
   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40-Client" />
   <package id="NUnit" version="2.6.2" targetFramework="net40-Client" />
 </packages>
diff --git a/WordsLive.Core/WordsLive.Core.csproj b/WordsLive.Core/WordsLive.Core.csproj
@@ -183,5 +183,9 @@
     <EmbeddedResource Include="Resources\jquery.mousewheel.js" />
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.7\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
diff --git a/WordsLive.Core/packages.config b/WordsLive.Core/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40-Client" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40-Client" />
-  <package id="Microsoft.Bcl.Build" version="1.0.7" targetFramework="net40-Client" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40-Client" />
   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40-Client" />
   <package id="MUF" version="1.1" targetFramework="net40-Client" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40-Client" />

diff --git a/WordsLive.Presentation/WordsLive.Presentation.csproj b/WordsLive.Presentation/WordsLive.Presentation.csproj
@@ -33,6 +33,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -104,4 +106,5 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
diff --git a/WordsLive.Server/WordsLive.Server.csproj b/WordsLive.Server/WordsLive.Server.csproj
@@ -122,7 +122,11 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.7\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- 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/WordsLive.Server/packages.config b/WordsLive.Server/packages.config
@@ -3,7 +3,7 @@
   <package id="Firefly" version="0.6.3" targetFramework="net40-Client" />
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40-Client" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40-Client" />
-  <package id="Microsoft.Bcl.Build" version="1.0.7" targetFramework="net40-Client" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40-Client" />
   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40-Client" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40-Client" />
   <package id="Owin" version="1.0" targetFramework="net40-Client" />

diff --git a/WordsLive.Slideshow.Impress.Bridge/WordsLive.Slideshow.Impress.Bridge.csproj b/WordsLive.Slideshow.Impress.Bridge/WordsLive.Slideshow.Impress.Bridge.csproj
@@ -122,7 +122,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.7\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- 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/WordsLive.Slideshow.Impress.Bridge/packages.config b/WordsLive.Slideshow.Impress.Bridge/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.7" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40" />
 </packages>
diff --git a/WordsLive.Slideshow/WordsLive.Slideshow.csproj b/WordsLive.Slideshow/WordsLive.Slideshow.csproj
@@ -167,7 +167,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.7\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- 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/WordsLive.Slideshow/packages.config b/WordsLive.Slideshow/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.7" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40" />
 </packages>
diff --git a/WordsLive/WordsLive.csproj b/WordsLive/WordsLive.csproj
@@ -568,5 +568,9 @@
     <Move SourceFiles="$(TargetDir)awesomium_process" DestinationFiles="$(TargetDir)WordsLive.Awesomium.exe" />
   </Target>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.7\tools\Microsoft.Bcl.Build.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
diff --git a/WordsLive/app.config b/WordsLive/app.config
@@ -90,8 +90,7 @@
       </setting>
       <setting name="PresentationAreas" serializeAs="Xml">
         <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
             <string>1,True,0,0,0,0</string>
             <string>0,False,0,0,800,600</string>
           </ArrayOfString>

diff --git a/WordsLive/packages.config b/WordsLive/packages.config
@@ -4,7 +4,7 @@
   <package id="Extended.Wpf.Toolkit" version="1.8.0" targetFramework="net40" />
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.7" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
 </packages>