<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
- <!-- Disable source link until issue https://github.com/dotnet/roslyn/issues/29289#issuecomment-413294637 is fixed -->
+ <PropertyGroup>
+ <!-- Remove this when we update Arcade. -->
+ <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <UseSharedCompilation>false</UseSharedCompilation>
+ <LangVersion>Latest</LangVersion>
+ <WarningLevel>4</WarningLevel>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+ <RepositoryType>git</RepositoryType>
+ <!-- Uncomment this when we bump arcade versions -->
+ <!-- <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>
- <RepositoryUrl>https://github.com/dotnet/diagnostics.git</RepositoryUrl>
</PropertyGroup>
</Project>
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <solution>
- <add key="disableSourceControlIntegration" value="true" />
- </solution>
- <!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
- <packageSources>
- <clear />
- <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
- <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
- </packageSources>
-</configuration>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+ <!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
+ <packageSources>
+ <clear />
+ <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+ <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+ </packageSources>
+</configuration>
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.UnitTests", "src\SOS\SOS.UnitTests\SOS.UnitTests.csproj", "{1532DB3C-7DCD-45C6-B697-62B8378A16A2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateVersionFile", "eng\CreateVersionFile.csproj", "{365381BB-2A89-4F52-BC66-1BB4A9D514BB}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lldbplugin", "src\SOS\lldbplugin\lldbplugin.vcxproj", "{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{19FAB78C-3351-4911-8F0C-8C6056401740}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B62728C8-1267-4043-B46F-5537BBAEC692}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-analyze", "src\Tools\dotnet-analyze\dotnet-analyze.csproj", "{1576314E-F823-4A24-BC90-22282AB33353}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-trace", "src\Tools\dotnet-trace\dotnet-trace.csproj", "{718350FA-2DD9-4950-BA41-D7A7F66DAC91}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dump", "src\Tools\dotnet-dump\dotnet-dump.csproj", "{43D41DE9-7CCC-4DCB-A68A-B9099E538125}"
{1532DB3C-7DCD-45C6-B697-62B8378A16A2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{1532DB3C-7DCD-45C6-B697-62B8378A16A2}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
{1532DB3C-7DCD-45C6-B697-62B8378A16A2}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|Any CPU.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|Any CPU.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|ARM.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|ARM.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|ARM64.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|ARM64.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|x64.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|x64.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|x86.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Checked|x86.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|ARM.Build.0 = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|ARM64.Build.0 = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|x64.ActiveCfg = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|x64.Build.0 = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|x86.ActiveCfg = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Debug|x86.Build.0 = Debug|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|Any CPU.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|ARM.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|ARM.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|ARM64.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|ARM64.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|x64.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|x64.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|x86.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.Release|x86.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}.Checked|Any CPU.ActiveCfg = Release|x64
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}.Checked|Any CPU.Build.0 = Release|x64
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}.Checked|ARM.ActiveCfg = Release|x64
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}.RelWithDebInfo|x64.Build.0 = Release|x64
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}.RelWithDebInfo|x86.ActiveCfg = Release|x86
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}.RelWithDebInfo|x86.Build.0 = Release|x86
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|Any CPU.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|Any CPU.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|ARM.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|ARM.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|ARM64.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|ARM64.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|x64.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|x64.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|x86.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Checked|x86.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|ARM.Build.0 = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|ARM64.Build.0 = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|x64.Build.0 = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Debug|x86.Build.0 = Debug|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|Any CPU.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|ARM.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|ARM.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|ARM64.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|ARM64.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|x64.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|x64.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|x86.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.Release|x86.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
- {1576314E-F823-4A24-BC90-22282AB33353}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
{718350FA-2DD9-4950-BA41-D7A7F66DAC91}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
{718350FA-2DD9-4950-BA41-D7A7F66DAC91}.Checked|Any CPU.Build.0 = Debug|Any CPU
{718350FA-2DD9-4950-BA41-D7A7F66DAC91}.Checked|ARM.ActiveCfg = Debug|Any CPU
{730C1201-1848-4F1E-8C1F-6316FB886C35} = {19FAB78C-3351-4911-8F0C-8C6056401740}
{41638A4C-0DAF-47ED-A774-ECBBAC0315D7} = {19FAB78C-3351-4911-8F0C-8C6056401740}
{1532DB3C-7DCD-45C6-B697-62B8378A16A2} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7}
- {365381BB-2A89-4F52-BC66-1BB4A9D514BB} = {19FAB78C-3351-4911-8F0C-8C6056401740}
{D52C65C4-2C7D-45E6-9F5C-6F3A96796018} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7}
{B62728C8-1267-4043-B46F-5537BBAEC692} = {19FAB78C-3351-4911-8F0C-8C6056401740}
- {1576314E-F823-4A24-BC90-22282AB33353} = {B62728C8-1267-4043-B46F-5537BBAEC692}
{718350FA-2DD9-4950-BA41-D7A7F66DAC91} = {B62728C8-1267-4043-B46F-5537BBAEC692}
{43D41DE9-7CCC-4DCB-A68A-B9099E538125} = {B62728C8-1267-4043-B46F-5537BBAEC692}
{41F59D85-FC36-3015-861B-F177863252BC} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7}
echo %__MsgPrefix%Assertion failed: dotnet cli not found at path "%__DotNetCli%"
exit /b 1
)
-set __MSBuildPath=%__ProjectDir%\.dotnet\sdk\2.1.505\MSBuild.dll
-if not exist "%__MSBuildPath%" (
- echo %__MsgPrefix%Assertion failed: dotnet cli sdk not found at path "%__MSBuildPath%"
- exit /b 1
-)
set __DotNetRuntimeVersion=2.1.9
:GenVSSolution
echo Generating Version Header
set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
- %__DotNetCli% %__MSBuildPath% %__ProjectDir%\eng\CreateVersionFile.csproj /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:VersionPrefixFile=%__RootBinDir%\bin\VersionPrefix.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:VersionPrefixFile=%__RootBinDir%\bin\VersionPrefix.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
-<!-- 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. -->
+<!-- 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>
- <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+ <PropertyGroup>
+ <ContinuousIntegrationBuild Condition="'$(OfficialBuildId)' != ''">true</ContinuousIntegrationBuild>
+ </PropertyGroup>
+ <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+ <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
+ <ContinuousIntegrationBuild Condition="'$(ContinuousIntegrationBuild)' != ''">true</ContinuousIntegrationBuild>
</PropertyGroup>
-
- <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
- <Target Name="Build" />
-
<Target Name="GenerateVersionFiles" DependsOnTargets="GenerateVersionPrefixFile;GenerateVersionHeader;GenerateVersionSourceFile" />
- <Target Name="GenerateVersionPrefixFile" Condition="'$(VersionPrefixFile)' != ''" >
+ <Target Name="GenerateVersionPrefixFile" Condition="'$(VersionPrefixFile)' != ''">
<ItemGroup>
<VersionPrefixLines Include="$(VersionPrefix)" />
</ItemGroup>
<VersionSuffixBuildOfTheDay>42424</VersionSuffixBuildOfTheDay>
</PropertyGroup>
- <ItemGroup>
- <!-- Defining versioning variables -->
- <NativeVersionLines Include="#undef VER_FILEVERSION" />
- <NativeVersionLines Include="#define VER_FILEVERSION $(_FileMajor),$(_FileMinor),$(_FilePatch),$(_FileRevision)" />
-
- <NativeVersionLines Include="#undef VER_FILEVERSION_STR" />
- <NativeVersionLines Include="#define VER_FILEVERSION_STR "$(FileVersion)"" />
-
- <NativeVersionLines Include="#undef VER_PRODUCTVERSION" />
- <NativeVersionLines Include="#define VER_PRODUCTVERSION $(_FileMajor),$(_FileMinor),$(VersionSuffixDateStamp),$(VersionSuffixBuildOfTheDay)" />
-
- <NativeVersionLines Include="#undef VER_PRODUCTVERSION_STR" />
- <NativeVersionLines Include="#define VER_PRODUCTVERSION_STR "$(InformationalVersion)"" />
- </ItemGroup>
+ <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 $(_FileMajor),$(_FileMinor),$(VersionSuffixDateStamp),$(VersionSuffixBuildOfTheDay)
+#undef VER_PRODUCTVERSION_STR
+#define VER_PRODUCTVERSION_STR "$(InformationalVersion)"
+#undef VER_FILEVERSION
+#define VER_FILEVERSION $(_FileMajor),$(_FileMinor),$(_FilePatch),$(_FileRevision)
+#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)" Overwrite="true" />
+ <WriteLinesToFile File="$(NativeVersionHeaderFile)" Lines="$(NativeVersionLines.Replace(';', '%3B'))" Overwrite="true" />
<ItemGroup>
<FileWrites Include="$(NativeVersionHeaderFile)" />
<BuiltByString Condition="'$(VersionUserName)' != '' AND '$(VersionHostName)' != ''">$(BuiltByString) %40BuiltBy: $(VersionUserName)-$(VersionHostName)</BuiltByString>
</PropertyGroup>
- <ItemGroup>
- <SourceFileLines />
- <SourceFileLines Include="static char sccsid%5B%5D %5F%5Fattribute%5F%5F%28%28used%29%29 %3D %22%40%28%23%29Version $(InformationalVersion)$(BuiltByString)%22%3B" />
- <!-- Since this is a source file, compiler will complain if there is no new line at end of file, so adding one bellow. -->
- <SourceFileLines Include=" " />
- </ItemGroup>
+ <PropertyGroup>
+ <NativeVersionLines>
+<![CDATA[
+static char sccsid[] __attribute__((used)) = "@(#)Version $(InformationalVersion)$(BuiltByString)";
+ ]]>
+ </NativeVersionLines>
+ </PropertyGroup>
- <WriteLinesToFile File="$(NativeVersionSourceFile)" Lines="@(SourceFileLines)" Overwrite="true" />
+ <WriteLinesToFile File="$(NativeVersionSourceFile)" Lines="$(NativeVersionLines.Replace(';', '%3B'))" Overwrite="true" />
<ItemGroup>
<FileWrites Include="$(NativeVersionSourceFile)" />
<Message Importance="High" Text="Created version file $(NativeVersionSourceFile)" />
</Target>
- <ItemGroup>
- <Compile Remove="**" />
- <EmbeddedResource Remove="**" />
- <None Remove="**" />
- </ItemGroup>
-
+ <Import Project="Sdk.targets" Sdk="Microsoft.Dotnet.Arcade.Sdk" />
+ <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+ <Target Name="Build" />
+ <Target Name="Restore" />
</Project>
--- /dev/null
+<Dependencies>
+ <ProductDependencies>
+ <Dependency Name="System.CommandLine.Experimental" Version=">0.2.0-alpha.19213.1">
+ <Uri>https://github.com/dotnet/command-line-api</Uri>
+ <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
+ </Dependency>
+ </ProductDependencies>
+ <ToolsetDependencies>
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18516.5">
+ <Uri>https://github.com/dotnet/arcade</Uri>
+ <Sha>3f6ded0d4d606ed995f275a47c154ca6a22e8c7b</Sha>
+ </Dependency>
+ </ToolsetDependencies>
+</Dependencies>
\ No newline at end of file
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
<PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-
+ <RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
+ <PreReleaseVersionLabel>preview6</PreReleaseVersionLabel>
<VersionPrefix>1.0.3</VersionPrefix>
- <PreReleaseVersionLabel>preview5</PreReleaseVersionLabel>
+ <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
+ </PropertyGroup>
+ <PropertyGroup>
<!-- Opt-out repo features -->
<UsingToolXliff>false</UsingToolXliff>
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
<!-- Build tools -->
- <MicrosoftNetCompilersVersion>2.8.0-beta6-62830-08</MicrosoftNetCompilersVersion>
+ <MicrosoftNetCompilersVersion>3.0.0</MicrosoftNetCompilersVersion>
<!-- CoreFX -->
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
<!-- Other libs -->
<MicrosoftSymbolStoreVersion>1.0.0-dev-64016-01</MicrosoftSymbolStoreVersion>
<MicrosoftDiagnosticsRuntimeVersion>1.0.5</MicrosoftDiagnosticsRuntimeVersion>
+
+ <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.41</MicrosoftDiagnosticsTracingTraceEventVersion>
+ <SystemCommandLineExperimentalVersion>0.2.0-alpha.19213.1</SystemCommandLineExperimentalVersion>
+ <SystemCommandLineRenderingVersion>0.2.0-alpha.19213.1</SystemCommandLineRenderingVersion>
+
+ <XUnitVersion>2.4.1</XUnitVersion>
+ <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
+
+ <cdbsosversion>1.1.0</cdbsosversion>
+
+ <!-- The Repl project depends on types that were removed from -->
+ <SystemCommandLineExperimentalVersionRepl>0.1.0-alpha-63807-01</SystemCommandLineExperimentalVersionRepl>
+
</PropertyGroup>
<PropertyGroup>
__PackagesBinDir=$__RootBinDir/packages/$__BuildType/Shipping
__ExtraCmakeArgs="-DCLR_MANAGED_BINARY_DIR=$__RootBinDir/bin -DCLR_BUILD_TYPE=$__BuildType"
__DotNetCli=$__ProjectRoot/.dotnet/dotnet
-__MSBuildPath=$__ProjectRoot/.dotnet/sdk/2.1.505/MSBuild.dll
__DotNetRuntimeVersion=2.1.9
if [ ! -e $__DotNetCli ]; then
echo "dotnet cli not installed $__DotNetCli"
exit 1
fi
-if [ ! -e $__MSBuildPath ]; then
- echo "dotnet cli sdk not installed $__MSBuildPath"
- exit 1
-fi
# Specify path to be set for CMAKE_INSTALL_PREFIX.
# This is where all built native libraries will copied to.
if [[ $__CI == true ]]; then
echo "Generating Version Source File"
__GenerateVersionLog="$__LogDir/GenerateVersion.binlog"
- $__DotNetCli $__MSBuildPath $__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
+ $__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
+++ /dev/null
-<Project>
-
- <Import Project="$(MSBuildThisFileDirectory)\Versions.props" />
-
- <PropertyGroup Label="Repository information">
- <RepositoryUrl>https://github.com/dotnet/diagnostics.git</RepositoryUrl>
- <RepositoryType>git</RepositoryType>
- </PropertyGroup>
-
- <PropertyGroup Label="Common Build properties">
- <UseSharedCompilation>False</UseSharedCompilation>
- <LangVersion>Latest</LangVersion>
- <WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
- </PropertyGroup>
-
- <PropertyGroup Label="NuGet package information">
- <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
- <PackageProjectUrl>https://github.com/dotnet/diagnostics.git</PackageProjectUrl>
- <PackageLicenseUrl>https://raw.githubusercontent.com/dotnet/diagnostics/master/LICENSE.TXT</PackageLicenseUrl>
- </PropertyGroup>
-
- <PropertyGroup>
- <!--
- Suppress warnings for using preview SDK:
- You are working with a preview version of the .NET Core SDK.
- You can define the SDK version via a global.json file in the current project.
- More at https://go.microsoft.com/fwlink/?linkid=869452
- -->
- <SuppressNETCoreSdkPreviewMessage>True</SuppressNETCoreSdkPreviewMessage>
- </PropertyGroup>
-
-</Project>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
- <PropertyGroup>
- <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
- </PropertyGroup>
-
- <Import Project="..\Directory.Build.props"/>
+ <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props"/>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
+
<PropertyGroup>
- <LangVersion>Latest</LangVersion>
<IsShipping>true</IsShipping>
<NoPackageAnalysis>true</NoPackageAnalysis>
+ <DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+ <!-- Remove this once arcade version is bumped -->
<Target Name="_PublishPackageReferences"
AfterTargets="PostBuildEvent"
Condition="$(IsPublishable) == 'true'"
<NoWarn>;1591;1701</NoWarn>
<Description>Diagnostic utility functions and helpers</Description>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
- <DebugType>embedded</DebugType>
- <DebugSymbols>true</DebugSymbols>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.CommandLine.Experimental" Version="0.1.0-alpha-63807-01" />
+ <PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLineExperimentalVersionRepl)" />
</ItemGroup>
</Project>
-<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
+<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
<PackageTags>tests</PackageTags>
<DebugType>embedded</DebugType>
- <DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
- <PackageReference Include="xunit" Version="2.3.1" />
- <PackageReference Include="xunit.abstractions" Version="2.0.1" />
- <PackageReference Include="xunit.runner.console" Version="2.3.1" />
+ <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+ <PackageReference Include="xunit.abstractions" Version="$(XUnitAbstractionsVersion)" />
</ItemGroup>
</Project>
public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
{
- yield return new SkippableFactTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod);
+ yield return new SkippableFactTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
}
}
}
[Obsolete("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")]
public SkippableFactTestCase() { }
- public SkippableFactTestCase(IMessageSink diagnosticMessageSink, Sdk.TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, object[] testMethodArguments = null)
- : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments) { }
+ public SkippableFactTestCase(IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod, object[] testMethodArguments = null)
+ : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments) { }
public override async Task<RunSummary> RunAsync(IMessageSink diagnosticMessageSink,
IMessageBus messageBus,
public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
{
var defaultMethodDisplay = discoveryOptions.MethodDisplayOrDefault();
+ var defaultMethodDisplayOptions = discoveryOptions.MethodDisplayOptionsOrDefault();
// Unlike fact discovery, the underlying algorithm for theories is complex, so we let the theory discoverer
// do its work, and do a little on-the-fly conversion into our own test cases.
return theoryDiscoverer.Discover(discoveryOptions, testMethod, factAttribute)
.Select(testCase => testCase is XunitTheoryTestCase
- ? (IXunitTestCase)new SkippableTheoryTestCase(diagnosticMessageSink, defaultMethodDisplay, testCase.TestMethod)
- : new SkippableFactTestCase(diagnosticMessageSink, defaultMethodDisplay, testCase.TestMethod, testCase.TestMethodArguments));
+ ? (IXunitTestCase)new SkippableTheoryTestCase(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testCase.TestMethod)
+ : new SkippableFactTestCase(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testCase.TestMethod, testCase.TestMethodArguments));
}
}
}
[Obsolete("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")]
public SkippableTheoryTestCase() { }
- public SkippableTheoryTestCase(IMessageSink diagnosticMessageSink, Xunit.Sdk.TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod)
- : base(diagnosticMessageSink, defaultMethodDisplay, testMethod) { }
+ public SkippableTheoryTestCase(IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod)
+ : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod) { }
public override async Task<RunSummary> RunAsync(IMessageSink diagnosticMessageSink,
IMessageBus messageBus,
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="$(MSBuildThisFileDirectory)\..\Common.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Microsoft.Diagnostics.Tools.RuntimeClient</RootNamespace>
- <GenerateDocumentationFile>True</GenerateDocumentationFile>
-
<Description>.NET Core Diagnostics Runtime Client</Description>
<IsPackable>True</IsPackable>
<PackageTags>Diagnostic</PackageTags>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
</Project>
<AssemblyName>SOS.Hosting</AssemblyName>
<NoWarn>;1591;1701</NoWarn>
<Description>SOS Hosting support</Description>
- <DebugSymbols>true</DebugSymbols>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Microsoft.Diagnostic.Repl\Microsoft.Diagnostic.Repl.csproj" />
- <ProjectReference Include="..\SOS.NETCore\SOS.NETCore.csproj" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostic.Repl\Microsoft.Diagnostic.Repl.csproj" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)..\SOS.NETCore\SOS.NETCore.csproj" />
</ItemGroup>
</Project>
<Description>Diagnostic SOS Install Helper</Description>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
<PackageTags>SOS</PackageTags>
- <DebugSymbols>true</DebugSymbols>
</PropertyGroup>
</Project>
</ItemGroup>
<ItemGroup>
- <Content Include="ConfigFiles\Windows\Debugger.Tests.Config.txt" Condition="'$(OS)' == 'Windows_NT'">
+ <Content Include="$(MSBuildThisFileDirectory)ConfigFiles\Windows\Debugger.Tests.Config.txt" Condition="'$(OS)' == 'Windows_NT'">
<Link>Debugger.Tests.Config.txt</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="ConfigFiles\Unix\Debugger.Tests.Config.txt" Condition="$(OS) == 'Unix'">
+ <Content Include="$(MSBuildThisFileDirectory)ConfigFiles\Unix\Debugger.Tests.Config.txt" Condition="$(OS) == 'Unix'">
<Link>Debugger.Tests.Config.txt</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="ConfigFiles\$(Configuration)\Debugger.Tests.Common.txt">
+ <Content Include="$(MSBuildThisFileDirectory)ConfigFiles\$(Configuration)\Debugger.Tests.Common.txt">
<Link>Debugger.Tests.Common.txt</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Microsoft.Diagnostic.TestHelpers\Microsoft.Diagnostic.TestHelpers.csproj" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostic.TestHelpers\Microsoft.Diagnostic.TestHelpers.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Primitives" Version="$(MicrosoftWin32PrimitivesVersion)" />
- <PackageReference Include="cdb-sos" Version="1.1.0" Condition="'$(OS)' == 'Windows_NT'" />
+ <PackageReference Include="cdb-sos" Version="$(cdbsosversion)" Condition="'$(OS)' == 'Windows_NT'" />
</ItemGroup>
</Project>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
- <Import Project="..\Directory.Build.props"/>
+ <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props"/>
+
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <IsPackable>true</IsPackable>
+ <PackAsTool>true</PackAsTool>
+ <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
+ <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
+ <GenerateDocumentationFile>false</GenerateDocumentationFile>
+ </PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IsPackable>true</IsPackable>
- <PackAsTool>true</PackAsTool>
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
- <!-- The package version needs to be hard coded as a stable version so "dotnet tool install -g dotnet-sos" works
- <Version>$(VersionPrefix)</Version>
- <PackageVersion>$(VersionPrefix)</PackageVersion>
- -->
-
<ToolCommandName>dotnet-counters</ToolCommandName>
<RootNamespace>Microsoft.Diagnostics.Tools.Counters</RootNamespace>
<Description>.NET Core Performance Counter Tool</Description>
<PackageTags>Diagnostic</PackageTags>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
- <!-- Need to put the shims here to sign -->
- <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
-
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\dotnet-trace\Extensions.cs" Link="Extensions.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)..\dotnet-trace\Extensions.cs" Link="Extensions.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostic.Repl\Microsoft.Diagnostic.Repl.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostics.Tools.RuntimeClient\Microsoft.Diagnostics.Tools.RuntimeClient.csproj" />
- <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.41" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
</ItemGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
- <IsPackable>true</IsPackable>
- <PackAsTool>true</PackAsTool>
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
-
- <!-- The package version needs to be hard coded as a stable version so "dotnet tool install -g dotnet-dump" works
- <Version>$(VersionPrefix)</Version>
- <PackageVersion>$(VersionPrefix)</PackageVersion>
- -->
-
<ToolCommandName>dotnet-dump</ToolCommandName>
<RootNamespace>Microsoft.Diagnostic.Tools.Dump</RootNamespace>
<Description>Diagnostic dump collect and analyze tool</Description>
<PackageTags>Diagnostic</PackageTags>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
- <!-- Need to put the shims here to sign -->
- <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
<SOSNETCoreBinaries>$(ArtifactsBinDir)\SOS.NETCore\$(Configuration)\netstandard2.0\publish\*.dll</SOSNETCoreBinaries>
</PropertyGroup>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Microsoft.Diagnostic.Repl\Microsoft.Diagnostic.Repl.csproj" />
- <ProjectReference Include="..\..\SOS\SOS.Hosting\SOS.Hosting.csproj" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostic.Repl\Microsoft.Diagnostic.Repl.csproj" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\SOS\SOS.Hosting\SOS.Hosting.csproj" />
</ItemGroup>
<ItemGroup>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x64.$(Configuration)\sos.dll">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x86</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x86</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsosplugin.so">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsos.so">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\sosdocsunix.txt">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/win-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Windows_NT.x64.$(Configuration)\sos.dll">
+ <PackagePath>tools/$(TargetFramework)/any/win-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/win-x86</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll">
+ <PackagePath>tools/$(TargetFramework)/any/win-x86</PackagePath>
+ </None>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsosplugin.so">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsos.so">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\sosdocsunix.txt">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
- <IsPackable>true</IsPackable>
- <PackAsTool>true</PackAsTool>
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
-
- <!-- The package version needs to be hard coded as a stable version so "dotnet tool install -g dotnet-sos" works
- <Version>$(VersionPrefix)</Version>
- <PackageVersion>$(VersionPrefix)</PackageVersion>
- -->
-
<ToolCommandName>dotnet-sos</ToolCommandName>
<RootNamespace>Microsoft.Diagnostics.Tools.SOS</RootNamespace>
<Description>Diagnostic SOS installer</Description>
<PackageTags>Diagnostic</PackageTags>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
- <!-- Need to put the shims here to sign -->
- <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
<SOSNETCoreBinaries>$(ArtifactsBinDir)\SOS.NETCore\$(Configuration)\netstandard2.0\publish\*.dll</SOSNETCoreBinaries>
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\..\SOS\SOS.InstallHelper\SOS.InstallHelper.csproj" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\SOS\SOS.InstallHelper\SOS.InstallHelper.csproj" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="System.CommandLine.Experimental" Version="0.1.0-alpha-63807-01" />
+ <PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLineExperimentalVersion)" />
</ItemGroup>
<ItemGroup>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x64.$(Configuration)\sos.dll">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x86</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/win-x86</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsosplugin.so">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsos.so">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\sosdocsunix.txt">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/linux-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(SOSNETCoreBinaries)">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
- <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt">
- <BuildAction>None</BuildAction>
- <PackagePath>tools/netcoreapp2.1/any/osx-x64</PackagePath>
- </_PackageFiles>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/win-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Windows_NT.x64.$(Configuration)\sos.dll">
+ <PackagePath>tools/$(TargetFramework)/any/win-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/win-x86</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll">
+ <PackagePath>tools/$(TargetFramework)/any/win-x86</PackagePath>
+ </None>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsosplugin.so">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsos.so">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\sosdocsunix.txt">
+ <PackagePath>tools/$(TargetFramework)/any/linux-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(SOSNETCoreBinaries)">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
+ <None Pack="True" Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt">
+ <PackagePath>tools/$(TargetFramework)/any/osx-x64</PackagePath>
+ </None>
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="$(MSBuildThisFileDirectory)\..\..\Common.props" />
-
<PropertyGroup>
- <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Microsoft.Diagnostics.Tools.Trace</RootNamespace>
- <GenerateDocumentationFile>False</GenerateDocumentationFile>
-
<ToolCommandName>dotnet-trace</ToolCommandName>
<Description>.NET Core Performance Trace Tool</Description>
<PackageTags>Diagnostic</PackageTags>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
- <!-- Need to put the shims here to sign -->
<PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
-
- <IsPackable>True</IsPackable>
- <PackAsTool>True</PackAsTool>
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLineExperimentalVersion)" />
<PackageReference Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
- <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.41" />
+ <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
</ItemGroup>
<ItemGroup>
+++ /dev/null
-<Project>
- <PropertyGroup>
- <MicrosoftDiagnosticsTracingLibraryVersion>2.0.41</MicrosoftDiagnosticsTracingLibraryVersion>
- <SystemCommandLineExperimentalVersion>0.2.0-alpha.19213.1</SystemCommandLineExperimentalVersion>
- <SystemCommandLineRenderingVersion>0.2.0-alpha.19213.1</SystemCommandLineRenderingVersion>
- </PropertyGroup>
-</Project>
<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="$(MSBuildThisFileDirectory)\..\..\Common.props" />
-
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>Microsoft.Diagnostics.Tools.RuntimeClient.Tests</RootNamespace>
- <GenerateDocumentationFile>False</GenerateDocumentationFile>
+ <GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
- <IsPackable>False</IsPackable>
- <PackAsTool>False</PackAsTool>
+ <IsPackable>false</IsPackable>
+ <PackAsTool>false</PackAsTool>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostics.Tools.RuntimeClient\Microsoft.Diagnostics.Tools.RuntimeClient.csproj" />
</ItemGroup>
-
</Project>
projects / platform / core / dotnet / diagnostics.git / commitdiff