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

Commit 475a891

Browse files
committed
Fixed namespaces
1 parent d51c255 commit 475a891

6 files changed

+16
-16
lines changed

Commands/Graph/AddMicrosoft365GroupOwner.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#if !ONPREMISES
22
using OfficeDevPnP.Core.Entities;
33
using OfficeDevPnP.Core.Framework.Graph;
4-
using SharePointPnP.PowerShell.CmdletHelpAttributes;
5-
using SharePointPnP.PowerShell.Commands.Base;
6-
using SharePointPnP.PowerShell.Commands.Base.PipeBinds;
4+
using PnP.PowerShell.CmdletHelpAttributes;
5+
using PnP.PowerShell.Commands.Base;
6+
using PnP.PowerShell.Commands.Base.PipeBinds;
77
using System.Management.Automation;
88

99
namespace SharePointPnP.PowerShell.Commands.Graph

Commands/PnPPowerShell.csproj renamed to Commands/PnP.PowerShell.Core.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<AssemblyName>PnP.PowerShell.Core</AssemblyName>
8-
<RootNamespace>SharePointPnP.PowerShell.Commands</RootNamespace>
8+
<RootNamespace>PnP.PowerShell.Commands</RootNamespace>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<PackageId>PnP.PowerShell.Core</PackageId>
1111
<Authors>PnP.PowerShell.Core</Authors>
@@ -57,7 +57,7 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60-
<ProjectReference Include="..\HelpAttributes\SharePointPnP.PowerShell.Core.Attributes.csproj" />
60+
<ProjectReference Include="..\HelpAttributes\PnP.PowerShell.Core.Attributes.csproj" />
6161
</ItemGroup>
6262

6363
<ItemGroup>
@@ -123,7 +123,7 @@
123123
</ItemGroup>
124124

125125
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
126-
<Exec Command="dotnet &quot;$(ProjectDir)..\ModuleFilesGenerator\bin\$(ConfigurationName)\netcoreapp3.0\SharePointPnP.PowerShell.ModuleFilesGenerator.dll&quot; &quot;$(TargetPath)&quot; &quot;$(ConfigurationName)&quot; &quot;$(SolutionDir)" />
126+
<Exec Command="dotnet &quot;$(ProjectDir)..\ModuleFilesGenerator\bin\$(ConfigurationName)\netcoreapp3.0\PnP.PowerShell.ModuleFilesGenerator.dll&quot; &quot;$(TargetPath)&quot; &quot;$(ConfigurationName)&quot; &quot;$(SolutionDir)" />
127127
<Exec Command="&quot;c:\program files\powershell\7\pwsh.exe&quot; -ExecutionPolicy bypass -NoLogo -NonInteractive -Command .'$(SolutionDir)postbuild.ps1' -ProjectDir:'$(ProjectDir)' -ConfigurationName:'$(ConfigurationName)' -TargetDir:'$(TargetDir)' -TargetFileName:'$(TargetFileName)' -TargetName:'$(TargetName)' -SolutionDir:'$(SolutionDir)'" />
128128
</Target>
129129

ModuleFilesGenerator/SharePointPnP.PowerShell.Core.ModuleFilesGenerator.csproj renamed to ModuleFilesGenerator/PnP.PowerShell.Core.ModuleFilesGenerator.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp3.0</TargetFramework>
6-
<AssemblyName>SharePointPnP.PowerShell.ModuleFilesGenerator</AssemblyName>
7-
<RootNamespace>SharePointPnP.PowerShell.ModuleFilesGenerator</RootNamespace>
8-
<StartupObject>SharePointPnP.PowerShell.ModuleFilesGenerator.GenerateModuleFiles</StartupObject>
6+
<AssemblyName>PnP.PowerShell.ModuleFilesGenerator</AssemblyName>
7+
<RootNamespace>PnP.PowerShell.ModuleFilesGenerator</RootNamespace>
8+
<StartupObject>PnP.PowerShell.ModuleFilesGenerator.GenerateModuleFiles</StartupObject>
99
</PropertyGroup>
1010

1111
<ItemGroup>
@@ -20,11 +20,11 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
23-
<PackageReference Include="PowerShellStandard.Library" Version="3.0.0-preview-01" />
23+
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\HelpAttributes\SharePointPnP.PowerShell.Core.Attributes.csproj" />
27+
<ProjectReference Include="..\HelpAttributes\PnP.PowerShell.Core.Attributes.csproj" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
File renamed without changes.

PnPPowerShell.sln renamed to PnPPowerShellCore.sln

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2036
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29926.136
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PnPPowerShell", "Commands\PnPPowerShell.csproj", "{F91159F1-31F8-47CF-B546-9487F9EF8426}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PnP.PowerShell.Core", "Commands\PnP.PowerShell.Core.csproj", "{F91159F1-31F8-47CF-B546-9487F9EF8426}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharePointPnP.PowerShell.Core.Attributes", "HelpAttributes\SharePointPnP.PowerShell.Core.Attributes.csproj", "{2F4E9C95-E61A-44AB-8983-108ADCFE23F8}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PnP.PowerShell.Core.Attributes", "HelpAttributes\PnP.PowerShell.Core.Attributes.csproj", "{2F4E9C95-E61A-44AB-8983-108ADCFE23F8}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{55B21B7C-D936-4411-B03C-6030A7C826A1}"
1111
ProjectSection(SolutionItems) = preProject
1212
PostBuild.ps1 = PostBuild.ps1
1313
EndProjectSection
1414
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharePointPnP.PowerShell.Core.ModuleFilesGenerator", "ModuleFilesGenerator\SharePointPnP.PowerShell.Core.ModuleFilesGenerator.csproj", "{2B367283-B36E-43BB-9325-7D2DF675906D}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PnP.PowerShell.Core.ModuleFilesGenerator", "ModuleFilesGenerator\PnP.PowerShell.Core.ModuleFilesGenerator.csproj", "{2B367283-B36E-43BB-9325-7D2DF675906D}"
1616
EndProject
1717
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{6D788265-F91C-4E2E-AEEE-23A012871023}"
1818
ProjectSection(SolutionItems) = preProject

0 commit comments

Comments
 (0)