From: Juan Hoyos <juan.hoyos@microsoft.com>
Date: Mon, 6 May 2019 20:32:47 +0000 (-0700)
Subject: Restore commit information to native images (#250)
X-Git-Tag: submit/tizen/20190813.035844~6^2^2~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b143d8619bee7f33530dd45a9755cef6296f6f0a;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

Restore commit information to native images (#250)
---

diff --git a/Directory.Build.props b/Directory.Build.props
index 13ee1228a..def5bd80b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,6 +5,10 @@
     <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <ContinuousIntegrationBuild Condition="'$(OfficialBuildId)' != ''">true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <PropertyGroup>
     <UseSharedCompilation>false</UseSharedCompilation>
     <LangVersion>Latest</LangVersion>
diff --git a/diagnostics.sln b/diagnostics.sln
index 59dfac6a2..94d825e02 100644
--- a/diagnostics.sln
+++ b/diagnostics.sln
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-counters", "src\Tool
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tools.RuntimeClient", "src\Microsoft.Diagnostics.Tools.RuntimeClient\Microsoft.Diagnostics.Tools.RuntimeClient.csproj", "{54C240C5-7932-4421-A5FB-75205DE0B824}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateVersionFile", "eng\CreateVersionFile.csproj", "{54E3BCB7-6094-4B25-AC44-D4F914438F03}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Checked|Any CPU = Checked|Any CPU
@@ -677,6 +679,46 @@ Global
 		{54C240C5-7932-4421-A5FB-75205DE0B824}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{54C240C5-7932-4421-A5FB-75205DE0B824}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
 		{54C240C5-7932-4421-A5FB-75205DE0B824}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|ARM.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|ARM.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|ARM64.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|ARM64.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|x64.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Checked|x86.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|ARM.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|x64.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Debug|x86.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|ARM.ActiveCfg = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|ARM.Build.0 = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|ARM64.Build.0 = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|x64.ActiveCfg = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|x64.Build.0 = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|x86.ActiveCfg = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.Release|x86.Build.0 = Release|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
+		{54E3BCB7-6094-4B25-AC44-D4F914438F03}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/eng/CreateVersionFile.csproj b/eng/CreateVersionFile.csproj
index 4fbf1668c..e00672d89 100644
--- a/eng/CreateVersionFile.csproj
+++ b/eng/CreateVersionFile.csproj
@@ -1,16 +1,9 @@
 <!-- All Rights Reserved. Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
-<Project>
-  <PropertyGroup>
-    <ContinuousIntegrationBuild Condition="'$(OfficialBuildId)' != ''">true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-  
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <ContinuousIntegrationBuild Condition="'$(ContinuousIntegrationBuild)' != ''">true</ContinuousIntegrationBuild>
   </PropertyGroup>
+
   <Target Name="GenerateVersionFiles" DependsOnTargets="GenerateVersionPrefixFile;GenerateVersionHeader;GenerateVersionSourceFile" />
 
   <Target Name="GenerateVersionPrefixFile" Condition="'$(VersionPrefixFile)' != ''">
@@ -105,9 +98,4 @@ static char sccsid[] __attribute__((used)) = "@(#)Version $(InformationalVersion
 
     <Message Importance="High" Text="Created version file $(NativeVersionSourceFile)" />
   </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.Dotnet.Arcade.Sdk" />
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Target Name="Build" />
-  <Target Name="Restore" />
 </Project>
diff --git a/eng/Directory.Build.props b/eng/Directory.Build.props
new file mode 100644
index 000000000..fc1ff6e1d
--- /dev/null
+++ b/eng/Directory.Build.props
@@ -0,0 +1,4 @@
+<Project>
+    <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props"/>
+    <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+</Project>
\ No newline at end of file
diff --git a/eng/Directory.Build.targets b/eng/Directory.Build.targets
new file mode 100644
index 000000000..0fa40bbe3
--- /dev/null
+++ b/eng/Directory.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+    <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+    <Target Name="Build" />
+</Project>
\ No newline at end of file