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 /BuildTools | |
| 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 'BuildTools')
| -rw-r--r-- | BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj | 16 | ||||
| -rw-r--r-- | BuildTools/AutoUpdateBuilder/app.config | 3 | ||||
| -rw-r--r-- | BuildTools/AutoUpdateBuilder/packages.config | 2 | ||||
| -rw-r--r-- | BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj | 6 | ||||
| -rw-r--r-- | BuildTools/UpdateVersionStamp/app.config | 2 |
5 files changed, 17 insertions, 12 deletions
diff --git a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj index 1685273e7..ac12c5548 100644 --- a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj +++ b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.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>{17E3EB29-87FD-4BE9-A531-8DAD8B295494}</ProjectGuid> <OutputType>Exe</OutputType> - <Prefer32Bit>False</Prefer32Bit> + <Prefer32Bit>False</Prefer32Bit> <RootNamespace>AutoUpdateBuilder</RootNamespace> <AssemblyName>AutoUpdateBuilder</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -29,10 +30,10 @@ <ConsolePause>false</ConsolePause> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="Newtonsoft.Json"> - <HintPath>packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> + <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> + <Reference Include="System" /> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -70,6 +71,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <None Include="app.config" /> <None Include="packages.config" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/BuildTools/AutoUpdateBuilder/app.config b/BuildTools/AutoUpdateBuilder/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/BuildTools/AutoUpdateBuilder/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/BuildTools/AutoUpdateBuilder/packages.config b/BuildTools/AutoUpdateBuilder/packages.config index a272c64df..1812e5207 100644 --- a/BuildTools/AutoUpdateBuilder/packages.config +++ b/BuildTools/AutoUpdateBuilder/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> </packages>
\ No newline at end of file diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj index 463888901..a3585ee30 100644 --- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.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,10 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{1920C3B0-98A0-410F-8972-9C19FA616FE5}</ProjectGuid> <OutputType>Exe</OutputType> - <Prefer32Bit>False</Prefer32Bit> + <Prefer32Bit>False</Prefer32Bit> <RootNamespace>UpdateVersionStamp</RootNamespace> <AssemblyName>UpdateVersionStamp</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/BuildTools/UpdateVersionStamp/app.config b/BuildTools/UpdateVersionStamp/app.config index 51278a456..2a0024f75 100644 --- a/BuildTools/UpdateVersionStamp/app.config +++ b/BuildTools/UpdateVersionStamp/app.config @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration> +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> |