Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Commit ad10f08

Browse files
erwinvanhunenerwinvanhunen
committed
Merge pull request #316 from erwinvanhunen/dev
May 2016 Release
2 parents 85eadef + 96afe43 commit ad10f08

9 files changed

+42
-25
lines changed

‎Binaries/SharePointPnPPowerShell2013.msi

3.16 MB
Binary file not shown.

‎Binaries/SharePointPnPPowerShell2016.msi

3.2 MB
Binary file not shown.

‎Binaries/SharePointPnPPowerShellOnline.msi

3.31 MB
Binary file not shown.

‎Commands/ModuleFiles/SharePointPnP.PowerShell.SP2013.Commands.Format.ps1xml renamed to ‎Commands/ModuleFiles/SharePointPnP.PowerShell.2013.Commands.Format.ps1xml

File renamed without changes.

‎Commands/ModuleFiles/SharePointPnP.PowerShell.SP2016.Commands.Format.ps1xml renamed to ‎Commands/ModuleFiles/SharePointPnP.PowerShell.2016.Commands.Format.ps1xml

File renamed without changes.

‎Commands/ModuleFiles/SharePointPnPPowerShellSP2013.psd1 renamed to ‎Commands/ModuleFiles/SharePointPnPPowerShell2013.psd1

1.53 KB
Binary file not shown.

‎Commands/ModuleFiles/SharePointPnPPowerShellSP2016.psd1 renamed to ‎Commands/ModuleFiles/SharePointPnPPowerShell2016.psd1

1.53 KB
Binary file not shown.

‎Commands/SharePointPnP.PowerShell.Commands.csproj

