From 453e242d6abbcb5da3742340f1dbf76625d9077a Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 13 Mar 2024 15:56:13 -0700 Subject: [PATCH] Test against net9.0 (#4529) Change the runtime install and config file runtime test versioning infrastructure to make it easier to add 9.0. Disable test part of the Reflection SOS test for 9.0. --------- Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> --- NuGet.config | 3 +- eng/AuxMsbuildFiles/SdkPackOverrides.targets | 152 +++++++++++- eng/CleanupPrivateBuild.proj | 9 - eng/InstallRuntimes.proj | 228 +++--------------- eng/Versions.props | 79 ++++++ eng/build.ps1 | 9 - eng/build.sh | 7 - global.json | 4 +- .../Host/CommandFormatHelpers.cs | 2 +- .../Unix/Debugger.Tests.Config.txt | 133 +++++----- .../Windows/Debugger.Tests.Config.txt | 139 +++++------ .../Debuggees/DesktopClrHost/CMakeLists.txt | 1 + .../Debuggees/Directory.Build.props | 2 +- src/SOS/SOS.UnitTests/SOSRunner.cs | 4 + .../Unix/Debugger.Tests.Config.txt | 28 +-- .../Windows/Debugger.Tests.Config.txt | 28 +-- .../Unix/Debugger.Tests.Config.txt | 51 ++-- .../Windows/Debugger.Tests.Config.txt | 53 ++-- .../Debuggees/Directory.Build.props | 4 + src/tests/Directory.Build.props | 3 +- .../EventPipeTracee/EventPipeTracee.csproj | 2 +- .../ExitCodeTracee/ExitCodeTracee.csproj | 2 +- .../EventPipeSessionTests.cs | 2 +- src/tests/StackTracee/StackTracee.csproj | 2 +- src/tests/Tracee/Tracee.csproj | 2 +- .../dotnet-stack/DotnetStack.UnitTests.csproj | 2 +- src/tests/eventpipe/LoaderEvents.cs | 2 +- 27 files changed, 499 insertions(+), 454 deletions(-) delete mode 100644 eng/CleanupPrivateBuild.proj create mode 100644 src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props diff --git a/NuGet.config b/NuGet.config index e32374b1e..85d9e3140 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + diff --git a/eng/AuxMsbuildFiles/SdkPackOverrides.targets b/eng/AuxMsbuildFiles/SdkPackOverrides.targets index 710727a87..edfcb9bff 100644 --- a/eng/AuxMsbuildFiles/SdkPackOverrides.targets +++ b/eng/AuxMsbuildFiles/SdkPackOverrides.targets @@ -1,19 +1,147 @@ + + + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net6.0')->Metadata('Runtime')) + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net7.0')->Metadata('Runtime')) + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('Runtime')) + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('Runtime')) + + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net6.0')->Metadata('AspNet')) + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net7.0')->Metadata('AspNet')) + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('AspNet')) + @(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('AspNet')) + + - - $(MicrosoftNETCoreApp60Version) - $(MicrosoftNETCoreApp60Version) - - - $(MicrosoftNETCoreApp60Version) - - - $(MicrosoftNETCoreApp60Version) + + + $(RuntimeVersion60) - - $(MicrosoftNETCoreApp60Version) + + + $(RuntimeVersion70) + + + + $(RuntimeVersion80) + + + + $(RuntimeVersion90) + + + + + $(RuntimeVersion60) + $(RuntimeVersion60) + + + + $(RuntimeVersion70) + $(RuntimeVersion70) + + + + $(RuntimeVersion80) + $(RuntimeVersion80) + + + + $(RuntimeVersion90) + $(RuntimeVersion90) + + + + $(RuntimeVersion60) + + + + $(RuntimeVersion70) + + + + $(RuntimeVersion80) + + + + $(RuntimeVersion90) + + + + $(RuntimeVersion60) + + + + $(RuntimeVersion70) + + + + $(RuntimeVersion80) + + + + $(RuntimeVersion90) + + + + + $(AspNetVersion60) + $(AspNetVersion60) + + + + $(AspNetVersion70) + $(AspNetVersion70) + + + + $(AspNetVersion80) + $(AspNetVersion80) + + + + $(AspNetVersion90) + $(AspNetVersion90) + + + + $(AspNetVersion60) + + + + $(AspNetVersion70) + + + + $(AspNetVersion80) + + + + $(AspNetVersion90) + + + + $(AspNetVersion60) + + + + $(AspNetVersion70) + + + + $(AspNetVersion80) + + + + $(AspNetVersion90) - \ No newline at end of file + diff --git a/eng/CleanupPrivateBuild.proj b/eng/CleanupPrivateBuild.proj deleted file mode 100644 index 7f48d9c94..000000000 --- a/eng/CleanupPrivateBuild.proj +++ /dev/null @@ -1,9 +0,0 @@ - - - netstandard2.0 - false - false - - - - diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj index 32d4e6478..9238b5ac4 100644 --- a/eng/InstallRuntimes.proj +++ b/eng/InstallRuntimes.proj @@ -1,49 +1,24 @@ $(Platform) $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - false - true - default - false - true - -runtimesourcefeed '$(RuntimeSourceFeed)' -runtimesourcefeedkey '$(RuntimeSourceFeedKey)' @@ -79,32 +54,12 @@ - - - - - - - - - - - - - - - - - - - - + DependsOnTargets="CleanupVersionManifest;InstallRuntimesWindows;InstallRuntimesUnix;WriteTestVersionManifest;" /> + Condition="$(InternalReleaseTesting)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 40869abd5..8969c40ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,4 +97,83 @@ 4.8.0-2.23422.14 4.8.0-2.23422.14 + + + 8.0.2 + 7.0.16 + 6.0.27 + + + + default + false + true + -runtimesourcefeed '$(RuntimeSourceFeed)' -runtimesourcefeedkey '$(RuntimeSourceFeedKey)' + + + + + + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 + net9.0 + + + + $(MicrosoftNETCoreApp80Version) + $(MicrosoftNETCoreApp80Version) + $(MicrosoftNETCoreApp80Version) + $(MicrosoftNETCoreApp80Version) + net8.0 + + + + $(MicrosoftNETCoreApp70Version) + $(MicrosoftNETCoreApp70Version) + $(MicrosoftNETCoreApp70Version) + $(MicrosoftNETCoreApp70Version) + net7.0 + + + + $(MicrosoftNETCoreApp60Version) + $(MicrosoftNETCoreApp60Version) + $(MicrosoftNETCoreApp60Version) + $(MicrosoftNETCoreApp60Version) + net6.0 + + + + + + + $(DotnetRuntimeDownloadVersion) + $(DotnetRuntimeDownloadVersion) + $(ExtraInstallArgs) + + + + $(DotnetRuntimeVersion) + $(DotnetRuntimeVersion) + $(ExtraInstallArgs) + + + diff --git a/eng/build.ps1 b/eng/build.ps1 index 6bf2d4f69..3c8b222ed 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -8,8 +8,6 @@ Param( [switch] $skipmanaged, [switch] $skipnative, [switch] $bundletools, - [string] $privatebuildpath = "", - [switch] $cleanupprivatebuild, [ValidatePattern("(default|\d+\.\d+.\d+(-[a-z0-9\.]+)?)")][string] $dotnetruntimeversion = 'default', [ValidatePattern("(default|\d+\.\d+.\d+(-[a-z0-9\.]+)?)")][string] $dotnetruntimedownloadversion= 'default', [string] $runtimesourcefeed = '', @@ -51,12 +49,6 @@ if ($bundletools) { $test = $False } -# Remove the private build registry keys -if ($cleanupprivatebuild) { - Invoke-Expression "& `"$engroot\common\msbuild.ps1`" $engroot\CleanupPrivateBuild.proj /v:$verbosity /t:CleanupPrivateBuild /p:BuildArch=$architecture /p:TestArchitectures=$architecture" - exit $lastExitCode -} - # Install sdk for building, restore and build managed components. if (-not $skipmanaged) { Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity /p:BuildArch=$architecture /p:TestArchitectures=$architecture $remainingargs" @@ -84,7 +76,6 @@ if ($test) { /bl:$logdir\Test.binlog ` /p:BuildArch=$architecture ` /p:TestArchitectures=$architecture ` - /p:PrivateBuildPath="$privatebuildpath" ` /p:DotnetRuntimeVersion="$dotnetruntimeversion" ` /p:DotnetRuntimeDownloadVersion="$dotnetruntimedownloadversion" ` /p:RuntimeSourceFeed="$runtimesourcefeed" ` diff --git a/eng/build.sh b/eng/build.sh index db449d4ac..02a1ebcc1 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -21,7 +21,6 @@ __ManagedBuildArgs= __NativeBuild=1 __NumProc=1 __PortableBuild=1 -__PrivateBuildPath= __RootBinDir="$__RepoRootDir"/artifacts __RuntimeSourceFeed= __RuntimeSourceFeedKey= @@ -32,7 +31,6 @@ __UnprocessedBuildArgs= usage_list+=("-skipmanaged: do not build managed components.") usage_list+=("-skipnative: do not build native components.") -usage_list+=("-privatebuildpath: path to local private runtime build to test.") usage_list+=("-test: run xunit tests") handle_arguments() { @@ -69,10 +67,6 @@ handle_arguments() { __ShiftArgs=1 ;; - privatebuildpath|-privatebuildpath) - __PrivateBuildPath="$1" - ;; - -runtimesourcefeed) __RuntimeSourceFeed="$2" __ShiftArgs=1 @@ -279,7 +273,6 @@ if [[ "$__Test" == 1 ]]; then --configuration "$__BuildType" \ /bl:"$__LogsDir"/Test.binlog \ /p:BuildArch="$__TargetArch" \ - /p:PrivateBuildPath="$__PrivateBuildPath" \ /p:DotnetRuntimeVersion="$__DotnetRuntimeVersion" \ /p:DotnetRuntimeDownloadVersion="$__DotnetRuntimeDownloadVersion" \ /p:RuntimeSourceFeed="$__RuntimeSourceFeed" \ diff --git a/global.json b/global.json index e6a7e203b..05861edcb 100644 --- a/global.json +++ b/global.json @@ -5,12 +5,12 @@ "dotnet": [ "$(MicrosoftNETCoreApp60Version)", "$(MicrosoftNETCoreApp70Version)", - "$(VSRedistCommonNetCoreSharedFrameworkx6480Version)" + "$(MicrosoftNETCoreApp80Version)" ], "dotnet/x86": [ "$(MicrosoftNETCoreApp60Version)", "$(MicrosoftNETCoreApp70Version)", - "$(VSRedistCommonNetCoreSharedFrameworkx6480Version)" + "$(MicrosoftNETCoreApp80Version)" ] } }, diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/Host/CommandFormatHelpers.cs b/src/Microsoft.Diagnostics.ExtensionCommands/Host/CommandFormatHelpers.cs index b5e765248..836fdb527 100644 --- a/src/Microsoft.Diagnostics.ExtensionCommands/Host/CommandFormatHelpers.cs +++ b/src/Microsoft.Diagnostics.ExtensionCommands/Host/CommandFormatHelpers.cs @@ -32,7 +32,7 @@ namespace Microsoft.Diagnostics.ExtensionCommands command.Console.WriteLine($"{indent} ExceptionRecordAddress: {info.ExceptionRecordAddress:X16}"); command.Console.WriteLine($"{indent} RuntimeBaseAddress: {info.RuntimeBaseAddress:X16}"); - if (info.Version >= SpecialDiagInfoHeader.SPECIAL_DIAGINFO_RUNTIME_BASEADDRESS) + if (info.Version >= SpecialDiagInfoHeader.SPECIAL_DIAGINFO_RUNTIME_BASEADDRESS && info.RuntimeBaseAddress != 0) { IModule runtimeModule = command.Services.GetService().GetModuleFromBaseAddress(info.RuntimeBaseAddress); if (runtimeModule != null) diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index cde7e979b..7b9f3d7ee 100644 --- a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -27,10 +27,6 @@ true false - net8.0 - net7.0 - net6.0 - $(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles sdk.prebuilt @@ -40,10 +36,6 @@ dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json; - dotnet8=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json; - dotnet7=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet7/nuget/v3/index.json; - dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json; - dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json @@ -51,54 +43,58 @@ - - - + - - + - @@ -110,38 +106,41 @@ $(RootBinDir)/Debuggees SOS.StackAndOtherTests - - - - - + + + + + @@ -152,20 +151,21 @@ SOS.WebApp3 - - + @@ -175,6 +175,11 @@ $(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion) $(ScriptRootDir)/lldbhelper.py + net9.0 + net8.0 + net7.0 + net6.0 + false false diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 7ea3d5822..012780602 100644 --- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -29,14 +29,9 @@ false true - false false false - net8.0 - net7.0 - net6.0 - $(WinDir)\Microsoft.Net\Framework64\v4.0.30319\ $(WinDir)\Microsoft.Net\Framework\v4.0.30319\ net462 @@ -50,10 +45,6 @@ dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json; - dotnet8=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json; - dotnet7=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet7/nuget/v3/index.json; - dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json; - dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json @@ -67,54 +58,58 @@ - - - + - - + - - - - + @@ -215,6 +213,11 @@ $(RuntimeFrameworkVersion) $(DotNetRoot)\shared\Microsoft.NETCore.App\$(RuntimeFrameworkVersion) + net9.0 + net8.0 + net7.0 + net6.0 + false false diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt b/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt index d27bd7a78..73ec55e9c 100644 --- a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt +++ b/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt @@ -34,3 +34,4 @@ target_link_libraries(DesktopClrHost ${DESKTOPCLRHOST_LIBRARY}) install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/net6.0) install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/net7.0) install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/net8.0) +install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/net9.0) diff --git a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props b/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props index 4ca5f6c56..88a79b721 100644 --- a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props +++ b/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props @@ -7,7 +7,7 @@ full true false - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs index bee617ec9..4a6c81589 100644 --- a/src/SOS/SOS.UnitTests/SOSRunner.cs +++ b/src/SOS/SOS.UnitTests/SOSRunner.cs @@ -1426,6 +1426,10 @@ public class SOSRunner : IDisposable { defines.Add("MAJOR_RUNTIME_VERSION_GE_8"); } + if (major >= 9) + { + defines.Add("MAJOR_RUNTIME_VERSION_GE_9"); + } } catch (SkipTestException) { diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt index af729446f..26de56b08 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -7,11 +7,6 @@ $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp) - - net8.0 - net7.0 - net6.0 - ProjectK $(RepoRootDir)/src/tests $(RepoRootDir)/eng/AuxMsbuildFiles @@ -23,10 +18,6 @@ dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json; - dotnet8=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json; - dotnet7=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet7/nuget/v3/index.json; - dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json; - dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json @@ -35,19 +26,24 @@ Default (prebuilt) --> - - + + net9.0 + net8.0 + net7.0 + net6.0 + $(DotNetRoot)/dotnet --fx-version $(RuntimeFrameworkVersion) diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt index e184310b0..6eefa3c1a 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -8,11 +8,6 @@ $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp) - - net8.0 - net7.0 - net6.0 - ProjectK $(RepoRootDir)\src\tests $(RepoRootDir)\eng\AuxMsbuildFiles @@ -22,10 +17,6 @@ dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json; - dotnet8=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json; - dotnet7=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet7/nuget/v3/index.json; - dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json; - dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json @@ -34,19 +25,24 @@ Default (prebuilt) --> - - + + net9.0 + net8.0 + net7.0 + net6.0 + $(DotNetRoot)\dotnet.exe --fx-version $(RuntimeFrameworkVersion) diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index c6d5df1da..e8ba9834e 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -7,10 +7,6 @@ $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) - net8.0 - net7.0 - net6.0 - ProjectK $(RepoRootDir)/src/tests/DbgShim.UnitTests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles @@ -22,10 +18,6 @@ dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json; - dotnet8=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json; - dotnet7=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet7/nuget/v3/index.json; - dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json; - dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json @@ -67,44 +59,48 @@ - - - + + --> - - + @@ -116,6 +112,11 @@ $(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion) + net9.0 + net8.0 + net7.0 + net6.0 + @@ -117,6 +113,11 @@ $(DotNetRoot)\shared\Microsoft.NETCore.App\$(RuntimeFrameworkVersion) + net9.0 + net8.0 + net7.0 + net6.0 + $(InstallDir)\dbgshim.dll $(RuntimeModuleDir)\coreclr.dll $(RuntimeModuleDir)\mscordbi.dll diff --git a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props new file mode 100644 index 000000000..99ff5a2ab --- /dev/null +++ b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index fe30b78e0..e69bc2090 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -4,7 +4,8 @@ $(Platform) $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - net6.0;net7.0 + net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 diff --git a/src/tests/EventPipeTracee/EventPipeTracee.csproj b/src/tests/EventPipeTracee/EventPipeTracee.csproj index f61b62ced..ddd9ff2c2 100644 --- a/src/tests/EventPipeTracee/EventPipeTracee.csproj +++ b/src/tests/EventPipeTracee/EventPipeTracee.csproj @@ -2,7 +2,7 @@ Exe $(BuildProjectFramework) - net6.0;net7.0;net8.0 + $(BuildTargetFrameworks) diff --git a/src/tests/ExitCodeTracee/ExitCodeTracee.csproj b/src/tests/ExitCodeTracee/ExitCodeTracee.csproj index b75c5bb4b..03cd2f5e0 100644 --- a/src/tests/ExitCodeTracee/ExitCodeTracee.csproj +++ b/src/tests/ExitCodeTracee/ExitCodeTracee.csproj @@ -2,6 +2,6 @@ Exe $(BuildProjectFramework) - net6.0;net7.0;net8.0 + $(BuildTargetFrameworks) diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs index e5344e074..f79849d23 100644 --- a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs +++ b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs @@ -195,7 +195,7 @@ namespace Microsoft.Diagnostics.NETCore.Client }, circularBufferSizeMB: 256, requestRundown: true, - requestStackwalk: true); + requestStackwalk: false); string nettraceFileName = Path.GetTempFileName(); using (EventPipeSession session = await clientShim.StartEventPipeSession(config)) diff --git a/src/tests/StackTracee/StackTracee.csproj b/src/tests/StackTracee/StackTracee.csproj index b75c5bb4b..03cd2f5e0 100644 --- a/src/tests/StackTracee/StackTracee.csproj +++ b/src/tests/StackTracee/StackTracee.csproj @@ -2,6 +2,6 @@ Exe $(BuildProjectFramework) - net6.0;net7.0;net8.0 + $(BuildTargetFrameworks) diff --git a/src/tests/Tracee/Tracee.csproj b/src/tests/Tracee/Tracee.csproj index b75c5bb4b..03cd2f5e0 100644 --- a/src/tests/Tracee/Tracee.csproj +++ b/src/tests/Tracee/Tracee.csproj @@ -2,6 +2,6 @@ Exe $(BuildProjectFramework) - net6.0;net7.0;net8.0 + $(BuildTargetFrameworks) diff --git a/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj b/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj index 7cdad15af..829054595 100644 --- a/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj +++ b/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0 diff --git a/src/tests/eventpipe/LoaderEvents.cs b/src/tests/eventpipe/LoaderEvents.cs index 7297391a7..c4ad05a39 100644 --- a/src/tests/eventpipe/LoaderEvents.cs +++ b/src/tests/eventpipe/LoaderEvents.cs @@ -60,7 +60,7 @@ namespace EventPipe.UnitTests.LoaderEventsValidation } AssemblyLoad assemblyLoad = new(); - assemblyLoad.LoadFromAssemblyPath(assemblyPath + "\\Microsoft.Diagnostics.Runtime.dll"); + assemblyLoad.LoadFromAssemblyPath(Path.Combine(assemblyPath, "Microsoft.Diagnostics.Runtime.dll")); assemblyLoad.Unload(); } GC.Collect();