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 /thirdparty | |
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 'thirdparty')
-rw-r--r-- | thirdparty/SharpAESCrypt/SharpAESCrypt.exe | bin | 0 -> 37888 bytes | |||
-rw-r--r-- | thirdparty/TlsTest/TlsTest.csproj | 12 | ||||
-rw-r--r-- | thirdparty/TlsTest/app.config | 3 | ||||
-rw-r--r-- | thirdparty/UnixSupport/UnixSupport.csproj | 11 | ||||
-rw-r--r-- | thirdparty/mozroots/app.config | 3 | ||||
-rw-r--r-- | thirdparty/mozroots/mozroots.csproj | 12 |
6 files changed, 30 insertions, 11 deletions
diff --git a/thirdparty/SharpAESCrypt/SharpAESCrypt.exe b/thirdparty/SharpAESCrypt/SharpAESCrypt.exe Binary files differnew file mode 100644 index 000000000..4ee0a6403 --- /dev/null +++ b/thirdparty/SharpAESCrypt/SharpAESCrypt.exe diff --git a/thirdparty/TlsTest/TlsTest.csproj b/thirdparty/TlsTest/TlsTest.csproj index 7ef228c3b..ef7d37c0a 100644 --- a/thirdparty/TlsTest/TlsTest.csproj +++ b/thirdparty/TlsTest/TlsTest.csproj @@ -1,14 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<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>
<ProjectGuid>{95B35AA3-7F86-43F1-9794-0CA115CFDF32}</ProjectGuid>
<OutputType>Exe</OutputType>
- <Prefer32Bit>False</Prefer32Bit>
+ <Prefer32Bit>False</Prefer32Bit>
<RootNamespace>TlsTest</RootNamespace>
<AssemblyName>TlsTest</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -29,5 +30,8 @@ <ItemGroup>
<Compile Include="TlsTest.cs" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file diff --git a/thirdparty/TlsTest/app.config b/thirdparty/TlsTest/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/thirdparty/TlsTest/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> diff --git a/thirdparty/UnixSupport/UnixSupport.csproj b/thirdparty/UnixSupport/UnixSupport.csproj index 5400fb0a8..ab33ee6dc 100644 --- a/thirdparty/UnixSupport/UnixSupport.csproj +++ b/thirdparty/UnixSupport/UnixSupport.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"> +<?xml version="1.0" encoding="utf-8"?> +<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> @@ -9,10 +9,11 @@ <OutputType>Library</OutputType> <RootNamespace>UnixSupport</RootNamespace> <AssemblyName>UnixSupport</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <ReleaseVersion>1.0</ReleaseVersion> <SynchReleaseVersion>false</SynchReleaseVersion> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -39,4 +40,8 @@ <ItemGroup> <Compile Include="File.cs" /> </ItemGroup> + <PropertyGroup> + <PostBuildEvent> + </PostBuildEvent> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/thirdparty/mozroots/app.config b/thirdparty/mozroots/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/thirdparty/mozroots/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> diff --git a/thirdparty/mozroots/mozroots.csproj b/thirdparty/mozroots/mozroots.csproj index a681b630e..887b5ad4e 100644 --- a/thirdparty/mozroots/mozroots.csproj +++ b/thirdparty/mozroots/mozroots.csproj @@ -1,14 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<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>
<ProjectGuid>{C44F0C79-B4E2-4D41-B357-1FD7B8888E78}</ProjectGuid>
<OutputType>Exe</OutputType>
- <Prefer32Bit>False</Prefer32Bit>
+ <Prefer32Bit>False</Prefer32Bit>
<RootNamespace>mozroots</RootNamespace>
<AssemblyName>mozroots</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -29,5 +30,8 @@ <ItemGroup>
<Compile Include="mozroots.cs" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file |