Verbose logging for symbol publish (#491)

Change to stable version (no preview tag)

Fix product version string and update docs

Remove source link disabling

diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
index caba50282218c7c56715ff29207c15575d5e6736..f57bfcab9969bf49b223099ea365eeacdf24cf70 100644 (file)
--- a/.vsts-dotnet.yml
+++ b/.vsts-dotnet.yml
@@ -322,7 +322,7 @@ phases:
       displayName: Publish Symbols
       inputs:
         filePath: eng\common\sdk-task.ps1
-        arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release
+        arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release -verbosity detailed
           /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
           /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
           /p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping'

diff --git a/Directory.Build.props b/Directory.Build.props
index e5131e25e1af73116516979b04c6b8a4ed9682f5..0e80695c3df4758068ee7221761442fe8a767a43 100644 (file)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,11 +18,4 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <EnableSourceControlManagerQueries>true</EnableSourceControlManagerQueries>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(OS)' == 'Unix'">
-    <!-- Disable source link until issue https://github.com/dotnet/roslyn/issues/29289#issuecomment-413294637 is fixed -->
-    <EnableSourceLink>false</EnableSourceLink>
-    <DeterministicSourcePaths>false</DeterministicSourcePaths>
-    <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
-  </PropertyGroup>
 </Project>

diff --git a/documentation/dotnet-counters-instructions.md b/documentation/dotnet-counters-instructions.md
index 57d3c75c0baf6ae0b6023ee3de326d2f850d5248..7e41146064c23a10e0edb6b30b6d237162b799c7 100644 (file)
--- a/documentation/dotnet-counters-instructions.md
+++ b/documentation/dotnet-counters-instructions.md
@@ -9,7 +9,7 @@ dotnet-counters is a performance monitoring tool for ad-hoc health monitoring or
 ## Install dotnet-counters
 
 ```
-dotnet tool install --global dotnet-counters --version 3.0.0-preview9.19454.1
+dotnet tool install --global dotnet-counters
 ```
 
 

diff --git a/documentation/dotnet-dump-instructions.md b/documentation/dotnet-dump-instructions.md
index 678a1572dc7907327ea312688d255e1668417abf..5e2ed61dfd49dd9c2821bc378290ec41800c17bb 100644 (file)
--- a/documentation/dotnet-dump-instructions.md
+++ b/documentation/dotnet-dump-instructions.md
@@ -9,9 +9,9 @@ Currently not supported on macOS.
 
 The first step is to install the dotnet-dump CLI global tool. This requires at least the 2.1 or greater .NET Core SDK to be installed. If you see the error message `Tool 'dotnet-dump' is already installed`, you will need to uninstall the global tool (see below). 
 
-    $ dotnet tool install -g dotnet-dump --version 3.0.0-preview9.19454.1
+    $ dotnet tool install -g dotnet-dump
     You can invoke the tool using the following command: dotnet-dump
-    Tool 'dotnet-dump' (version '3.0.0-preview9.19454.1') was successfully installed.
+    Tool 'dotnet-dump' (version '3.0.0.47001') was successfully installed.
 
 If this is the first global tool installed or you get message `Could not execute because the specified command or file was not found.` you need to add `$HOME/.dotnet/tools` to your path.
 
@@ -118,4 +118,4 @@ This command on Microsoft .NET Core SDK Linux docker images can throw `Unhandled
 ## Uninstalling dotnet-dump 
 
     $ dotnet tool uninstall -g dotnet-dump
-    Tool 'dotnet-dump' (version '3.0.0-preview9.19454.1') was successfully uninstalled.
+    Tool 'dotnet-dump' (version '3.0.0.47001') was successfully uninstalled.

diff --git a/documentation/dotnet-trace-instructions.md b/documentation/dotnet-trace-instructions.md
index 938086be501910f3f1d99cd6b979a3a994f88dc2..c652a3f9ac584034dc20ec1636d3e89392a1067a 100644 (file)
--- a/documentation/dotnet-trace-instructions.md
+++ b/documentation/dotnet-trace-instructions.md
@@ -7,9 +7,9 @@ The dotnet-trace tool is a cross-platform CLI global tool that enables the colle
 The first step is to install the dotnet-trace CLI global tool.
 
 ```cmd
-$ dotnet tool install --global dotnet-trace --version 3.0.0-preview9.19454.1
+$ dotnet tool install --global dotnet-trace
 You can invoke the tool using the following command: dotnet-trace
-Tool 'dotnet-trace' (version '3.0.0-preview9.19454.1') was successfully installed.
+Tool 'dotnet-trace' (version '3.0.0.47001') was successfully installed.
 ```
 
 ## Using dotnet-trace

diff --git a/documentation/installing-sos-instructions.md b/documentation/installing-sos-instructions.md
index e5576ab62b9f2a6e2d5a5575edcfe4828de8d2e1..614dc5148c45b7f8cb477739c235d4ae16c28b47 100644 (file)
--- a/documentation/installing-sos-instructions.md
+++ b/documentation/installing-sos-instructions.md
@@ -3,14 +3,14 @@ Installing SOS on Linux and MacOS
 
 The first step is to install the dotnet-sos CLI global tool. This requires at least the 2.1 or greater .NET Core SDK to be installed. If you see the error message `Tool 'dotnet-sos' is already installed`, you will need to uninstall the global tool (see below). 
 
-    $ dotnet tool install -g dotnet-sos --version 3.0.0-preview9.19454.1
+    $ dotnet tool install -g dotnet-sos
     You can invoke the tool using the following command: dotnet-sos
-    Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully installed.
+    Tool 'dotnet-sos' (version '3.0.0.47001') was successfully installed.
 
 The next step is use this global tool to install SOS. 
 
     $ dotnet-sos install
-    Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0-preview9.19454.1/dotnet-sos/3.0.0-preview9.19454.1/tools/netcoreapp2.1/any/linux-x64
+    Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0.47001/dotnet-sos/3.0.0.47001/tools/netcoreapp2.1/any/linux-x64
     Creating installation directory...
     Copying files...
     Updating existing /home/mikem/.lldbinit file - LLDB will load SOS automatically at startup
@@ -72,7 +72,7 @@ Now any time you run lldb, SOS will automatically be loaded and the symbol downl
 The installer needs to be run again:
 
     $ dotnet-sos install
-    Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0-preview9.19454.1/dotnet-sos/3.0.0-preview9.19454.1/tools/netcoreapp2.1/any/linux-x64
+    Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0.47001/dotnet-sos/3.0.0.47001/tools/netcoreapp2.1/any/linux-x64
     Installing over existing installation...
     Creating installation directory...
     Copying files...
@@ -92,4 +92,4 @@ To uninstall and remove the lldb configuration run this command:
 To remove the SOS installer global tool:
 
     $ dotnet tool uninstall -g dotnet-sos
-    Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully uninstalled.
+    Tool 'dotnet-sos' (version '3.0.0.47001') was successfully uninstalled.

diff --git a/documentation/installing-sos-windows-instructions.md b/documentation/installing-sos-windows-instructions.md
index 39764429b76a3860bab0d66b65083c78a1c9b9c2..7844031bd3be8e3d042a42bd026984a4ce07485b 100644 (file)
--- a/documentation/installing-sos-windows-instructions.md
+++ b/documentation/installing-sos-windows-instructions.md
@@ -47,14 +47,14 @@ SOS will automatically be loaded from the internal Microsoft extension gallery.
 
 It is recommended that you update to the newer versions of the Windows debugger, but you can still use the latest SOS with older Windows debuggers by using the dotnet-sos CLI global tool to install. It is not as convenient. You may have to ".unload" the SOS that is loaded from the "runtime" directory.
 
-    C:\Users\mikem>dotnet tool install -g dotnet-sos --version 3.0.0-preview9.19454.1
+    C:\Users\mikem>dotnet tool install -g dotnet-sos
     You can invoke the tool using the following command: dotnet-sos
-    Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully installed.
+    Tool 'dotnet-sos' (version '3.0.0.47001') was successfully installed.
 
 Run the installer:
 
     C:\Users\mikem>dotnet-sos install
-    Installing SOS to C:\Users\mikem\.dotnet\sos from C:\Users\mikem\.dotnet\tools\.store\dotnet-sos\3.0.0-preview9.19454.1\dotnet-sos\3.0.0-preview9.19454.1\tools\netcoreapp2.1\any\win-x64
+    Installing SOS to C:\Users\mikem\.dotnet\sos from C:\Users\mikem\.dotnet\tools\.store\dotnet-sos\3.0.0.47001\dotnet-sos\3.0.0.47001\tools\netcoreapp2.1\any\win-x64
     Creating installation directory...
     Copying files...
     Execute '.load C:\Users\mikem\.dotnet\sos\sos.dll' to load SOS in your Windows debugger.

diff --git a/documentation/tutorial/installing_the_diagnostics_tools.md b/documentation/tutorial/installing_the_diagnostics_tools.md
index aa8d72e08893139c310a2a142eaded7a86c72253..e3efd27750bda5a31236e840560c8b6d5193681b 100644 (file)
--- a/documentation/tutorial/installing_the_diagnostics_tools.md
+++ b/documentation/tutorial/installing_the_diagnostics_tools.md
@@ -6,7 +6,7 @@ Depending on the diagnostics scenario you will use one or more of the tools belo
 In the .NET full/Windows world, we have a myriad of performance counters that can be used to triage and diagnose production issues. For .Net core we have a similar and cross platform story centered around a tool called dotnet-counters. To install the tool, run the following command:
 
 > ```bash
-> dotnet tool install --global dotnet-counters --version 3.0.0-preview9.19454.1
+> dotnet tool install --global dotnet-counters
 > ```
 
 
@@ -14,7 +14,7 @@ In the .NET full/Windows world, we have a myriad of performance counters that ca
 .NET core includes what is called the 'EventPipe' through which diagnostics data is exposed. The dotnet-trace tool allows you to consume interesting profiling data from your app that can help in scenarios where you need to root cause apps running slow. To install the tool, run the following command:
 
 > ```bash
-> dotnet tool install --global dotnet-trace --version 3.0.0-preview9.19454.1 
+> dotnet tool install --global dotnet-trace 
 > ```
 
 
@@ -22,7 +22,7 @@ In the .NET full/Windows world, we have a myriad of performance counters that ca
 In order to generate core dumps for .net core apps, you can use the dotnet-dump tool. To install the tool, run the following command:
 
 > ```bash
-> dotnet tool install --global dotnet-dump --version 3.0.0-preview9.19454.1
+> dotnet tool install --global dotnet-dump
 > ```
 
 

diff --git a/eng/Build-Native.cmd b/eng/Build-Native.cmd
index 690ac763371c7485b680f34d82089b8bc226f873..957cb566936435be6f0787926d1cb36bc3f74628 100644 (file)
--- a/eng/Build-Native.cmd
+++ b/eng/Build-Native.cmd
@@ -196,8 +196,14 @@ if /i %__BuildCrossArch% EQU 1 (
     if not exist "%__CrossCompIntermediatesDir%" md "%__CrossCompIntermediatesDir%"
 
     echo Generating Version Header
+    set __GenerateVersionRestoreLog="%__LogDir%\GenerateVersionRestore.binlog"
+    "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionRestoreLog! /t:Restore /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
+    if not !errorlevel! == 0 (
+        echo Generate Version Restore FAILED
+        exit /b 1
+    )
     set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
-    "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.proj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__CrossCompIntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
+    "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__CrossCompIntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
     if not !errorlevel! == 0 (
         echo Generate Version Header FAILED
         exit /b 1
@@ -274,8 +280,14 @@ if %__Build% EQU 1 (
     )
 
     echo Generating Version Header
+    set __GenerateVersionRestoreLog="%__LogDir%\GenerateVersionRestore.binlog"
+    "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionRestoreLog! /t:Restore /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
+    if not !errorlevel! == 0 (
+        echo Generate Version Restore FAILED
+        exit /b 1
+    )
     set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
-    "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.proj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__IntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
+    "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__IntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
     if not !errorlevel! == 0 (
         echo Generate Version Header FAILED
         exit /b 1

diff --git a/eng/CreateVersionFile.csproj b/eng/CreateVersionFile.csproj
new file mode 100644 (file)
index 0000000..d25e931
--- /dev/null
+++ b/eng/CreateVersionFile.csproj
@@ -0,0 +1,91 @@
+<!-- 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 Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <Target Name="GenerateVersionFiles" DependsOnTargets="GenerateVersionHeader;GenerateVersionSourceFile" />
+
+  <Target Name="GenerateVersionHeader" DependsOnTargets="GetAssemblyVersion;AddSourceRevisionToInformationalVersion" Condition="'$(NativeVersionHeaderFile)' != '' and '$(GenerateVersionHeader)' == 'true' and !Exists($(NativeVersionHeaderFile))">
+
+    <Error Message="VersionSuffixDateStamp is missing" Condition="'$(VersionSuffixDateStamp)' == ''" />
+
+    <PropertyGroup>
+      <ProductVersion>$(FileVersion.Replace(".", ","))</ProductVersion>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <NativeVersionLines>
+<![CDATA[
+#ifndef VER_COMPANYNAME_STR
+#define VER_COMPANYNAME_STR         "Microsoft Corporation"
+#endif
+#ifndef VER_PRODUCTNAME_STR
+#define VER_PRODUCTNAME_STR         "Microsoft\xae .NET Framework"
+#endif
+#undef VER_PRODUCTVERSION
+#define VER_PRODUCTVERSION          $(ProductVersion)
+#undef VER_PRODUCTVERSION_STR
+#define VER_PRODUCTVERSION_STR      "$(InformationalVersion)"
+#undef VER_FILEVERSION
+#define VER_FILEVERSION             $(ProductVersion)  
+#undef VER_FILEVERSION_STR
+#define VER_FILEVERSION_STR         "$(FileVersion)"
+#ifndef VER_LEGALCOPYRIGHT_STR
+#define VER_LEGALCOPYRIGHT_STR      "\xa9 Microsoft Corporation. All rights reserved."
+#endif
+]]>
+      </NativeVersionLines>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(NativeVersionHeaderFile)" Lines="$(NativeVersionLines.Replace(';', '%3B'))" Overwrite="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(NativeVersionHeaderFile)" />
+    </ItemGroup>
+
+    <Message Importance="High" Text="Created version file $(NativeVersionHeaderFile)" />
+  </Target>
+
+  <!-- Non Windows versioning requires to generate a source file and include it on the compilation. -->
+  <Target Name="GenerateVersionSourceFile" DependsOnTargets="GetAssemblyVersion;AddSourceRevisionToInformationalVersion" Condition="'$(NativeVersionSourceFile)' != '' and '$(GenerateVersionSourceFile)' == 'true' and !Exists($(NativeVersionHeaderFile))">
+
+    <!-- Get Username -->
+    <PropertyGroup>
+      <VersionUserName Condition="'$(VersionUserName)' == ''">$(USERNAME)</VersionUserName>
+    </PropertyGroup>
+
+    <Exec Command="whoami" Condition="'$(VersionUserName)' == ''" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="VersionUserName" />
+    </Exec>
+
+    <!-- Get Hostname -->
+    <PropertyGroup>
+      <VersionHostName Condition="'$(VersionHostName)' == ''">$(COMPUTERNAME)</VersionHostName>
+    </PropertyGroup>
+
+    <Exec Command="hostname" Condition="'$(RunningOnUnix)'=='true' AND '$(VersionHostName)'==''" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="VersionHostName" />
+    </Exec>
+
+    <PropertyGroup>
+      <BuiltByString Condition="'$(VersionUserName)' != '' AND '$(VersionHostName)' != ''">$(BuiltByString) %40BuiltBy: $(VersionUserName)-$(VersionHostName)</BuiltByString>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <NativeVersionLines>
+<![CDATA[
+static char sccsid[] __attribute__((used)) = "@(#)Version $(InformationalVersion)$(BuiltByString)";
+ ]]>
+      </NativeVersionLines>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(NativeVersionSourceFile)" Lines="$(NativeVersionLines.Replace(';', '%3B'))" Overwrite="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(NativeVersionSourceFile)" />
+    </ItemGroup>
+
+    <Message Importance="High" Text="Created version file $(NativeVersionSourceFile)" />
+  </Target>
+</Project>

diff --git a/eng/CreateVersionFile.proj b/eng/CreateVersionFile.proj
deleted file mode 100644 (file)
index d25e931..0000000
--- a/eng/CreateVersionFile.proj
+++ /dev/null
@@ -1,91 +0,0 @@
-<!-- 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 Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-  </PropertyGroup>
-
-  <Target Name="GenerateVersionFiles" DependsOnTargets="GenerateVersionHeader;GenerateVersionSourceFile" />
-
-  <Target Name="GenerateVersionHeader" DependsOnTargets="GetAssemblyVersion;AddSourceRevisionToInformationalVersion" Condition="'$(NativeVersionHeaderFile)' != '' and '$(GenerateVersionHeader)' == 'true' and !Exists($(NativeVersionHeaderFile))">
-
-    <Error Message="VersionSuffixDateStamp is missing" Condition="'$(VersionSuffixDateStamp)' == ''" />
-
-    <PropertyGroup>
-      <ProductVersion>$(FileVersion.Replace(".", ","))</ProductVersion>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <NativeVersionLines>
-<![CDATA[
-#ifndef VER_COMPANYNAME_STR
-#define VER_COMPANYNAME_STR         "Microsoft Corporation"
-#endif
-#ifndef VER_PRODUCTNAME_STR
-#define VER_PRODUCTNAME_STR         "Microsoft\xae .NET Framework"
-#endif
-#undef VER_PRODUCTVERSION
-#define VER_PRODUCTVERSION          $(ProductVersion)
-#undef VER_PRODUCTVERSION_STR
-#define VER_PRODUCTVERSION_STR      "$(InformationalVersion)"
-#undef VER_FILEVERSION
-#define VER_FILEVERSION             $(ProductVersion)  
-#undef VER_FILEVERSION_STR
-#define VER_FILEVERSION_STR         "$(FileVersion)"
-#ifndef VER_LEGALCOPYRIGHT_STR
-#define VER_LEGALCOPYRIGHT_STR      "\xa9 Microsoft Corporation. All rights reserved."
-#endif
-]]>
-      </NativeVersionLines>
-    </PropertyGroup>
-
-    <WriteLinesToFile File="$(NativeVersionHeaderFile)" Lines="$(NativeVersionLines.Replace(';', '%3B'))" Overwrite="true" />
-
-    <ItemGroup>
-      <FileWrites Include="$(NativeVersionHeaderFile)" />
-    </ItemGroup>
-
-    <Message Importance="High" Text="Created version file $(NativeVersionHeaderFile)" />
-  </Target>
-
-  <!-- Non Windows versioning requires to generate a source file and include it on the compilation. -->
-  <Target Name="GenerateVersionSourceFile" DependsOnTargets="GetAssemblyVersion;AddSourceRevisionToInformationalVersion" Condition="'$(NativeVersionSourceFile)' != '' and '$(GenerateVersionSourceFile)' == 'true' and !Exists($(NativeVersionHeaderFile))">
-
-    <!-- Get Username -->
-    <PropertyGroup>
-      <VersionUserName Condition="'$(VersionUserName)' == ''">$(USERNAME)</VersionUserName>
-    </PropertyGroup>
-
-    <Exec Command="whoami" Condition="'$(VersionUserName)' == ''" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true">
-      <Output TaskParameter="ConsoleOutput" PropertyName="VersionUserName" />
-    </Exec>
-
-    <!-- Get Hostname -->
-    <PropertyGroup>
-      <VersionHostName Condition="'$(VersionHostName)' == ''">$(COMPUTERNAME)</VersionHostName>
-    </PropertyGroup>
-
-    <Exec Command="hostname" Condition="'$(RunningOnUnix)'=='true' AND '$(VersionHostName)'==''" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true">
-      <Output TaskParameter="ConsoleOutput" PropertyName="VersionHostName" />
-    </Exec>
-
-    <PropertyGroup>
-      <BuiltByString Condition="'$(VersionUserName)' != '' AND '$(VersionHostName)' != ''">$(BuiltByString) %40BuiltBy: $(VersionUserName)-$(VersionHostName)</BuiltByString>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <NativeVersionLines>
-<![CDATA[
-static char sccsid[] __attribute__((used)) = "@(#)Version $(InformationalVersion)$(BuiltByString)";
- ]]>
-      </NativeVersionLines>
-    </PropertyGroup>
-
-    <WriteLinesToFile File="$(NativeVersionSourceFile)" Lines="$(NativeVersionLines.Replace(';', '%3B'))" Overwrite="true" />
-
-    <ItemGroup>
-      <FileWrites Include="$(NativeVersionSourceFile)" />
-    </ItemGroup>
-
-    <Message Importance="High" Text="Created version file $(NativeVersionSourceFile)" />
-  </Target>
-</Project>

diff --git a/eng/Versions.props b/eng/Versions.props
index 9278c05a1491570ea22be4e1aca2003963db5163..b690dcec44d61a7558fe4bfe017a629d0cf66165 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
-    <PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel></PreReleaseVersionLabel>
     <VersionPrefix>3.0.0</VersionPrefix>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

diff --git a/eng/build-native.sh b/eng/build-native.sh
index 5857ceab0b5df9b28759d087e473fb71ba5f5e3d..ea9b450717a4c2e7368b2da0c172ef445c19f3ed 100755 (executable)
--- a/eng/build-native.sh
+++ b/eng/build-native.sh
@@ -412,8 +412,11 @@ fi
 if [ $__Build == true ]; then
     if [[ $__CI == true ]]; then
         echo "Generating Version Source File"
+        __GenerateVersionRestoreLog="$__LogDir/GenerateVersionRestore.binlog"
+        $__DotNetCli msbuild $__ProjectRoot/eng/CreateVersionFile.csproj /v:$__Verbosity /bl:$__GenerateVersionRestoreLog /t:Restore /p:Configuration="$__BuildType" /p:Platform="$__BuildArch" $__UnprocessedBuildArgs
+
         __GenerateVersionLog="$__LogDir/GenerateVersion.binlog"
-        $__DotNetCli msbuild $__ProjectRoot/eng/CreateVersionFile.proj /v:$__Verbosity /bl:$__GenerateVersionLog /t:GenerateVersionFiles /p:GenerateVersionSourceFile=true /p:NativeVersionSourceFile="$__IntermediatesDir/version.cpp" /p:Configuration="$__BuildType" /p:Platform="$__BuildArch" $__UnprocessedBuildArgs
+        $__DotNetCli msbuild $__ProjectRoot/eng/CreateVersionFile.csproj /v:$__Verbosity /bl:$__GenerateVersionLog /t:GenerateVersionFiles /p:GenerateVersionSourceFile=true /p:NativeVersionSourceFile="$__IntermediatesDir/version.cpp" /p:Configuration="$__BuildType" /p:Platform="$__BuildArch" $__UnprocessedBuildArgs
         if [ $? != 0 ]; then
             echo "Generating Version Source File FAILED"
             exit 1