Merge pull request #18 from erwinvanhunen/dev

Extra master merge
pnp · Aug 13, 2015 · 7c15b9d · 7c15b9d
2 parents 41a0681 + 97327e5
commit 7c15b9d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/Commands/OfficeDevPnP.PowerShell.Commands.csproj b/Commands/OfficeDevPnP.PowerShell.Commands.csproj
@@ -58,9 +58,6 @@
   <Choose>
     <When Condition=" '$(Configuration)' == 'debug' Or '$(Configuration)' == 'release' ">
       <ItemGroup>
-        <Reference Include="OfficeDevPnP.Core">
-          <HintPath>..\packages\OfficeDevPnPCore16.1.4.0815.0\lib\net45\OfficeDevPnP.Core.dll</HintPath>
-        </Reference>
         <Reference Include="Microsoft.Office.SharePoint.Tools, Version=16.1.3912.1204, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
           <HintPath>..\packages\Microsoft.SharePointOnline.CSOM.16.1.3912.1204\lib\net45\Microsoft.Office.SharePoint.Tools.dll</HintPath>
           <Private>True</Private>
@@ -81,10 +78,6 @@
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\packages\Microsoft.SharePointOnline.CSOM.16.1.3912.1204\lib\net45\Microsoft.Office.Client.TranslationServices.dll</HintPath>
         </Reference>
-        <Reference Include="Microsoft.Online.SharePoint.Client.Tenant, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\packages\Microsoft.SharePointOnline.CSOM.16.1.3912.1204\lib\net45\Microsoft.Online.SharePoint.Client.Tenant.dll</HintPath>
-        </Reference>
         <Reference Include="Microsoft.SharePoint.Client.DocumentManagement, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\packages\Microsoft.SharePointOnline.CSOM.16.1.3912.1204\lib\net45\Microsoft.SharePoint.Client.DocumentManagement.dll</HintPath>
@@ -113,6 +106,14 @@
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\packages\Microsoft.SharePointOnline.CSOM.16.1.3912.1204\lib\net45\Microsoft.SharePoint.Client.WorkflowServices.dll</HintPath>
         </Reference>
+        <Reference Include="Microsoft.Online.SharePoint.Client.Tenant, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\packages\Microsoft.SharePointOnline.CSOM.16.1.3912.1204\lib\net45\Microsoft.Online.SharePoint.Client.Tenant.dll</HintPath>
+        </Reference>
+        <Reference Include="OfficeDevPnP.Core, Version=1.5.915.0, Culture=neutral, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\packages\OfficeDevPnPCore16.1.4.0815.1\lib\net45\OfficeDevPnP.Core.dll</HintPath>
+        </Reference>
       </ItemGroup>
     </When>
     <Otherwise>
@@ -173,6 +174,10 @@
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\ReferenceAssemblies\15\Microsoft.Office.Client.Education.dll</HintPath>
         </Reference>
+        <Reference Include="OfficeDevPnP.Core, Version=1.5.915.0, Culture=neutral, processorArchitecture=MSIL">
+          <HintPath>..\packages\OfficeDevPnPCore15.1.4.0815.1\lib\net45\OfficeDevPnP.Core.dll</HintPath>
+          <Private>True</Private>
+        </Reference>
       </ItemGroup>
     </Otherwise>
   </Choose>
@@ -193,6 +198,7 @@
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

diff --git a/Commands/app.config b/Commands/app.config
@@ -16,11 +16,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.SharePoint.Client.Runtime" publicKeyToken="71e9bce111e9429c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-16.1.3912.1204" newVersion="16.1.3912.1204" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.SharePoint.Client" publicKeyToken="71e9bce111e9429c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-16.1.3912.1204" newVersion="16.1.3912.1204" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.SharePoint.Client.Search" publicKeyToken="71e9bce111e9429c" culture="neutral" />

diff --git a/Commands/packages.config b/Commands/packages.config
@@ -6,6 +6,6 @@
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.19.208020213" targetFramework="net45" />
   <package id="Microsoft.SharePointOnline.CSOM" version="16.1.3912.1204" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="OfficeDevPnPCore15" version="1.4.0815.0" targetFramework="net45" />
-  <package id="OfficeDevPnPCore16" version="1.4.0815.0" targetFramework="net45" />
+  <package id="OfficeDevPnPCore15" version="1.4.0815.1" targetFramework="net45" />
+  <package id="OfficeDevPnPCore16" version="1.4.0815.1" targetFramework="net45" />
 </packages>
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -13,7 +13,7 @@
   <Product Id="*"
            Name="$(var.ProductName)"
            Language="1033"
-           Version="1.3.0.0"
+           Version="1.3.1.0"
            Manufacturer="OfficeDev PnP"
            UpgradeCode="630fe2af-dc42-467d-94c8-6eefd065cbfa">