diff options
author | Tadeusz Struk <tadeusz.struk@intel.com> | 2018-11-14 22:05:32 -0800 |
---|---|---|
committer | Tadeusz Struk <tadeusz.struk@intel.com> | 2018-11-15 09:27:13 -0800 |
commit | 990bad53ae7f4baf7c45742c38ac8351a4667603 (patch) | |
tree | 4aad2d8d33c3323da8923f962b897f3b514b1e30 | |
parent | 882b9e423d1217e959c49b2cef37f6bfe233b51d (diff) | |
download | tpm2-tss-990bad53ae7f4baf7c45742c38ac8351a4667603.tar.gz |
appveyor: update to later version of tools
After AppVeyor latest changes this needs to be updated also
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
-rw-r--r-- | .appveyor.yml | 2 | ||||
-rw-r--r-- | src/tss2-esys/tss2-esys.vcxproj | 14 | ||||
-rw-r--r-- | src/tss2-mu/tss2-mu.vcxproj | 10 | ||||
-rw-r--r-- | src/tss2-sys/tss2-sys.vcxproj | 10 | ||||
-rw-r--r-- | src/tss2-tcti/tss2-tcti-mssim.vcxproj | 14 | ||||
-rw-r--r-- | src/tss2-tcti/tss2-tcti-tbs.vcxproj | 14 |
6 files changed, 29 insertions, 35 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 500d66f1..5ea3f7c6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ version: '{build}' pull_requests: do_not_increment_build_number: true skip_tags: true -image: Previous Visual Studio 2017 +image: Visual Studio 2017 configuration: - Debug - Release diff --git a/src/tss2-esys/tss2-esys.vcxproj b/src/tss2-esys/tss2-esys.vcxproj index bbaa28b3..4bd73ca8 100644 --- a/src/tss2-esys/tss2-esys.vcxproj +++ b/src/tss2-esys/tss2-esys.vcxproj @@ -22,28 +22,28 @@ <VCProjectVersion>15.0</VCProjectVersion> <ProjectGuid>{BE0516D7-994C-4133-BD91-A21239D8B087}</ProjectGuid> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -88,7 +88,6 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;NO_DL;strtok_r=strtok_s;OSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-Win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -105,7 +104,6 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;NO_DL;strtok_r=strtok_s;OSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-Win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> @@ -275,4 +273,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/tss2-mu/tss2-mu.vcxproj b/src/tss2-mu/tss2-mu.vcxproj index 7b159f2f..b829d665 100644 --- a/src/tss2-mu/tss2-mu.vcxproj +++ b/src/tss2-mu/tss2-mu.vcxproj @@ -37,28 +37,28 @@ <Keyword>Clang</Keyword> <RootNamespace>libtss2_mu</RootNamespace> <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings" /> diff --git a/src/tss2-sys/tss2-sys.vcxproj b/src/tss2-sys/tss2-sys.vcxproj index d9fbae09..a3f0c23c 100644 --- a/src/tss2-sys/tss2-sys.vcxproj +++ b/src/tss2-sys/tss2-sys.vcxproj @@ -167,28 +167,28 @@ <Keyword>Clang</Keyword> <RootNamespace>tss2_sys</RootNamespace> <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings" /> diff --git a/src/tss2-tcti/tss2-tcti-mssim.vcxproj b/src/tss2-tcti/tss2-tcti-mssim.vcxproj index f4c0c81d..cd9d244c 100644 --- a/src/tss2-tcti/tss2-tcti-mssim.vcxproj +++ b/src/tss2-tcti/tss2-tcti-mssim.vcxproj @@ -22,28 +22,28 @@ <VCProjectVersion>15.0</VCProjectVersion> <ProjectGuid>{89B6B774-2886-48CF-B1D0-534AC449E0FD}</ProjectGuid> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -88,7 +88,6 @@ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_;_DEBUG;_WINDOWS;_USRDLL;TSS2TCTIMSSIM_EXPORTS;MAXLOGLEVEL=6;strtok_r=strtok_s;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -105,7 +104,6 @@ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_;NDEBUG;_WINDOWS;_USRDLL;TSS2TCTIMSSIM_EXPORTS;MAXLOGLEVEL=6;strtok_r=strtok_s;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> @@ -155,4 +153,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/tss2-tcti/tss2-tcti-tbs.vcxproj b/src/tss2-tcti/tss2-tcti-tbs.vcxproj index 0d86b79c..e3f3abdc 100644 --- a/src/tss2-tcti/tss2-tcti-tbs.vcxproj +++ b/src/tss2-tcti/tss2-tcti-tbs.vcxproj @@ -22,28 +22,28 @@ <VCProjectVersion>15.0</VCProjectVersion> <ProjectGuid>{6BA6146F-8B38-49A2-A156-769E0F2CC302}</ProjectGuid> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>LLVM-vs2014</PlatformToolset> + <PlatformToolset>v141_clang_c2</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -90,7 +90,6 @@ <PreprocessorDefinitions>WIN32;MAXLOGLEVEL=6;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -107,7 +106,6 @@ <PreprocessorDefinitions>WIN32;MAXLOGLEVEL=6;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> @@ -154,4 +152,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> |