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

Commit 9435829

Browse files
erwinvanhunenerwinvanhunen
committed
Renamed cmdlet Module and updated CSPROJ files to reflect name change
1 parent b5b0b67 commit 9435829

9 files changed

+90
-17
lines changed

‎Commands/Admin/NewTenantSite.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Microsoft.SharePoint.Client;
33
using SharePointPnP.PowerShell.CmdletHelpAttributes;
44
using SharePointPnP.PowerShell.Commands.Base;
5+
using OfficeDevPnP.Core.Entities;
56

67
namespace SharePointPnP.PowerShell.Commands
78
{

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

File renamed without changes.

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

File renamed without changes.

‎Commands/ModuleFiles/SharePointPnPPowerShellOnline.psd1

-40 Bytes
Binary file not shown.

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

1.57 KB
Binary file not shown.

‎Commands/ModuleFiles/SharePointPnPPowerShellSP2016.psd1

-40 Bytes
Binary file not shown.

‎Commands/SharePointPnP.PowerShell.Commands.csproj

+24-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>OfficeDevPnP.PowerShell.Commands</RootNamespace>
11-
<AssemblyName>OfficeDevPnP.PowerShell.V16.Commands</AssemblyName>
11+
<AssemblyName>OfficeDevPnP.PowerShell.Online.Commands</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SccProjectName>
@@ -27,7 +27,26 @@
2727
<OutputType>Library</OutputType>
2828
<AppDesignerFolder>Properties</AppDesignerFolder>
2929
<RootNamespace>OfficeDevPnP.PowerShell.Commands</RootNamespace>
30-
<AssemblyName>OfficeDevPnP.PowerShell.V15.Commands</AssemblyName>
30+
<AssemblyName>OfficeDevPnP.PowerShell.SP2013.Commands</AssemblyName>
31+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
32+
<FileAlignment>512</FileAlignment>
33+
<SccProjectName>
34+
</SccProjectName>
35+
<SccLocalPath>
36+
</SccLocalPath>
37+
<SccAuxPath>
38+
</SccAuxPath>
39+
<SccProvider>
40+
</SccProvider>
41+
</PropertyGroup>
42+
<PropertyGroup Condition=" '$(Configuration)' == 'debug16' Or '$(Configuration)' == 'release16' ">
43+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
44+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
45+
<ProjectGuid>{1DDE6F0A-CA49-419A-9CE8-A6CA02F43CE0}</ProjectGuid>
46+
<OutputType>Library</OutputType>
47+
<AppDesignerFolder>Properties</AppDesignerFolder>
48+
<RootNamespace>OfficeDevPnP.PowerShell.Commands</RootNamespace>
49+
<AssemblyName>OfficeDevPnP.PowerShell.SP2016.Commands</AssemblyName>
3150
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
3251
<FileAlignment>512</FileAlignment>
3352
<SccProjectName>
@@ -92,9 +111,6 @@
92111
<ErrorReport>prompt</ErrorReport>
93112
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
94113
</PropertyGroup>
95-
<PropertyGroup>
96-
<AssemblyName>SharePointPnP.PowerShell.Online.Commands</AssemblyName>
97-
</PropertyGroup>
98114
<PropertyGroup>
99115
<RootNamespace>SharePointPnP.PowerShell.Commands</RootNamespace>
100116
</PropertyGroup>
@@ -543,13 +559,13 @@
543559
<None Include="ModuleFiles\SharePointPnPPowerShellSP2016.psd1">
544560
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
545561
</None>
546-
<None Include="ModuleFiles\SharePointPnP.PowerShell.V16.Commands.Format.ps1xml">
562+
<None Include="ModuleFiles\SharePointPnP.PowerShell.SP2016.Commands.Format.ps1xml">
547563
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
548564
</None>
549-
<None Include="ModuleFiles\SharePointPnPSPowerShellSP2013.psd1">
565+
<None Include="ModuleFiles\SharePointPnPPowerShellSP2013.psd1">
550566
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
551567
</None>
552-
<None Include="ModuleFiles\SharePointPnP.PowerShell.V15.Commands.Format.ps1xml">
568+
<None Include="ModuleFiles\SharePointPnP.PowerShell.SP2013.Commands.Format.ps1xml">
553569
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
554570
</None>
555571
</ItemGroup>

‎PostBuild.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ if($ConfigurationName -like "Debug*")
55
$documentsFolder = [environment]::getfolderpath("mydocuments");
66
if($ConfigurationName -like "Debug15")
77
{
8-
98
$DestinationFolder = "$documentsFolder\WindowsPowerShell\Modules\SharePointPnPPowerShellSP2013"
109
} elseif($ConfigurationName -like "Debug16")
1110
{
@@ -21,8 +20,8 @@ if($ConfigurationName -like "Debug*")
2120
Remove-Item $DestinationFolder\*
2221
} else {
2322
# No, create it
24-
Write-Host "Creating target folder: $PSModuleHome"
25-
New-Item -Path $PSModuleHome -ItemType Directory -Force >$null # Suppress output
23+
Write-Host "Creating target folder: $DestinationFolder"
24+
New-Item -Path $DestinationFolder -ItemType Directory -Force >$null # Suppress output
2625
}
2726

2827
Write-Host "Copying files from $TargetDir to $DestinationFolder"
@@ -57,6 +56,7 @@ if($ConfigurationName -like "Debug*")
5756
Remove-Item $DestinationFolder\*
5857
} else {
5958
# No, create it
59+
Write-Host "Creating target folder: $DestinationFolder"
6060
New-Item -Path $DestinationFolder -ItemType Directory -Force >$null # Suppress output
6161
}
6262

