Skip to content

Commit 9e4fb64

Browse files
stefanseifertstefanseifert
committed
Merge branch 'release/2.3.6.0'
2 parents d3f35e1 + b412e37 commit 9e4fb64

File tree

8 files changed

+31
-29
lines changed

8 files changed

+31
-29
lines changed

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
# This is the central .gitignore file for all pro!vision GIT repos. Please do not change it on project-level.
2-
# See https://jira.pvtool.org/confluence/x/IACuBg for details.
3-
41
target/
52
pom.xml.tag
63
pom.xml.releaseBackup
74
pom.xml.versionsBackup
85
pom.xml.next
96
release.properties
107
maven-eclipse.xml
8+
infinitest.filters
119

1210
node_modules/
1311
npm-debug.log
@@ -20,12 +18,14 @@ npm-debug.log
2018
.pmd
2119
.checkstyle
2220
.idea
21+
.vagrant
2322
*.iml
2423
.DS_Store
2524
.rubygems
2625
.sass-cache
2726
.rubygems-gem-maven-plugin
2827
*.sublime-*
28+
*nbactions*.xml
2929
.temp/
3030

3131

‎AEMManager/AEMManager.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +11,7 @@
1111
<RootNamespace>AEMManager</RootNamespace>
1212
<AssemblyName>AEMManager</AssemblyName>
1313
<ApplicationIcon>resources\default.ico</ApplicationIcon>
14-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
1717
<OldToolsVersion>2.0</OldToolsVersion>
@@ -42,6 +42,7 @@
4242
<ErrorReport>prompt</ErrorReport>
4343
<WarningLevel>4</WarningLevel>
4444
<UseVSHostingProcess>false</UseVSHostingProcess>
45+
<Prefer32Bit>false</Prefer32Bit>
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4748
<DebugType>none</DebugType>
@@ -51,6 +52,7 @@
5152
<ErrorReport>prompt</ErrorReport>
5253
<WarningLevel>4</WarningLevel>
5354
<UseVSHostingProcess>false</UseVSHostingProcess>
55+
<Prefer32Bit>false</Prefer32Bit>
5456
</PropertyGroup>
5557
<ItemGroup>
5658
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">

‎AEMManager/App.config‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33

44
<configSections>
5-
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
6-
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
7-
<section name="AEMManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
6+
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
7+
<section name="AEMManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
88
</sectionGroup>
99
</configSections>
1010

1111
<log4net>
1212
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
13-
<param name="File" value="AEMManager.log" />
14-
<param name="AppendToFile" value="true" />
15-
<param name="MaxSizeRollBackups" value="10" />
16-
<param name="MaximumFileSize" value="5MB" />
17-
<param name="RollingStyle" value="Size" />
18-
<param name="StaticLogFileName" value="false" />
13+
<param name="File" value="AEMManager.log"/>
14+
<param name="AppendToFile" value="true"/>
15+
<param name="MaxSizeRollBackups" value="10"/>
16+
<param name="MaximumFileSize" value="5MB"/>
17+
<param name="RollingStyle" value="Size"/>
18+
<param name="StaticLogFileName" value="false"/>
1919
<layout type="log4net.Layout.PatternLayout">
20-
<conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline" />
20+
<conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline"/>
2121
</layout>
2222
</appender>
2323

2424
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
25-
<applicationName value="AEMManager" />
25+
<applicationName value="AEMManager"/>
2626
<layout type="log4net.Layout.PatternLayout">
27-
<conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline" />
27+
<conversionPattern value="%date{dd.MM.yyyy HH:mm:ss.fff} *%level* [%thread] %logger %message%newline"/>
2828
</layout>
2929
<filter type="log4net.Filter.LevelRangeFilter">
30-
<levelMin value="ERROR" />
30+
<levelMin value="ERROR"/>
3131
</filter>
3232
</appender>
3333

3434
<root>
3535
<level value="WARN"/>
36-
<appender-ref ref="RollingLogFileAppender" />
36+
<appender-ref ref="RollingLogFileAppender"/>
3737
<!--
3838
<appender-ref ref="EventLogAppender" />
3939
-->
@@ -67,4 +67,4 @@
6767
</AEMManager.Properties.Settings>
6868
</applicationSettings>
6969

70-
</configuration>
70+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

‎AEMManager/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ private static void InitializeNotifyIcon() {
114114

115115
static void AEMDocumentation_Click(object sender, EventArgs e) {
116116
System.Diagnostics.Process p = new System.Diagnostics.Process();
117-
p.StartInfo.FileName = "https://docs.adobe.com/";
117+
p.StartInfo.FileName = "https://docs.adobe.com/content/help/en/experience-cloud/user-guides/home.html#icon-adobe-experience-manager";
118118
p.Start();
119119
}
120120

121121
static void AEMRefDocs_Click(object sender, EventArgs e) {
122122
System.Diagnostics.Process p = new System.Diagnostics.Process();
123-
p.StartInfo.FileName = "https://docs.adobe.com/docs/en/aem/6-2/develop/ref.html";
123+
p.StartInfo.FileName = "https://docs.adobe.com/content/help/en/experience-manager-65/developing/introduction/reference-materials.html";
124124
p.Start();
125125
}
126126

‎AEMManager/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("wcm.io")]
1212
[assembly: AssemblyProduct("wcm.io AEM Manager")]
13-
[assembly: AssemblyCopyright("©2010-2016 pro!vision GmbH, wcm.io")]
13+
[assembly: AssemblyCopyright("©2010-2020 pro!vision GmbH, wcm.io")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -29,8 +29,8 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("2.3.4.0")]
33-
[assembly: AssemblyFileVersion("2.3.4.0")]
32+
[assembly: AssemblyVersion("2.3.6.0")]
33+
[assembly: AssemblyFileVersion("2.3.6.0")]
3434

3535
// Configure log4net using the .config file
3636
[assembly: log4net.Config.XmlConfiguratorAttribute(Watch = true)]

‎AEMManager/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AEMManager/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AEMManagerSetup/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Product Id="*" Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29"
44
Manufacturer="wcm.io"
5-
Version="2.3.4.0">
5+
Version="2.3.6.0">
66
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
77

88
<MajorUpgrade DowngradeErrorMessage="A newer version of AEM Manager is already installed." />

0 commit comments

Comments
 (0)