diff options
author | BlueBlock <danb@pobox.com> | 2019-07-26 16:18:16 +0300 |
---|---|---|
committer | BlueBlock <danb@pobox.com> | 2019-07-26 16:18:16 +0300 |
commit | 08a1e9998a7550b6f2129df6ec50dd73c58c8609 (patch) | |
tree | 06de0c00fe8ee8c970c00c908c7f9f017fce9781 /Tools | |
parent | 55a55cf18e8b8b32cb847c44383f0c1e5ec06cca (diff) |
initial upgrade to framework 4.6.2
- no code changes except those noted below
- projects upgrade to 4.6.2
- wixinstaller project upgraded automatically by VisualStudio
- wixinstaller updated to require 4.6.2
- Library.Encryption changed to Standard2.0 so accommodate update to SharpAesCrypt
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/SQLiteTool/App.config | 6 | ||||
-rw-r--r-- | Tools/SQLiteTool/SQLiteTool.csproj | 7 | ||||
-rw-r--r-- | Tools/ZipFileDebugger/ZipFileDebugger.csproj | 8 | ||||
-rw-r--r-- | Tools/ZipFileDebugger/app.config | 3 |
4 files changed, 16 insertions, 8 deletions
diff --git a/Tools/SQLiteTool/App.config b/Tools/SQLiteTool/App.config index 2ae22ede8..e6848d0ef 100644 --- a/Tools/SQLiteTool/App.config +++ b/Tools/SQLiteTool/App.config @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
- <supportedRuntime version="v4.0"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
-</configuration>
\ No newline at end of file +</configuration>
diff --git a/Tools/SQLiteTool/SQLiteTool.csproj b/Tools/SQLiteTool/SQLiteTool.csproj index 04d4d84b3..b5f120044 100644 --- a/Tools/SQLiteTool/SQLiteTool.csproj +++ b/Tools/SQLiteTool/SQLiteTool.csproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -7,10 +7,11 @@ <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{3B546BD0-7549-4CE3-9B68-5C149B8AA2E7}</ProjectGuid>
<OutputType>Exe</OutputType>
- <Prefer32Bit>False</Prefer32Bit>
+ <Prefer32Bit>False</Prefer32Bit>
<RootNamespace>SQLiteTool</RootNamespace>
<AssemblyName>SQLiteTool</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
diff --git a/Tools/ZipFileDebugger/ZipFileDebugger.csproj b/Tools/ZipFileDebugger/ZipFileDebugger.csproj index 8ad515a68..408dd657d 100644 --- a/Tools/ZipFileDebugger/ZipFileDebugger.csproj +++ b/Tools/ZipFileDebugger/ZipFileDebugger.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,7 +7,8 @@ <OutputType>Exe</OutputType>
<RootNamespace>ZipFileDebugger</RootNamespace>
<AssemblyName>ZipFileDebugger</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -47,5 +48,8 @@ <Name>Duplicati.Library.Logging</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file diff --git a/Tools/ZipFileDebugger/app.config b/Tools/ZipFileDebugger/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/Tools/ZipFileDebugger/app.config @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> |