Remove nuget props/targets from Logging which had adverse side effect… (#2318)

* Remove nuget props/targets from Logging which had adverse side effects on timestamp file creation

* Fix timestamp file creation for real this time. It was being invoked a second time as
a result of the nugetizer targets. The property to key off of was BuildingPackage.

Author: bbowman

common/NuprojInitializer.msbuildproj

@@ -14,6 +14,9 @@
   <PropertyGroup Label="Globals">
     <OutputPath>$(SolutionDir)</OutputPath>
     <ProjectGuid>417B0D00-F90E-47BB-9085-BE7E412C9DA8</ProjectGuid>
+    <TargetDir>$(SolutionDir)</TargetDir>
+    <TargetName>$(SolutionName)</TargetName>
+    <TargetExt>.timestamp</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
@@ -27,9 +30,9 @@
   <!-- This is where the fun starts. Any custom generic msbuild project goop goes here. -->
 
   <!-- Inline task to check for timestamp file existence and creation-->
-  <Target Name="CreateTimestampFile" AfterTargets="Build">
-    <Touch Condition="'$(SolutionDir)' != ''" AlwaysCreate="true" Files="$(SolutionDir)$(SolutionName).timestamp" />
-    <Message Condition="'$(SolutionDir)' != ''" Text="NuprojInitializer touched $(SolutionDir)$(SolutionName).timestamp" />
+  <Target Name="Build">
+    <Touch Condition="'$(SolutionDir)' != '' And '$(BuildingPackage)' != 'true'" AlwaysCreate="true" Files="$(SolutionDir)$(SolutionName).timestamp" />
+    <Message Condition="'$(SolutionDir)' != '' And '$(BuildingPackage)' != 'true'" Text="NuprojInitializer touched $(SolutionDir)$(SolutionName).timestamp" />
   </Target>
 
 </Project>

common/winobjc.nuproj.common.targets

@@ -99,6 +99,7 @@
     <ProjectReference Include="$(MsBuildThisFileDirectory)\NuprojInitializer.msbuildproj" Condition="'$(SkipGetPackageContentsForOtherPlatforms)' != 'true'">
       <IncludeInPackage>false</IncludeInPackage>
       <Private>false</Private>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>
 

tools/Logging/dll/Logging.vcxproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\..\common\winobjc.nuproj.common.props" Condition="Exists('$(SolutionDir)\..\common\winobjc.nuproj.common.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -67,5 +66,4 @@
   <ItemGroup>
     <None Include="Project.json" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)\..\common\winobjc.nuproj.common.targets" Condition="Exists('$(SolutionDir)\..\common\winobjc.nuproj.common.targets')" />
 </Project>

tools/Logging/dll/Project.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "GitVersionTask": "4.0.0-beta0011",
     "NuGet.Build.Packaging": "0.1.186"
   },
   "frameworks": {

tools/tools.sln

@@ -279,6 +279,7 @@ Global
 		{B25DBFF1-1138-4413-8DC0-A2EEBB4A7C28}.Release|x86.ActiveCfg = Release|Win32
 		{B25DBFF1-1138-4413-8DC0-A2EEBB4A7C28}.Release|x86.Build.0 = Release|Win32
 		{0A23B6B4-94BB-4B3A-BA73-A7CB5EF7D8F9}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0A23B6B4-94BB-4B3A-BA73-A7CB5EF7D8F9}.Debug|Any CPU.Build.0 = Debug|x86
 		{0A23B6B4-94BB-4B3A-BA73-A7CB5EF7D8F9}.Debug|ARM.ActiveCfg = Debug|x86
 		{0A23B6B4-94BB-4B3A-BA73-A7CB5EF7D8F9}.Debug|x86.ActiveCfg = Debug|x86
 		{0A23B6B4-94BB-4B3A-BA73-A7CB5EF7D8F9}.Debug|x86.Build.0 = Debug|x86