WinGui: Migrate to the newly release .NET Framework 4.6. The installer will automatic...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7367 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 1a080047fbc406bb58d0ce01b8e2e38b06263e9d..7027bacbe61cc8a56a05d0e24485d18bb7aeaa52 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
@@ -10,18 +10,20 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>HandBrake.ApplicationServices</RootNamespace>\r
     <AssemblyName>HandBrake.ApplicationServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
     <FileUpgradeFlags>\r
     </FileUpgradeFlags>\r
     <OldToolsVersion>3.5</OldToolsVersion>\r
     <UpgradeBackupLocation />\r
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>\r
+    <TargetFrameworkProfile>\r
+    </TargetFrameworkProfile>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
     <PlatformTarget>AnyCPU</PlatformTarget>\r
     <OutputPath>bin\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
     <PlatformTarget>AnyCPU</PlatformTarget>\r
@@ -30,12 +32,14 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <DebugType>pdbonly</DebugType>\r
     <DebugSymbols>true</DebugSymbols>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
     <PlatformTarget>AnyCPU</PlatformTarget>\r
     <OutputPath>bin\Debug\</OutputPath>\r
     <DefineConstants>TRACE;DEBUG</DefineConstants>\r
     <UseVSHostingProcess>true</UseVSHostingProcess>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
     <PlatformTarget>AnyCPU</PlatformTarget>\r
@@ -44,6 +48,7 @@
     <Optimize>true</Optimize>\r
     <DebugType>pdbonly</DebugType>\r
     <DebugSymbols>true</DebugSymbols>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.CSharp" />\r

diff --git a/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs b/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs
index 228d3e59a3dbb07756f7e042dda9c34c2eae0be6..cc2213858c10925eb0756e5ce28c305695e2fe69 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.269\r
+//     Runtime Version:4.0.30319.42000\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r

diff --git a/win/CS/HandBrake.ApplicationServices/app.config b/win/CS/HandBrake.ApplicationServices/app.config
index 084adc9e4d203c2ad21bd443b3c7d5cfab5a9805..f17b7db35b785447dbcfefc3687f81eeea26c138 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/app.config
+++ b/win/CS/HandBrake.ApplicationServices/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <configSections>\r
   </configSections>\r
   <startup>\r
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>\r
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>\r
   </startup>\r
 </configuration>\r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index d31a3faba36195faf04f515b2c4b4e07f669a840..829c61f5d72352a21bf7fddd3abbc439eda387d1 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>\r
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>HandBrakeWPF</RootNamespace>\r
     <AssemblyName>HandBrake</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>\r
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\r
+    <TargetFrameworkProfile>\r
+    </TargetFrameworkProfile>\r
     <FileAlignment>512</FileAlignment>\r
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>\r
     <WarningLevel>4</WarningLevel>\r
@@ -40,6 +41,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
     <PlatformTarget>x86</PlatformTarget>\r
@@ -49,6 +51,7 @@
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>\r
@@ -63,6 +66,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>\r
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>\r
     <UseVSHostingProcess>true</UseVSHostingProcess>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
     <OutputPath>bin\x64\Release\</OutputPath>\r
@@ -71,6 +75,7 @@
     <DebugType>pdbonly</DebugType>\r
     <PlatformTarget>x64</PlatformTarget>\r
     <ErrorReport>prompt</ErrorReport>\r
+    <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Caliburn.Micro">\r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index 124994498d6fb6230ee07a42bec24f34abf8cca8..fb803ba77ab7416cd9273a4e0644690c8420fb87 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -16,7 +16,7 @@
 \r
 ;Required .NET framework\r
 !define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "0"\r
+!define MIN_FRA_MINOR "6"\r
 !define MIN_FRA_BUILD "*"\r
 \r
 SetCompressor lzma\r
@@ -110,18 +110,18 @@ Section "HandBrake" SEC01
   Call CheckFramework\r
      StrCmp $0 "1" +3\r
         StrCpy $InstallDotNET "Yes"\r
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
      Pop $0\r
 \r
   ; Get .NET if required\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end\r
