From: Juan Hoyos Date: Sat, 4 May 2019 21:31:32 +0000 (-0700) Subject: Overall cleanup for build system - part 1 (#247) X-Git-Tag: submit/tizen/20190813.035844~6^2^2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee2911d7a17e9652b8816e216c06badb8998eaea;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git Overall cleanup for build system - part 1 (#247) * Remove dotnet-analyze from build and CreateVersionFile * Rename NuGet config file to be compliant with casing * Use msbuild command in place of hardcoded paths * Add details file * Consolidate versions into a single file * Over all cleanup of project files, properties, and targets * Little workaround for older version of Arcade around license * Change format of versioning resources for readability * Update XUnit versions --- diff --git a/Directory.Build.props b/Directory.Build.props index fcb0f4b2a..13ee1228a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,30 @@ - + + + false + + + + false + Latest + 4 + true + true + + + + http://go.microsoft.com/fwlink/?LinkID=288859 + git + + + true + + + false false false - https://github.com/dotnet/diagnostics.git diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 1832c0de6..000000000 --- a/NuGet.Config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 000000000..1832c0de6 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/diagnostics.sln b/diagnostics.sln index 73cf4d207..59dfac6a2 100644 --- a/diagnostics.sln +++ b/diagnostics.sln @@ -13,16 +13,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SOS", "SOS", "{41638A4C-0DA 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}" @@ -231,46 +227,6 @@ Global {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 @@ -305,46 +261,6 @@ Global {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 @@ -771,10 +687,8 @@ Global {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} diff --git a/eng/Build-Native.cmd b/eng/Build-Native.cmd index 7f1a6f52d..cd01d5177 100644 --- a/eng/Build-Native.cmd +++ b/eng/Build-Native.cmd @@ -172,11 +172,6 @@ if not exist "%__DotNetCli%" ( 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 @@ -231,7 +226,7 @@ if %__Build% EQU 1 ( :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 diff --git a/eng/CreateVersionFile.csproj b/eng/CreateVersionFile.csproj index dd69ef432..4fbf1668c 100644 --- a/eng/CreateVersionFile.csproj +++ b/eng/CreateVersionFile.csproj @@ -1,18 +1,19 @@ - + - + + true + + + + netcoreapp2.0 + true - - - - - - + @@ -30,22 +31,31 @@ 42424 - - - - - - - - - - - - - - + + + + + - + @@ -79,14 +89,15 @@ $(BuiltByString) %40BuiltBy: $(VersionUserName)-$(VersionHostName) - - - - - - + + + + + - + @@ -95,10 +106,8 @@ - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml new file mode 100644 index 000000000..d7cb49795 --- /dev/null +++ b/eng/Version.Details.xml @@ -0,0 +1,14 @@ + + + + https://github.com/dotnet/command-line-api + 166610c56ff732093f0145a2911d4f6c40b786da + + + + + https://github.com/dotnet/arcade + 3f6ded0d4d606ed995f275a47c154ca6a22e8c7b + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 8c720b41a..96ec2ee4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,17 +1,19 @@  - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + https://github.com/dotnet/diagnostics + preview6 1.0.3 - preview5 + true + + false true - 2.8.0-beta6-62830-08 + 3.0.0 1.6.0 @@ -21,6 +23,19 @@ 1.0.0-dev-64016-01 1.0.5 + + 2.0.41 + 0.2.0-alpha.19213.1 + 0.2.0-alpha.19213.1 + + 2.4.1 + 2.0.3 + + 1.1.0 + + + 0.1.0-alpha-63807-01 + diff --git a/eng/build-native.sh b/eng/build-native.sh index 4b694a5a1..0582f8500 100755 --- a/eng/build-native.sh +++ b/eng/build-native.sh @@ -267,17 +267,12 @@ __ResultsDir=$__RootBinDir/TestResults/$__BuildType __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. @@ -450,7 +445,7 @@ if [ $__Build == true ]; then 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 diff --git a/src/Common.props b/src/Common.props deleted file mode 100644 index 30ac8ae16..000000000 --- a/src/Common.props +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - https://github.com/dotnet/diagnostics.git - git - - - - False - Latest - 4 - True - - - - http://go.microsoft.com/fwlink/?LinkID=288859 - https://github.com/dotnet/diagnostics.git - https://raw.githubusercontent.com/dotnet/diagnostics/master/LICENSE.TXT - - - - - True - - - diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 781b4e804..843f8b008 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,16 +1,12 @@ - - false - - - + - + - Latest true true + true diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 99cacb712..1d48a1ff5 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,6 +2,7 @@ + ;1591;1701 Diagnostic utility functions and helpers $(Description) - embedded - true + true - + diff --git a/src/Microsoft.Diagnostic.TestHelpers/Microsoft.Diagnostic.TestHelpers.csproj b/src/Microsoft.Diagnostic.TestHelpers/Microsoft.Diagnostic.TestHelpers.csproj index f7d8f9e48..0800c15f0 100644 --- a/src/Microsoft.Diagnostic.TestHelpers/Microsoft.Diagnostic.TestHelpers.csproj +++ b/src/Microsoft.Diagnostic.TestHelpers/Microsoft.Diagnostic.TestHelpers.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0 @@ -9,13 +9,10 @@ $(Description) tests embedded - true - - - - + + diff --git a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs index 0e3eccfd0..b24916055 100644 --- a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs +++ b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs @@ -15,7 +15,7 @@ namespace Xunit.Extensions public IEnumerable 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); } } } diff --git a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs index 6e34cdec3..e031171d9 100644 --- a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs +++ b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs @@ -11,8 +11,8 @@ namespace Xunit.Extensions [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 RunAsync(IMessageSink diagnosticMessageSink, IMessageBus messageBus, diff --git a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs index 2640a021b..40c4ab7dd 100644 --- a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs +++ b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs @@ -20,13 +20,14 @@ namespace Xunit.Extensions public IEnumerable 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)); } } } diff --git a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs index a27012f6c..46d2037ee 100644 --- a/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs +++ b/src/Microsoft.Diagnostic.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs @@ -11,8 +11,8 @@ namespace Xunit.Extensions [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 RunAsync(IMessageSink diagnosticMessageSink, IMessageBus messageBus, diff --git a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj index 8cb7efc5b..f37b5e0dc 100644 --- a/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj +++ b/src/Microsoft.Diagnostics.Tools.RuntimeClient/Microsoft.Diagnostics.Tools.RuntimeClient.csproj @@ -1,14 +1,12 @@  - Library netcoreapp2.1 Microsoft.Diagnostics.Tools.RuntimeClient - True - .NET Core Diagnostics Runtime Client True Diagnostic $(Description) + True diff --git a/src/SOS/SOS.Hosting/SOS.Hosting.csproj b/src/SOS/SOS.Hosting/SOS.Hosting.csproj index 777fb9e6c..e6daa9da2 100644 --- a/src/SOS/SOS.Hosting/SOS.Hosting.csproj +++ b/src/SOS/SOS.Hosting/SOS.Hosting.csproj @@ -5,7 +5,6 @@ SOS.Hosting ;1591;1701 SOS Hosting support - true true @@ -14,7 +13,7 @@ - - + + diff --git a/src/SOS/SOS.InstallHelper/SOS.InstallHelper.csproj b/src/SOS/SOS.InstallHelper/SOS.InstallHelper.csproj index 89203e322..f847e447c 100644 --- a/src/SOS/SOS.InstallHelper/SOS.InstallHelper.csproj +++ b/src/SOS/SOS.InstallHelper/SOS.InstallHelper.csproj @@ -7,6 +7,5 @@ Diagnostic SOS Install Helper $(Description) SOS - true diff --git a/src/SOS/SOS.UnitTests/SOS.UnitTests.csproj b/src/SOS/SOS.UnitTests/SOS.UnitTests.csproj index d4c9a8c5a..bf38f5910 100644 --- a/src/SOS/SOS.UnitTests/SOS.UnitTests.csproj +++ b/src/SOS/SOS.UnitTests/SOS.UnitTests.csproj @@ -14,26 +14,26 @@ - + Debugger.Tests.Config.txt Always - + Debugger.Tests.Config.txt Always - + Debugger.Tests.Common.txt Always - + - + diff --git a/src/Tools/Directory.Build.props b/src/Tools/Directory.Build.props index 949ac27c9..2e201f359 100644 --- a/src/Tools/Directory.Build.props +++ b/src/Tools/Directory.Build.props @@ -1,4 +1,13 @@ - + + + + Exe + true + true + win-x64;win-x86;osx-x64 + $(OutputPath) + false + diff --git a/src/Tools/dotnet-counters/dotnet-counters.csproj b/src/Tools/dotnet-counters/dotnet-counters.csproj index ceff9fafb..2d56b70f6 100644 --- a/src/Tools/dotnet-counters/dotnet-counters.csproj +++ b/src/Tools/dotnet-counters/dotnet-counters.csproj @@ -1,35 +1,26 @@  - Exe netcoreapp2.1 true - true - true - win-x64;win-x86;osx-x64 - - dotnet-counters Microsoft.Diagnostics.Tools.Counters .NET Core Performance Counter Tool Diagnostic $(Description) - - $(OutputPath) - - + - + + + + \ No newline at end of file diff --git a/src/Tools/dotnet-dump/dotnet-dump.csproj b/src/Tools/dotnet-dump/dotnet-dump.csproj index 48f3711df..103dcfba1 100644 --- a/src/Tools/dotnet-dump/dotnet-dump.csproj +++ b/src/Tools/dotnet-dump/dotnet-dump.csproj @@ -1,25 +1,13 @@  - Exe netcoreapp2.1 2.1.0 - true - true - win-x64;win-x86;osx-x64 - - - dotnet-dump Microsoft.Diagnostic.Tools.Dump Diagnostic dump collect and analyze tool Diagnostic $(Description) - - $(OutputPath) $(ArtifactsBinDir)\SOS.NETCore\$(Configuration)\netstandard2.0\publish\*.dll @@ -28,58 +16,46 @@ - - + + - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/win-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x64.$(Configuration)\sos.dll"> - None - tools/netcoreapp2.1/any/win-x64 - - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/win-x86 - - <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll"> - None - tools/netcoreapp2.1/any/win-x86 - - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsosplugin.so"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsos.so"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\sosdocsunix.txt"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/osx-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib"> - None - tools/netcoreapp2.1/any/osx-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib"> - None - tools/netcoreapp2.1/any/osx-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt"> - None - tools/netcoreapp2.1/any/osx-x64 - + + tools/$(TargetFramework)/any/win-x64 + + + tools/$(TargetFramework)/any/win-x64 + + + tools/$(TargetFramework)/any/win-x86 + + + tools/$(TargetFramework)/any/win-x86 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/osx-x64 + + + tools/$(TargetFramework)/any/osx-x64 + + + tools/$(TargetFramework)/any/osx-x64 + + + tools/$(TargetFramework)/any/osx-x64 + diff --git a/src/Tools/dotnet-sos/dotnet-sos.csproj b/src/Tools/dotnet-sos/dotnet-sos.csproj index 3a0ed60bf..f9becfe55 100644 --- a/src/Tools/dotnet-sos/dotnet-sos.csproj +++ b/src/Tools/dotnet-sos/dotnet-sos.csproj @@ -1,83 +1,59 @@  - Exe netcoreapp2.1 2.1.0 - true - true - win-x64;win-x86;osx-x64 - - - dotnet-sos Microsoft.Diagnostics.Tools.SOS Diagnostic SOS installer Diagnostic $(Description) - - $(OutputPath) $(ArtifactsBinDir)\SOS.NETCore\$(Configuration)\netstandard2.0\publish\*.dll - + - + - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/win-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x64.$(Configuration)\sos.dll"> - None - tools/netcoreapp2.1/any/win-x64 - - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/win-x86 - - <_PackageFiles Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll"> - None - tools/netcoreapp2.1/any/win-x86 - - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsosplugin.so"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\libsos.so"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\Linux.x64.$(Configuration)\sosdocsunix.txt"> - None - tools/netcoreapp2.1/any/linux-x64 - - <_PackageFiles Include="$(SOSNETCoreBinaries)"> - None - tools/netcoreapp2.1/any/osx-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib"> - None - tools/netcoreapp2.1/any/osx-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib"> - None - tools/netcoreapp2.1/any/osx-x64 - - <_PackageFiles Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt"> - None - tools/netcoreapp2.1/any/osx-x64 - + + tools/$(TargetFramework)/any/win-x64 + + + tools/$(TargetFramework)/any/win-x64 + + + tools/$(TargetFramework)/any/win-x86 + + + tools/$(TargetFramework)/any/win-x86 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/linux-x64 + + + tools/$(TargetFramework)/any/osx-x64 + + + tools/$(TargetFramework)/any/osx-x64 + + + tools/$(TargetFramework)/any/osx-x64 + + + tools/$(TargetFramework)/any/osx-x64 + diff --git a/src/Tools/dotnet-trace/dotnet-trace.csproj b/src/Tools/dotnet-trace/dotnet-trace.csproj index 09230a303..e015c662a 100644 --- a/src/Tools/dotnet-trace/dotnet-trace.csproj +++ b/src/Tools/dotnet-trace/dotnet-trace.csproj @@ -1,29 +1,18 @@  - - - - Exe netcoreapp2.1 Microsoft.Diagnostics.Tools.Trace - False - dotnet-trace .NET Core Performance Trace Tool Diagnostic $(Description) - $(OutputPath) - - True - True - win-x64;win-x86;osx-x64 - + diff --git a/src/Versions.props b/src/Versions.props deleted file mode 100644 index 140bd32e2..000000000 --- a/src/Versions.props +++ /dev/null @@ -1,7 +0,0 @@ - - - 2.0.41 - 0.2.0-alpha.19213.1 - 0.2.0-alpha.19213.1 - - diff --git a/src/tests/Microsoft.Diagnostics.Tools.RuntimeClient/eventpipetests.csproj b/src/tests/Microsoft.Diagnostics.Tools.RuntimeClient/eventpipetests.csproj index c2e84c08c..058b4977d 100644 --- a/src/tests/Microsoft.Diagnostics.Tools.RuntimeClient/eventpipetests.csproj +++ b/src/tests/Microsoft.Diagnostics.Tools.RuntimeClient/eventpipetests.csproj @@ -1,21 +1,17 @@  - - - Exe netcoreapp3.0 Microsoft.Diagnostics.Tools.RuntimeClient.Tests - False + false - False - False + false + false -