+30-13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup Condition=" '$(Configuration)' == 'debug' Or '$(Configuration)' == 'release' ">
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<PnPCorePath Condition=" '$(PnPCorePath)' == '' ">
7+
</PnPCorePath>
68
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
79
<ProjectGuid>{1DDE6F0A-CA49-419A-9CE8-A6CA02F43CE0}</ProjectGuid>
810
<OutputType>Library</OutputType>
@@ -27,7 +29,7 @@
2729
<OutputType>Library</OutputType>
2830
<AppDesignerFolder>Properties</AppDesignerFolder>
2931
<RootNamespace>SharePointPnP.PowerShell.Commands</RootNamespace>
30-
<AssemblyName>SharePointPnP.PowerShell.SP2013.Commands</AssemblyName>
32+
<AssemblyName>SharePointPnP.PowerShell.2013.Commands</AssemblyName>
3133
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
3234
<FileAlignment>512</FileAlignment>
3335
<SccProjectName>
@@ -46,7 +48,7 @@
4648
<OutputType>Library</OutputType>
4749
<AppDesignerFolder>Properties</AppDesignerFolder>
4850
<RootNamespace>SharePointPnP.PowerShell.Commands</RootNamespace>
49-
<AssemblyName>SharePointPnP.PowerShell.SP2016.Commands</AssemblyName>
51+
<AssemblyName>SharePointPnP.PowerShell.2016.Commands</AssemblyName>
5052
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
5153
<FileAlignment>512</FileAlignment>
5254
<SccProjectName>
@@ -272,6 +274,24 @@
272274
</ItemGroup>
273275
</Otherwise>
274276
</Choose>
277+
<Choose>
278+
<When Condition=" '$(PnPCorePath)' == '' ">
279+
<ItemGroup>
280+
<Reference Include="OfficeDevPnP.Core">
281+
<SpecificVersion>False</SpecificVersion>
282+
<HintPath>..\..\PnP-Sites-Core\Core\OfficeDevPnP.Core\bin\$(Configuration)\OfficeDevPnP.Core.dll</HintPath>
283+
</Reference>
284+
</ItemGroup>
285+
</When>
286+
<Otherwise>
287+
<ItemGroup>
288+
<Reference Include="OfficeDevPnP.Core">
289+
<SpecificVersion>False</SpecificVersion>
290+
<HintPath>$(PnPCorePath)</HintPath>
291+
</Reference>
292+
</ItemGroup>
293+
</Otherwise>
294+
</Choose>
275295
<ItemGroup>
276296
<Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
277297
<Private>True</Private>
@@ -289,10 +309,6 @@
289309
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
290310
<Private>True</Private>
291311
</Reference>
292-
<Reference Include="OfficeDevPnP.Core">
293-
<SpecificVersion>False</SpecificVersion>
294-
<HintPath>..\..\PnP-Sites-Core\Core\OfficeDevPnP.Core\bin\$(Configuration)\OfficeDevPnP.Core.dll</HintPath>
295-
</Reference>
296312
<Reference Include="System" />
297313
<Reference Include="System.Configuration" />
298314
<Reference Include="System.Core" />
@@ -556,24 +572,25 @@
556572
</EmbeddedResource>
557573
</ItemGroup>
558574
<ItemGroup>
559-
<None Include="ModuleFiles\SharePointPnPPowerShellSP2016.psd1">
575+
<None Include="ModuleFiles\SharePointPnPPowerShell2016.psd1">
560576
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
561577
</None>
562-
<None Include="ModuleFiles\SharePointPnP.PowerShell.SP2016.Commands.Format.ps1xml">
578+
<None Include="ModuleFiles\SharePointPnP.PowerShell.2016.Commands.Format.ps1xml">
563579
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
564580
</None>
565-
<None Include="ModuleFiles\SharePointPnPPowerShellSP2013.psd1">
581+
<None Include="ModuleFiles\SharePointPnPPowerShell2013.psd1">
566582
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
567583
</None>
568-
<None Include="ModuleFiles\SharePointPnP.PowerShell.SP2013.Commands.Format.ps1xml">
584+
<None Include="ModuleFiles\SharePointPnP.PowerShell.2013.Commands.Format.ps1xml">
569585
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
570586
</None>
571587
</ItemGroup>
572588
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
573589
<PropertyGroup>
574-
<PostBuildEvent>"$(SolutionDir)\CmdletHelpGenerator\bin\$(ConfigurationName)\SharePointPnP.PowerShell.CmdletHelpGenerator.exe" "$(TargetPath)" "$(TargetDir)\$(TargetFileName)-help.xml" "$(SolutionDir)
575-
C:\windows\system32\windowspowershell\v1.0\powershell.exe -ExecutionPolicy bypass -NoLogo -NonInteractive -Command .'$(SolutionDir)PostBuild.ps1' -ProjectDir:'$(ProjectDir)' -ConfigurationName:'$(ConfigurationName)' -TargetDir:'$(TargetDir)' -TargetFileName:'$(TargetFileName)' -TargetName:'$(TargetName)' -SolutionDir:'$(SolutionDir)'
576-
</PostBuildEvent>
590+
<PostBuildEvent>
591+
"$(SolutionDir)\CmdletHelpGenerator\bin\$(ConfigurationName)\SharePointPnP.PowerShell.CmdletHelpGenerator.exe" "$(TargetPath)" "$(TargetDir)\$(TargetFileName)-help.xml" "$(SolutionDir)
592+
C:\windows\system32\windowspowershell\v1.0\powershell.exe -ExecutionPolicy bypass -NoLogo -NonInteractive -Command .'$(SolutionDir)PostBuild.ps1' -ProjectDir:'$(ProjectDir)' -ConfigurationName:'$(ConfigurationName)' -TargetDir:'$(TargetDir)' -TargetFileName:'$(TargetFileName)' -TargetName:'$(TargetName)' -SolutionDir:'$(SolutionDir)'
593+
</PostBuildEvent>
577594
<ProjectGuid>{1DDE6F0A-CA49-419A-9CE8-A6CA02F43CE0}</ProjectGuid>
578595
</PropertyGroup>
579596
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎PostBuild.ps1

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ if($ConfigurationName -like "Debug*")
55
$documentsFolder = [environment]::getfolderpath("mydocuments");
66
if($ConfigurationName -like "Debug15")
77
{
8-
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShellSP2013"
8+
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShell2013"
99
} elseif($ConfigurationName -like "Debug16")
1010
{
11-
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShellSP2016"
11+
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShell2016"
1212
} else {
1313
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShellOnline"
1414
}
@@ -30,12 +30,12 @@ if($ConfigurationName -like "Debug*")
3030
switch($ConfigurationName)
3131
{
3232
"Debug15" {
33-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShellSP2013.psd1" -Destination "$DestinationFolder"
34-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.SP2013.Commands.Format.ps1xml" -Destination "$DestinationFolder"
33+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShell2013.psd1" -Destination "$DestinationFolder"
34+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.2013.Commands.Format.ps1xml" -Destination "$DestinationFolder"
3535
}
3636
"Debug16" {
37-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShellSP2016.psd1" -Destination "$DestinationFolder"
38-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.SP2016.Commands.Format.ps1xml" -Destination "$DestinationFolder"
37+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShell2016.psd1" -Destination "$DestinationFolder"
38+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.2016.Commands.Format.ps1xml" -Destination "$DestinationFolder"
3939
}
4040
"Debug" {
4141
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShellOnline.psd1" -Destination "$DestinationFolder"
@@ -49,11 +49,11 @@ if($ConfigurationName -like "Debug*")
4949
{
5050
"Release15"
5151
{
52-
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShellSP2013"
52+
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShell2013"
5353
}
5454
"Release16"
5555
{
56-
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShellSP2016"
56+
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShell2016"
5757
}
5858
"Release"
5959
{
@@ -78,12 +78,12 @@ if($ConfigurationName -like "Debug*")
7878
switch($ConfigurationName)
7979
{
8080
"Release15" {
81-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShellSP2013.psd1" -Destination "$DestinationFolder"
82-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.SP2013.Commands.Format.ps1xml" -Destination "$DestinationFolder"
81+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShell2013.psd1" -Destination "$DestinationFolder"
82+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.2013.Commands.Format.ps1xml" -Destination "$DestinationFolder"
8383
}
8484
"Release16" {
85-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShellSP2016.psd1" -Destination "$DestinationFolder"
86-
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.SP2016.Commands.Format.ps1xml" -Destination "$DestinationFolder"
85+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShell2016.psd1" -Destination "$DestinationFolder"
86+
Copy-Item "$TargetDir\ModuleFiles\SharePointPnP.PowerShell.2016.Commands.Format.ps1xml" -Destination "$DestinationFolder"
8787
}
8888
"Release" {
8989
Copy-Item "$TargetDir\ModuleFiles\SharePointPnPPowerShellOnline.psd1" -Destination "$DestinationFolder"

0 commit comments

Comments
 (0)