Skip to content

Commit

Permalink
Bump NuGet Dependencies like ApiDescription and IdentityModel assembl…
Browse files Browse the repository at this point in the history
…ies [PublishToPSGalleryAsPreview]
  • Loading branch information
ddemeyer committed Aug 23, 2024
1 parent 3c20dc4 commit 7e7c324
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 26 deletions.
13 changes: 7 additions & 6 deletions Doc/ReleaseNotes-ISHRemote-8.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The contract of what you put on the BackgroundTask message queue under `InputDat
| *custom* | when not specified you have to pass `-RawInputData` | *custom* | value of `-RawInputData` should match your BackgroundTask handler implementation |

### Example using SMARTTAG
Add BackgroundTask with event type `SMARTTAG` for the objects located under the `General\MyFolder\Topics` path. One BackgroundTask message will appear per folder containing a list of all latest version English content objects in the InputData of the message. Note that there is no devide on `$ishSession.MetadataBatchSize` (default was 999) anymore in this version of ISHRemote.
Add BackgroundTask with event type `SMARTTAG` for the objects located under the `General\MyFolder\Topics` path. One BackgroundTask message will appear per folder containing a list of all latest version English (`en`) content objects in the InputData of the message. Note that there is no devide on `$ishSession.MetadataBatchSize` (default was 999) anymore since this v8.1 version of ISHRemote.
```powershell
Get-IshFolder -FolderPath "General\Myfolder\Topics" -FolderTypeFilter @("ISHModule", "ISHMasterDoc", "ISHLibrary") -Recurse |
ForEach-Object -Process {
Expand All @@ -48,9 +48,9 @@ ForEach-Object -Process {
```

### Example using SYNCHRONIZEMETRICS
Rebuilding the Metrics subsystem, introduced in Tridion Docs 15.1, is optimally done in the order of Images, Topics and Publications. Add BackgroundTask with event type `SYNCHRONIZEMETRICS` for the objects located under the `General` path (`Data` folder). One BackgroundTask message will appear per folder containing a list of LogicalIds in the `InputData` of the message, hence the content of one folder is passed in one message.
Rebuilding the Metrics subsystem, introduced in Tridion Docs 15.1 Update 1 (15.1.1), is optimally done in the order of Images, Topics and Publications. Add BackgroundTask with event type `SYNCHRONIZEMETRICS` for the objects located under the `General` path (`Data` folder). One BackgroundTask message will appear per folder containing a list of LogicalIds in the `InputData` of the message, hence the content of one folder is passed in one message.

Note that a more complex script will be offered in the product (IShCD) that covers error handling, logging transcript and more. The below illustrates that ISHRemote cmdlets are an enabler for the feature.
Note that a more complex script will be offered in the product (IShCD) that covers error handling, logging transcript and more. The below illustrates that ISHRemote cmdlets are an enabler for the feature and offering variations like partial rebuilds and more.
```powershell
# First Images
Get-IshFolder -BaseFolder Data -FolderTypeFilter @("ISHIllustration") -Recurse |
Expand Down Expand Up @@ -110,7 +110,8 @@ n/a

## Breaking Changes - Platform

n/a
* Security and Platform Updates, bumped version of System.Text.Json to 8.0.4; Duende's IdentityModel libraries to 6.0.0 and 7.0.0; Microsoft.Extensions.ApiDescription.Client to 8.0.8 and matching NSwag.ApiDescription.Client to 14.1.0; and Microsoft.PowerShell.Commands.Management to 7.2.23, the latest to support the technically obsolete PowerShell 7.2+/NET6+ combination.
* Note that `Microsoft.Extensions.Logging.dll` is no longer preloaded by `AppDomainModuleAssemblyInitializer.cs` as a side-effect of the above assembly version bumps where bugs where fixed in the third party libraries.


## Known Issues
Expand Down Expand Up @@ -138,8 +139,8 @@ Below is not an official performance compare, but a recurring thing noticed alon
| Name | Client Platform | Protocol | Test Results |
|--------------------------|-------------------------------------|----------------------|----------------|
| ISHRemote 8.0.10919.0 | PowerShell 7.4.0 on .NET 8.0.0 | WcfSoapWithOpenIdConnect | Tests completed in 449.72s AND Tests Passed: 1057, Failed: 0, Skipped: 3 NotRun: 0 |
| ISHRemote 8.0.11207.0 | Windows PowerShell 5.1 on .NET 4.8.1 | WcfSoapWithOpenIdConnect | Tests completed in 464.79s AND Tests Passed: 1062, Failed: 0, Skipped: 3 NotRun: 0 |
| ISHRemote 8.1.11503.0 | PowerShell 7.4.3 on .NET 8.0.0 | WcfSoapWithOpenIdConnect | Tests completed in 552.74s AND Tests Passed: 1062, Failed: 0, Skipped: 3 NotRun: 0 |
| ISHRemote 8.1.11623.0 | Windows PowerShell 5.1 on .NET 4.8.1 | WcfSoapWithOpenIdConnect | Tests completed in 515.62s AND Tests Passed: 1063, Failed: 0, Skipped: 4 NotRun: 0 |
| ISHRemote 8.1.11623.0 | PowerShell 7.4.5 on .NET 8.0.0 | WcfSoapWithOpenIdConnect | Tests completed in 467s AND Tests Passed: 1063, Failed: 0, Skipped: 4 NotRun: 0 |



Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.3">
<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NSwag.ApiDescription.Client" Version="14.0.7">
<PackageReference Include="NSwag.ApiDescription.Client" Version="14.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.3">
<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NSwag.ApiDescription.Client" Version="14.0.7">
<PackageReference Include="NSwag.ApiDescription.Client" Version="14.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override void BeginProcessing()
{
base.BeginProcessing();
#if NET48
WriteVerbose("ISHRemote module on PS5.1/NET48 forces Assembly Redirects for System.Runtime.CompilerServices.Unsafe.dll/System.Text.Json.dll/IdentityModel.OidcClient.dll/Microsoft.Bcl.AsyncInterfaces.dll/System.Text.Encodings.Web.dll/System.Memory.dll/System.ComponentModel.Annotations.dll/Microsoft.Extensions.Logging.dll");
WriteVerbose("ISHRemote module on PS5.1/NET48 forces Assembly Redirects for System.Runtime.CompilerServices.Unsafe.dll/System.Text.Json.dll/IdentityModel.OidcClient.dll/Microsoft.Bcl.AsyncInterfaces.dll/System.Text.Encodings.Web.dll/System.Memory.dll/System.ComponentModel.Annotations.dll");
#else
WriteVerbose("ISHRemote module on PS7.2+/NET60+ forces Assembly Redirects for IdentityModel.dll");
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,10 @@ public void OnImport()
assembly = Assembly.LoadFrom(filePath);
_forcedLoadedAssemblies.GetOrAdd("System.ComponentModel.Annotations", assembly);

filePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"Microsoft.Extensions.Logging.dll");
assembly = Assembly.LoadFrom(filePath);
_forcedLoadedAssemblies.GetOrAdd("Microsoft.Extensions.Logging", assembly);
// No longer required since version bump of 3 IdentityModel.OidcClient assemblies from 5.2.1->6.0.0, so ISHRemote v8.1
//filePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"Microsoft.Extensions.Logging.dll");
//assembly = Assembly.LoadFrom(filePath);
//_forcedLoadedAssemblies.GetOrAdd("Microsoft.Extensions.Logging", assembly);
#else
AssemblyLoadContext.Default.Resolving += ResolveAssembly_NetCore;

Expand Down
24 changes: 12 additions & 12 deletions Source/ISHRemote/Trisoft.ISHRemote/Trisoft.ISHRemote.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
Expand All @@ -14,23 +14,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
<PackageReference Include="IdentityModel.OidcClient.IdentityTokenValidator" Version="5.2.1" />
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
<PackageReference Include="IdentityModel.OidcClient.IdentityTokenValidator" Version="6.0.0" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" Condition="'$(TargetFramework)' == 'net48'" />
<PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.2.18" Condition="'$(TargetFramework)' != 'net48'" />
<PackageReference Include="System.Drawing.Common" Version="8.0.3" />
<PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.2.23" Condition="'$(TargetFramework)' != 'net48'" /><!-- last version for PS7.2 -->
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.3" />
<PackageReference Include="System.ServiceModel.Federation" Version="4.10.3" Condition="'$(TargetFramework)' != 'net48'" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.3" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.3" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.3" />
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.3" /><!-- last version with net48 support -->
<PackageReference Include="System.ServiceModel.Federation" Version="4.10.3" Condition="'$(TargetFramework)' != 'net48'" /><!-- last version with net48 support -->
<PackageReference Include="System.ServiceModel.Http" Version="4.10.3" /><!-- last version with net48 support -->
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.3" /><!-- last version with net48 support -->
<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.3" /><!-- last version with net48 support -->
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" /><!-- last version with net48 support -->
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
Expand Down

0 comments on commit 7e7c324

Please sign in to comment.