Merge branch 'release/2.4.0.0'

wcm-io-devops · May 2, 2024 · 0b61c68 · 0b61c68
2 parents 9e4fb64 + 2093156
commit 0b61c68
Show file tree

Hide file tree

Showing 15 changed files with 147 additions and 155 deletions.
diff --git a/AEMManager/AEMManager.csproj b/AEMManager/AEMManager.csproj
@@ -11,7 +11,7 @@
     <RootNamespace>AEMManager</RootNamespace>
     <AssemblyName>AEMManager</AssemblyName>
     <ApplicationIcon>resources\default.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -55,11 +55,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />

diff --git a/AEMManager/AemActions.cs b/AEMManager/AemActions.cs
@@ -12,6 +12,7 @@
 using System.Management;
 using Microsoft.Win32;
 using AEMManager.Util;
+using System.Linq;
 
 namespace AEMManager {
 
@@ -633,6 +634,13 @@ public static BundleStatus GetCombinedBundleStatus(AemInstance pInstance) {
     private static BundleStatus GetCombinedBundleStatus(object pJsonObject, long pRepsonseTime) {
       BundleStatus bundleStatus = BundleStatus.RUNNING;
 
+      // filter out bundle names as configured in preferences
+      RegistryKey preferencesKey = RegistryUtil.GetUserKey("Preferences");
+      string bundleFilterString = (string)preferencesKey.GetValue("BundleFilter", "");
+      HashSet<string> bundleFilter = bundleFilterString.Split(new char[] { '\n', ',', ';' })
+        .Select(item => item.Trim())
+        .ToHashSet();
+
       Hashtable root = GetHashtable(pJsonObject);
       string status = (string)root["status"];
 
@@ -641,7 +649,7 @@ private static BundleStatus GetCombinedBundleStatus(object pJsonObject, long pRe
         Hashtable bundle = GetHashtable(dataItem);
         string state = (string)bundle["state"];
         if (!string.IsNullOrEmpty(state)) {
-          if (!(state.Equals("Active") || state.Equals("Fragment"))) {
+          if (!(state.Equals("Active") || state.Equals("Fragment") || bundleFilter.Contains((string)bundle["symbolicName"]))) {
             bundleStatus = BundleStatus.STARTING_STOPPING;
             break;
           }

diff --git a/AEMManager/App.config b/AEMManager/App.config
@@ -67,4 +67,4 @@
     </AEMManager.Properties.Settings>
   </applicationSettings>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/AEMManager/PreferencesDialog.Designer.cs b/AEMManager/PreferencesDialog.Designer.cs
diff --git a/AEMManager/PreferencesDialog.cs b/AEMManager/PreferencesDialog.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using Microsoft.Win32;
 using AEMManager.Util;
@@ -19,12 +14,14 @@ public PreferencesDialog() {
     private void PreferencesDialog_Load(object sender, EventArgs e) {
       RegistryKey preferencesKey = RegistryUtil.GetUserKey("Preferences");
       txtLogViewer.Text = (string)preferencesKey.GetValue("LogViewer", "notepad.exe");
+      txtBundleFilter.Text = (string)preferencesKey.GetValue("BundleFilter", "");
     }
 
-    private void cmOK_Click(object sender, EventArgs e) {
+    private void cmdOK_Click(object sender, EventArgs e) {
 
       RegistryKey preferencesKey = RegistryUtil.GetUserKey("Preferences");
       preferencesKey.SetValue("LogViewer", txtLogViewer.Text);
+      preferencesKey.SetValue("BundleFilter", txtBundleFilter.Text);
 
       this.DialogResult = DialogResult.OK;
       this.Close();

diff --git a/AEMManager/PreferencesDialog.resx b/AEMManager/PreferencesDialog.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/AEMManager/Program.cs b/AEMManager/Program.cs
@@ -114,13 +114,13 @@ private static void InitializeNotifyIcon() {
 
     static void AEMDocumentation_Click(object sender, EventArgs e) {
       System.Diagnostics.Process p = new System.Diagnostics.Process();
-      p.StartInfo.FileName = "https://docs.adobe.com/content/help/en/experience-cloud/user-guides/home.html#icon-adobe-experience-manager";
+      p.StartInfo.FileName = "https://experienceleague.adobe.com/en/docs/experience-manager-cloud-service";
       p.Start();
     }
 
     static void AEMRefDocs_Click(object sender, EventArgs e) {
       System.Diagnostics.Process p = new System.Diagnostics.Process();
-      p.StartInfo.FileName = "https://docs.adobe.com/content/help/en/experience-manager-65/developing/introduction/reference-materials.html";
+      p.StartInfo.FileName = "https://experienceleague.adobe.com/en/docs/experience-manager-cloud-service/content/implementing/developing/reference-materials";
       p.Start();
     }
 

diff --git a/AEMManager/Properties/AssemblyInfo.cs b/AEMManager/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("wcm.io")]
 [assembly: AssemblyProduct("wcm.io AEM Manager")]
-[assembly: AssemblyCopyright("©2010-2020 pro!vision GmbH, wcm.io")]
+[assembly: AssemblyCopyright("©2010-2024 diva-e, wcm.io")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,8 +28,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.6.0")]
-[assembly: AssemblyFileVersion("2.3.6.0")]
+[assembly: AssemblyVersion("2.4.0.0")]
+[assembly: AssemblyFileVersion("2.4.0.0")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfiguratorAttribute(Watch = true)]
diff --git a/AEMManager/Properties/Resources.Designer.cs b/AEMManager/Properties/Resources.Designer.cs
diff --git a/AEMManager/Properties/Settings.Designer.cs b/AEMManager/Properties/Settings.Designer.cs
diff --git a/AEMManager/packages.config b/AEMManager/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="1.2.10" targetFramework="net35" />
+  <package id="log4net" version="2.0.14" targetFramework="net462" />
 </packages>
diff --git a/AEMManagerSetup/AEMManagerSetup.wixproj b/AEMManagerSetup/AEMManagerSetup.wixproj
@@ -1,48 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>92469fb7-54f1-4895-b0a9-e2dbee3d0d37</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>AEMManagerSetup</OutputName>
-    <OutputType>Package</OutputType>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-  </PropertyGroup>
+<Project>
+  <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="5.0.0" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Product.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="en-us.wxl" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.0" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
   <!-- Include version number in generated MSI file name -->
   <!-- Solution from https://www.talksharp.com/wix-toolset-append-product-version -->
+  <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="5.0.0" />
   <Target Name="BeforeBuild">
     <!-- Get the programs assembly version from the .exe file -->
     <GetAssemblyIdentity AssemblyFiles="..\AEMManager\bin\$(Configuration)\AEMManager.exe">