‎Tests/SharePointPnP.PowerShell.Tests.csproj

+62-6
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,62 @@
127127
</Reference>
128128
</ItemGroup>
129129
</When>
130+
<When Condition=" '$(Configuration)' == 'debug16' Or '$(Configuration)' == 'release16' ">
131+
<ItemGroup>
132+
<Reference Include="Microsoft.Office.Client.Policy, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
133+
<SpecificVersion>False</SpecificVersion>
134+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.Office.Client.Policy.dll</HintPath>
135+
</Reference>
136+
<Reference Include="Microsoft.Office.Client.TranslationServices, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
137+
<SpecificVersion>False</SpecificVersion>
138+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.Office.Client.TranslationServices.dll</HintPath>
139+
</Reference>
140+
<Reference Include="Microsoft.Online.SharePoint.Client.Tenant, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
141+
<SpecificVersion>False</SpecificVersion>
142+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.Online.SharePoint.Client.Tenant.dll</HintPath>
143+
</Reference>
144+
<Reference Include="Microsoft.SharePoint.Client, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
145+
<SpecificVersion>False</SpecificVersion>
146+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.dll</HintPath>
147+
</Reference>
148+
<Reference Include="Microsoft.SharePoint.Client.DocumentManagement, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
149+
<SpecificVersion>False</SpecificVersion>
150+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.DocumentManagement.dll</HintPath>
151+
</Reference>
152+
<Reference Include="Microsoft.SharePoint.Client.Publishing, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
153+
<SpecificVersion>False</SpecificVersion>
154+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.Publishing.dll</HintPath>
155+
</Reference>
156+
<Reference Include="Microsoft.SharePoint.Client.Runtime, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
157+
<SpecificVersion>False</SpecificVersion>
158+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.Runtime.dll</HintPath>
159+
</Reference>
160+
<Reference Include="Microsoft.SharePoint.Client.Search, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
161+
<SpecificVersion>False</SpecificVersion>
162+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.Search.dll</HintPath>
163+
</Reference>
164+
<Reference Include="Microsoft.SharePoint.Client.Search.Applications, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
165+
<SpecificVersion>False</SpecificVersion>
166+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.Search.Applications.dll</HintPath>
167+
</Reference>
168+
<Reference Include="Microsoft.SharePoint.Client.Taxonomy, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
169+
<SpecificVersion>False</SpecificVersion>
170+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.Taxonomy.dll</HintPath>
171+
</Reference>
172+
<Reference Include="Microsoft.SharePoint.Client.UserProfiles, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
173+
<SpecificVersion>False</SpecificVersion>
174+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.UserProfiles.dll</HintPath>
175+
</Reference>
176+
<Reference Include="Microsoft.SharePoint.Client.WorkflowServices, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
177+
<SpecificVersion>False</SpecificVersion>
178+
<HintPath>..\..\PnP-Sites-Core\Assemblies\16.0\Microsoft.SharePoint.Client.WorkflowServices.dll</HintPath>
179+
</Reference>
180+
<Reference Include="Microsoft.Office.Client.Education, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
181+
<SpecificVersion>False</SpecificVersion>
182+
<HintPath>..\ReferenceAssemblies\16.0\Microsoft.Office.Client.Education.dll</HintPath>
183+
</Reference>
184+
</ItemGroup>
185+
</When>
130186
<Otherwise>
131187
<ItemGroup>
132188
<Reference Include="Microsoft.Office.Client.Policy, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
@@ -226,12 +282,6 @@
226282
<Compile Include="TestCommon.cs" />
227283
<Compile Include="BrandingTests.cs" />
228284
</ItemGroup>
229-
<ItemGroup>
230-
<ProjectReference Include="..\Commands\SharePointPnP.PowerShell.Commands.csproj">
231-
<Project>{1dde6f0a-ca49-419a-9ce8-a6ca02f43ce0}</Project>
232-
<Name>SharePointPnP.PowerShell.Commands</Name>
233-
</ProjectReference>
234-
</ItemGroup>
235285
<ItemGroup>
236286
<Content Include="Resources\template.xml" />
237287
<Content Include="Resources\webpart.xml" />
@@ -240,6 +290,12 @@
240290
<None Include="App.config" />
241291
<None Include="App.config.sample" />
242292
</ItemGroup>
293+
<ItemGroup>
294+
<ProjectReference Include="..\Commands\SharePointPnP.PowerShell.Commands.csproj">
295+
<Project>{1dde6f0a-ca49-419a-9ce8-a6ca02f43ce0}</Project>
296+
<Name>SharePointPnP.PowerShell.Commands</Name>
297+
</ProjectReference>
298+
</ItemGroup>
243299
<Choose>
244300
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
245301
<ItemGroup>

0 commit comments

Comments
 (0)