Skip to content

Commit 8c45a82

Browse files
erwinvanhunenerwinvanhunen
authored
Merge pull request #4417 from KoenZomers/UpdateNuGetPackages
Updating NuGet packages and removing no longer used ones
2 parents 477d8ee + 7607f38 commit 8c45a82

File tree

10 files changed

+63
-68
lines changed

10 files changed

+63
-68
lines changed

‎src/ALC/ALC.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.002.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PnP.PowerShell.ALC", "PnP.PowerShell.ALC.csproj", "{0BFB8F61-512F-405A-BC8A-7D2C804A5963}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{0BFB8F61-512F-405A-BC8A-7D2C804A5963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{0BFB8F61-512F-405A-BC8A-7D2C804A5963}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{0BFB8F61-512F-405A-BC8A-7D2C804A5963}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{0BFB8F61-512F-405A-BC8A-7D2C804A5963}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {B34EA9CD-BE09-4B3E-ADF7-CC08EB6BDA39}
24+
EndGlobalSection
25+
EndGlobal

‎src/ALC/PnP.PowerShell.ALC.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
10+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎src/Commands/Base/ConnectOnline.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using Microsoft.Graph;
2-
using Microsoft.SharePoint.Client;
1+
using Microsoft.SharePoint.Client;
32
using PnP.Framework;
4-
using PnP.PowerShell.Commands.Apps;
53
using PnP.PowerShell.Commands.Base.PipeBinds;
64
using PnP.PowerShell.Commands.Enums;
75
using PnP.PowerShell.Commands.Model;

‎src/Commands/Base/PnPGraphCmdlet.cs‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
using Microsoft.Graph;
2-
using Microsoft.SharePoint.Client;
1+
using Microsoft.SharePoint.Client;
32
using PnP.Core.Services;
43
using System.Management.Automation;
5-
using System.Net.Http.Headers;
6-
using System.Threading.Tasks;
74

85
namespace PnP.PowerShell.Commands.Base
96
{
@@ -19,8 +16,6 @@ public abstract class PnPGraphCmdlet : PnPConnectedCmdlet
1916

2017
public PnPContext PnPContext => Connection?.PnPContext;
2118

22-
private GraphServiceClient serviceClient;
23-
2419
protected override void BeginProcessing()
2520
{
2621
base.BeginProcessing();
@@ -40,29 +35,5 @@ protected override void BeginProcessing()
4035
/// Returns an Access Token for the Microsoft Graph API, if available, otherwise NULL
4136
/// </summary>
4237
public string AccessToken => TokenHandler.GetAccessToken(this, $"https://{Connection.GraphEndPoint}/.default", Connection);
43-
44-
internal GraphServiceClient ServiceClient
45-
{
46-
get
47-
{
48-
if (serviceClient == null)
49-
{
50-
var baseUrl = $"https://{Connection.GraphEndPoint}/v1.0";
51-
serviceClient = new GraphServiceClient(baseUrl, new DelegateAuthenticationProvider(
52-
async (requestMessage) =>
53-
{
54-
await Task.Run(() =>
55-
{
56-
if (!string.IsNullOrEmpty(AccessToken))
57-
{
58-
// Configure the HTTP bearer Authorization Header
59-
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("bearer", AccessToken);
60-
}
61-
});
62-
}), new HttpProvider());
63-
}
64-
return serviceClient;
65-
}
66-
}
6738
}
6839
}

‎src/Commands/Base/PnPSharePointCmdlet.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected string AccessToken
5050
{
5151
if (Connection.Context != null)
5252
{
53-
var settings = Microsoft.SharePoint.Client.InternalClientContextExtensions.GetContextSettings(Connection.Context);
53+
Framework.Utilities.Context.ClientContextSettings settings = Microsoft.SharePoint.Client.InternalClientContextExtensions.GetContextSettings(Connection.Context);
5454
if (settings != null)
5555
{
5656
var authManager = settings.AuthenticationManager;

‎src/Commands/Enums/ClonableTeamParts.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Runtime.Serialization;
3+
4+
namespace PnP.PowerShell.Commands.Enums
5+
{
6+
/// <summary>
7+
/// Describes which part of a team should be cloned.
8+
/// </summary>
9+
/// <see href="https://learn.microsoft.com/en-us/graph/api/resources/clonableteamparts?view=graph-rest-1.0">
10+
[Flags]
11+
public enum ClonableTeamParts
12+
{
13+
[EnumMember(Value = "apps")]
14+
Apps = 1,
15+
16+
[EnumMember(Value = "tabs")]
17+
Tabs = 2,
18+
19+
[EnumMember(Value = "settings")]
20+
Settings = 4,
21+
22+
[EnumMember(Value = "channels")]
23+
Channels = 8,
24+
25+
[EnumMember(Value = "members")]
26+
Members = 0x10
27+
}
28+
}

‎src/Commands/Model/SharePoint/SPConsumingTenantContainersByOwningAppId.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
using Microsoft.Graph;
2-
using Microsoft.Online.SharePoint.TenantAdministration;
1+
using Microsoft.Online.SharePoint.TenantAdministration;
32
using Microsoft.Online.SharePoint.TenantManagement;
43
using System;
54
using System.Collections.Generic;
6-
using System.Linq;
7-
using System.Runtime.Serialization;
8-
using System.Text;
9-
using System.Threading.Tasks;
105

116
namespace PnP.PowerShell.Commands.Model.SharePoint
127
{

‎src/Commands/Model/Teams/TeamCloneSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Text.Json.Serialization;
2-
using Microsoft.Graph;
2+
using PnP.PowerShell.Commands.Enums;
33
using PnP.PowerShell.Commands.Model.Graph;
44

55
namespace PnP.PowerShell.Commands.Model.Teams

‎src/Commands/PnP.PowerShell.csproj‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="AngleSharp" Version="0.17.0" />
57-
58-
<PackageReference Include="Microsoft.Graph" Version="3.33.0" />
59-
<PackageReference Include="Microsoft.Identity.Client" Version="4.66.1" />
60-
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.66.1" />
61-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
62-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
6356
<PackageReference Include="Microsoft.SharePointOnline.CSOM" Version="16.1.*" />
6457
<PackageReference Include="PnP.Framework" Version="1.17.*-*" Condition="'$(PnPFrameworkPath)' == '' and '$(IsRelease)' != '1'" />
6558
<PackageReference Include="PnP.Framework" Version="1.17.*-*" Condition="'$(IsRelease)' == '1'" />
@@ -81,11 +74,7 @@
8174

8275
<!-- <PackageReference Include="PnP.Core.Transformation.SharePoint" Version="1.6.*-*" Condition="'$(PnPCoreSdkPath)' == '' and '$(IsRelease)' != '1'" />
8376
<PackageReference Include="PnP.Core.Transformation.SharePoint" Version="*" Condition="'$(IsRelease)' == '1'" /> -->
84-
<PackageReference Include="PnP.Core.Transformation.SharePoint" Version="1.14.*-*" />
85-
86-
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
87-
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
88-
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
77+
<PackageReference Include="PnP.Core.Transformation.SharePoint" Version="1.14.*-*" />
8978
<ProjectReference Include="..\ALC\PnP.PowerShell.ALC.csproj" />
9079

9180
</ItemGroup>
@@ -135,18 +124,8 @@
135124
</ItemGroup>
136125

137126
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
138-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
139-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
140-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
141-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
142-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
143-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
144-
<PackageReference Include="System.Security.Cryptography.OpenSsl" Version="5.0.0" />
145-
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
146127
<PackageReference Include="System.Management.Automation" Version="7.4.4" />
147-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
148-
<PackageReference Include="TextCopy" Version="6.2.1" />
149-
128+
<PackageReference Include="TextCopy" Version="6.2.1" />
150129
</ItemGroup>
151130

152131
<ItemGroup>

‎src/Commands/Teams/CopyTeamsTeam.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
using Microsoft.Graph;
2-
using PnP.Framework.Provisioning.Model.Teams;
1+
using PnP.Framework.Provisioning.Model.Teams;
32
using PnP.PowerShell.Commands.Attributes;
43
using PnP.PowerShell.Commands.Base;
54
using PnP.PowerShell.Commands.Base.PipeBinds;
5+
using PnP.PowerShell.Commands.Enums;
66
using PnP.PowerShell.Commands.Model.Graph;
77
using PnP.PowerShell.Commands.Model.Teams;
88
using PnP.PowerShell.Commands.Utilities;
9-
using PnP.PowerShell.Commands.Utilities.REST;
109
using System;
1110
using System.Linq;
1211
using System.Management.Automation;

0 commit comments

Comments
 (0)