Restore commit information to native images (#250)

diff --git a/Directory.Build.props b/Directory.Build.props
index 13ee1228ab9b2bde557742817d6513c067269c16..def5bd80b0be10275e366042ee961b9b4540a04c 100644 (file)
--- 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 59dfac6a2412f81025e92f83dfa6ea8000e7b62e..94d825e023e0f5f6b13cc7858f2f6025f6d406d6 100644 (file)
--- 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 4fbf1668c524cd6812ecc67c0e7f66159c536334..e00672d89be8488ca48ec22a3a7c008da50dc5aa 100644 (file)
--- 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 (file)
index 0000000..fc1ff6e
--- /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 (file)
index 0000000..0fa40bb
--- /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