enhanced target platform checks in nuckage packaging

vrogier · Apr 21, 2020 · 8587fbe · 8587fbe
1 parent 8917ce0
commit 8587fbe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/nuget/ocilib.props b/nuget/ocilib.props
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and ('$(Platform)' == 'Win32' or '$(Platform)' == 'x86')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and '$(PlatformTarget)' == 'x86'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 	  <PreprocessorDefinitions>OCI_API=__stdcall;OCI_CHARSET_WIDE;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and ('$(Platform)' == 'Win64' or '$(Platform)' == 'x64')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and '$(PlatformTarget)' == 'x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 	  <PreprocessorDefinitions>OCI_API=__stdcall;OCI_CHARSET_WIDE;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and ('$(Platform)' == 'Win32' or '$(Platform)' == 'x86')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and '$(PlatformTarget)' == 'x86'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 	  <PreprocessorDefinitions>OCI_API=__stdcall;OCI_CHARSET_ANSI;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and ('$(Platform)' == 'Win64' or '$(Platform)' == 'x64')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and '$(PlatformTarget)' == 'x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 	  <PreprocessorDefinitions>OCI_API=__stdcall;OCI_CHARSET_ANSI;OCI_IMPORT_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and ('$(Platform)' == 'Win32' or '$(Platform)' == 'x86')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and '$(PlatformTarget)' == 'x86'">
     <Link>
       <AdditionalDependencies>ocilibw.lib;$(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and ('$(Platform)' == 'Win64' or '$(Platform)' == 'x64')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'Unicode' and '$(PlatformTarget)' == 'x64'">
     <Link>
       <AdditionalDependencies>ocilibw.lib;$(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and ('$(Platform)' == 'Win32' or '$(Platform)' == 'x86')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and '$(PlatformTarget)' == 'x86'">
     <Link>
       <AdditionalDependencies>ociliba.lib;$(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and ('$(Platform)' == 'Win64' or '$(Platform)' == 'x64')">
+  <ItemDefinitionGroup Condition="'$(CharacterSet)' == 'MultiByte' and '$(PlatformTarget)' == 'x64'">
     <Link>
       <AdditionalDependencies>ociliba.lib;$(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

diff --git a/nuget/ocilib.targets b/nuget/ocilib.targets
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="Ocilib_Copy_Dll_Wide_x86" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'Unicode' and ('$(Platform)' == 'Win32' or '$(Platform)' == 'x86')">
+  <Target Name="Ocilib_Copy_Dll_Wide_x86" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'Unicode' and '$(PlatformTarget)' == 'x86'">
     <ItemGroup>
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x86\ocilibw.dll" />
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x86\ocilibw.pdb" />
     </ItemGroup>
     <Copy SourceFiles="@(BinFiles)" DestinationFolder="$(OutDir)" />
   </Target>
-  <Target Name="Ocilib_Copy_Dll_Wide_x64" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'Unicode' and ('$(Platform)' == 'Win64' or '$(Platform)' == 'x64')">
+  <Target Name="Ocilib_Copy_Dll_Wide_x64" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'Unicode' and '$(PlatformTarget)' == 'x64'">
     <ItemGroup>
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x64\ocilibw.dll" />
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x64\ocilibw.pdb" />
     </ItemGroup>
     <Copy SourceFiles="@(BinFiles)" DestinationFolder="$(OutDir)" />
   </Target>
-   <Target Name="Ocilib_Copy_Dll_Ansi_x86" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'MultiByte' and ('$(Platform)' == 'Win32' or '$(Platform)' == 'x86')">
+   <Target Name="Ocilib_Copy_Dll_Ansi_x86" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'MultiByte' and '$(PlatformTarget)' == 'x86'">
     <ItemGroup>
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x86\ociliba.dll" />
 	  <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x86\ociliba.pdb" />
     </ItemGroup>
     <Copy SourceFiles="@(BinFiles)" DestinationFolder="$(OutDir)" />
   </Target>
-  <Target Name="Ocilib_Copy_Dll_Ansi_x64" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'MultiByte' and ('$(Platform)' == 'Win64' or '$(Platform)' == 'x64')">
+  <Target Name="Ocilib_Copy_Dll_Ansi_x64" BeforeTargets="PostBuildEvent;PrepareForRun" Condition="'$(CharacterSet)' == 'MultiByte' and '$(PlatformTarget)' == 'x64'">
     <ItemGroup>
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x64\ociliba.dll" />
       <BinFiles Include="$(MSBuildThisFileDirectory)\bin\x64\ociliba.pdb" />