Target .NET 4.5

Former-commit-id: 87169e029dadd8af23fefeac092d0b9959b91576
sumonst21 · Nov 20, 2016 · 7b492c6 · 7b492c6
1 parent c0c3af9
commit 7b492c6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/App.config b/App.config
@@ -2,7 +2,7 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Ch.Cyberduck.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Ch.Cyberduck.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Cyberduck Bootstrapper.wxs b/Cyberduck Bootstrapper.wxs
@@ -12,7 +12,7 @@
         <Variable Name="Autostart" bal:Overridable="yes" Type="numeric" Value="0" />
 
         <Chain>
-            <PackageGroupRef Id="NetFx40ClientRedist"/>
+            <PackageGroupRef Id="NetFx45Web"/>
             <RollbackBoundary/>
             <MsiPackage
                     Id="Setup"

diff --git a/Cyberduck CLI Bundle.wxs b/Cyberduck CLI Bundle.wxs
@@ -9,7 +9,7 @@
     </BootstrapperApplicationRef>
     <Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]Cyberduck CLI" />
     <Chain>
-      <PackageGroupRef Id="NetFx40ClientWeb" />
+      <PackageGroupRef Id="NetFx45Web" />
       <RollbackBoundary />
       <MsiPackage
         Id="Setup"

diff --git a/Cyberduck CLI.csproj b/Cyberduck CLI.csproj
@@ -10,8 +10,9 @@
     <RootNamespace>Ch.Cyberduck</RootNamespace>
     <AssemblyName>duck</AssemblyName>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Ch.Cyberduck.Cli.WindowsTerminal</StartupObject>
@@ -25,6 +26,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>1</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>cli\windows\target</OutputPath>
@@ -34,6 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Cyberduck.Core">
@@ -121,6 +124,9 @@
       <Name>Windows Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets. -->