Merge branch 'release/2.3.6.0'

wcm-io-devops · Jan 3, 2020 · 9e4fb64 · 9e4fb64
2 parents d3f35e1 + b412e37
commit 9e4fb64
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,11 @@
-# This is the central .gitignore file for all pro!vision GIT repos. Please do not change it on project-level.
-# See https://jira.pvtool.org/confluence/x/IACuBg for details.
-
 target/
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
 release.properties
 maven-eclipse.xml
+infinitest.filters
 
 node_modules/
 npm-debug.log
@@ -20,12 +18,14 @@ npm-debug.log
 .pmd
 .checkstyle
 .idea
+.vagrant
 *.iml
 .DS_Store
 .rubygems
 .sass-cache
 .rubygems-gem-maven-plugin
 *.sublime-*
+*nbactions*.xml
 .temp/
 
 

diff --git a/AEMManager/AEMManager.csproj b/AEMManager/AEMManager.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +11,7 @@
     <RootNamespace>AEMManager</RootNamespace>
     <AssemblyName>AEMManager</AssemblyName>
     <ApplicationIcon>resources\default.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -42,6 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -51,6 +52,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">

diff --git a/AEMManager/App.config b/AEMManager/App.config
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 
   <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="AEMManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="AEMManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
 
   <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="AEMManager.log" />
-      <param name="AppendToFile" value="true" />
-      <param name="MaxSizeRollBackups" value="10" />
-      <param name="MaximumFileSize" value="5MB" />
-      <param name="RollingStyle" value="Size" />
-      <param name="StaticLogFileName" value="false" />
+      <param name="File" value="AEMManager.log"/>
+      <param name="AppendToFile" value="true"/>
+      <param name="MaxSizeRollBackups" value="10"/>
+      <param name="MaximumFileSize" value="5MB"/>
+      <param name="RollingStyle" value="Size"/>
+      <param name="StaticLogFileName" value="false"/>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline" />
+        <conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline"/>
       </layout>
     </appender>
 
     <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
-      <applicationName value="AEMManager" />
+      <applicationName value="AEMManager"/>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline" />
+        <conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline"/>
       </layout>
       <filter type="log4net.Filter.LevelRangeFilter">
-        <levelMin value="ERROR" />
+        <levelMin value="ERROR"/>
       </filter>
     </appender>
 
     <root>
       <level value="WARN"/>
-      <appender-ref ref="RollingLogFileAppender" />
+      <appender-ref ref="RollingLogFileAppender"/>
       <!--
       <appender-ref ref="EventLogAppender" />
 			-->
@@ -67,4 +67,4 @@
     </AEMManager.Properties.Settings>
   </applicationSettings>
 
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
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/";
+      p.StartInfo.FileName = "https://docs.adobe.com/content/help/en/experience-cloud/user-guides/home.html#icon-adobe-experience-manager";
       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/docs/en/aem/6-2/develop/ref.html";
+      p.StartInfo.FileName = "https://docs.adobe.com/content/help/en/experience-manager-65/developing/introduction/reference-materials.html";
       p.Start();
     }
 

diff --git a/AEMManager/Properties/AssemblyInfo.cs b/AEMManager/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("wcm.io")]
 [assembly: AssemblyProduct("wcm.io AEM Manager")]
-[assembly: AssemblyCopyright("©2010-2016 pro!vision GmbH, wcm.io")]
+[assembly: AssemblyCopyright("©2010-2020 pro!vision GmbH, wcm.io")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,8 +29,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.4.0")]
-[assembly: AssemblyFileVersion("2.3.4.0")]
+[assembly: AssemblyVersion("2.3.6.0")]
+[assembly: AssemblyFileVersion("2.3.6.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/AEMManagerSetup/Product.wxs b/AEMManagerSetup/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29"
            Manufacturer="wcm.io"
-           Version="2.3.4.0">
+           Version="2.3.6.0">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of AEM Manager is already installed." />