+     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r
            Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"\r
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
      ${EndIf}\r
 \r
      ExecWait "$INSTDIR\dotnetfx.exe"\r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 46f129da52ca2282853c761e988a69e26ee3e984..b060a6550c3f35f858d6ed14c239e29a0e7344c7 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -16,7 +16,7 @@
 \r
 ;Required .NET framework\r
 !define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "0"\r
+!define MIN_FRA_MINOR "6"\r
 !define MIN_FRA_BUILD "*"\r
 \r
 SetCompressor lzma\r
@@ -110,18 +110,18 @@ Section "HandBrake" SEC01
   Call CheckFramework\r
      StrCmp $0 "1" +3\r
         StrCpy $InstallDotNET "Yes"\r
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
      Pop $0\r
 \r
   ; Get .NET if required\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end\r
+     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r
            Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"\r
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
      ${EndIf}\r
 \r
      ExecWait "$INSTDIR\dotnetfx.exe"\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
index 188c795d1e61ac1a62c78c608167f9b1d3c90936..105946e70631c75ef5998992097038e43087286b 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
@@ -16,7 +16,7 @@
 \r
 ;Required .NET framework\r
 !define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "0"\r
+!define MIN_FRA_MINOR "6"\r
 !define MIN_FRA_BUILD "*"\r
 \r
 SetCompressor lzma\r
@@ -110,18 +110,18 @@ Section "HandBrake" SEC01
   Call CheckFramework\r
      StrCmp $0 "1" +3\r
         StrCpy $InstallDotNET "Yes"\r
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
      Pop $0\r
 \r
   ; Get .NET if required\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end\r
+     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r
            Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"\r
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
      ${EndIf}\r
 \r
      ExecWait "$INSTDIR\dotnetfx.exe"\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
index 7dc5f536bfef1479b59412ce4bd9ec03df44fdca..ee5cb21b4d912dbd55a94d35eaea97c7dfc88b53 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
@@ -16,8 +16,8 @@
 \r
 ;Required .NET framework\r
 !define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "5"\r
-!define MIN_FRA_BUILD "2"\r
+!define MIN_FRA_MINOR "6"\r
+!define MIN_FRA_BUILD "*"\r
 \r
 SetCompressor lzma\r
 \r
@@ -110,18 +110,18 @@ Section "HandBrake" SEC01
   Call CheckFramework\r
      StrCmp $0 "1" +3\r
         StrCpy $InstallDotNET "Yes"\r
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.5.2 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
      Pop $0\r
 \r
   ; Get .NET if required\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.5.2" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=397707" "$INSTDIR\dotnetfx.exe" /end\r
+     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r
            Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft.NET 4.5.2 Framework"\r
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
      ${EndIf}\r
 \r
      ExecWait "$INSTDIR\dotnetfx.exe"\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index b0c768edfb4059426a0a759dcecdd159b23bcf6f..23cceef50d14b7d2d8bf64a1b32720faf66510d6 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.34209\r
+//     Runtime Version:4.0.30319.42000\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index 156c2cc3e9cb47db15669d18b23e74e55e5f9fe3..449eb17faadf58da93eead69f5e9a3ffca8f5696 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.34209\r
+//     Runtime Version:4.0.30319.42000\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 3bc2d064ddacc343ad068382c8fa317e933cc5e8..9a9e5c218001ce9095e965178e2abcdb9ec53844 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.34209\r
+//     Runtime Version:4.0.30319.42000\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r

diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config
index fc4f3393f03cadc68ba5373a29b8a08f85702442..5ea845f32260a86be6e83a443524fdc0061c2a5c 100644 (file)
--- a/win/CS/HandBrakeWPF/app.config
+++ b/win/CS/HandBrakeWPF/app.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <startup>\r
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>\r
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>\r
   </startup>\r
-</configuration>
\ No newline at end of file
+</configuration>\r