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

Commit 8ecdaad

Browse files
committed
August 2008 Point Release
1 parent 0f89424 commit 8ecdaad

File tree

5 files changed

+33
-9
lines changed

5 files changed

+33
-9
lines changed

Commands/Base/ConnectOnline.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,11 @@ private PnPConnection ConnectCredentials(PSCredential credentials)
13441344
RequestTimeout,
13451345
TenantAdminUrl,
13461346
NoTelemetry,
1347+
#if !ONPREMISES
13471348
AzureEnvironment,
1349+
#else
1350+
AzureEnvironment.Production,
1351+
#endif
13481352
SkipTenantAdminCheck,
13491353
AuthenticationMode);
13501354
#else

Commands/Base/PnPConnectionHelper.cs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,19 @@ internal static PnPConnection InstantiateWebloginConnection(Uri url, int minimal
563563
#endif
564564

565565
#if !PNPPSCORE
566-
internal static PnPConnection InstantiateSPOnlineConnection(Uri url, PSCredential credentials, PSHost host, bool currentCredentials, int minimalHealthScore, int retryCount, int retryWait, int requestTimeout, string tenantAdminUrl, bool disableTelemetry, AzureEnvironment azureEnvironment, bool skipAdminCheck = false, ClientAuthenticationMode authenticationMode = ClientAuthenticationMode.Default)
566+
internal static PnPConnection InstantiateSPOnlineConnection(Uri url,
567+
PSCredential credentials,
568+
PSHost host,
569+
bool currentCredentials,
570+
int minimalHealthScore,
571+
int retryCount,
572+
int retryWait,
573+
int requestTimeout,
574+
string tenantAdminUrl,
575+
bool disableTelemetry,
576+
AzureEnvironment azureEnvironment,
577+
bool skipAdminCheck = false,
578+
ClientAuthenticationMode authenticationMode = ClientAuthenticationMode.Default)
567579
{
568580
var context = new PnPClientContext(url.AbsoluteUri);
569581

@@ -676,12 +688,12 @@ internal static PnPConnection InstantiateSPOnlineConnection(Uri url, PSCredentia
676688
var connectionType = ConnectionType.OnPrem;
677689
#else
678690
var connectionType = ConnectionType.O365;
679-
#endif
691+
680692
if (url.Host.ToLowerInvariant().EndsWith($"sharepoint.{OfficeDevPnP.Core.AuthenticationManager.GetSharePointDomainSuffix(azureEnvironment)}"))
681693
{
682694
connectionType = ConnectionType.O365;
683695
}
684-
696+
#endif
685697
if (skipAdminCheck == false)
686698
{
687699
if (IsTenantAdminSite(context))
@@ -744,7 +756,7 @@ internal static PnPConnection InstantiateSPOnlineConnection(Uri url, PSCredentia
744756
#endif
745757

746758
#if !PNPPSCORE
747-
internal static PnPConnection InstantiateAdfsConnection(Uri url, bool useKerberos, PSCredential credentials, PSHost host, int minimalHealthScore, int retryCount, int retryWait, int requestTimeout, string tenantAdminUrl, bool disableTelemetry, bool skipAdminCheck = false, string loginProviderName = null)
759+
internal static PnPConnection InstantiateAdfsConnection(Uri url, bool useKerberos, PSCredential credentials, PSHost host, int minimalHealthScore, int retryCount, int retryWait, int requestTimeout, string tenantAdminUrl, bool disableTelemetry, bool skipAdminCheck = false, string loginProviderName = null)
748760
{
749761
using (var authManager = new OfficeDevPnP.Core.AuthenticationManager())
750762
{

Commands/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
// by using the '*' as shown below:
5252
// [assembly: AssemblyVersion("1.0.*")]
5353
#if !PNPPSCORE
54-
[assembly: AssemblyVersion("3.25.2009.0")]
55-
[assembly: AssemblyFileVersion("3.25.2009.0")]
54+
[assembly: AssemblyVersion("3.24.2008.1")]
55+
[assembly: AssemblyFileVersion("3.24.2008.1")]
5656
#else
5757
[assembly: AssemblyVersion("4.0.0.0")]
5858
[assembly: AssemblyFileVersion("4.0.0.0")]

Commands/Search/GetSearchCrawlLog.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,22 @@ protected override void ExecuteCmdlet()
115115
string postFilter = string.Empty;
116116
if (string.IsNullOrWhiteSpace(Filter) && ContentSource == ContentSource.Sites)
117117
{
118+
#if !ONPREMISES
118119
Filter = $"https://{GetHostName()}.sharepoint.{OfficeDevPnP.Core.AuthenticationManager.GetSharePointDomainSuffix(PnPConnection.CurrentConnection.AzureEnvironment)}";
120+
#else
121+
Filter = $"https://{GetHostName()}.sharepoint.com";
122+
#endif
119123
}
120124

121125
int origLimit = RowLimit;
122126
if (ContentSource == ContentSource.UserProfiles)
123127
{
124128
postFilter = Filter;
129+
#if !ONPREMISES
125130
Filter = $"https://{GetHostName()}-my.sharepoint.{OfficeDevPnP.Core.AuthenticationManager.GetSharePointDomainSuffix(PnPConnection.CurrentConnection.AzureEnvironment)}";
131+
#else
132+
Filter = $"https://{GetHostName()}-my.sharepoint.com";
133+
#endif
126134
RowLimit = MaxRows;
127135
}
128136

@@ -175,7 +183,7 @@ protected override void ExecuteCmdlet()
175183
}
176184
}
177185

178-
#region Helper functions
186+
#region Helper functions
179187

180188
private string GetHostName()
181189
{
@@ -241,6 +249,6 @@ private object ConvertToPSObject(IDictionary<string, object> r)
241249
}
242250
return res;
243251
}
244-
#endregion
252+
#endregion
245253
}
246254
}

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.25.2009.0
1+
3.24.2008.1

0 commit comments

Comments
 (0)