зеркало из https://github.com/dotnet/diagnostics.git
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>
This commit is contained in:
Mike McLaughlin
GitHub
Родитель
db70d85adf
Коммит
453e242d6a
|
|
@ -7,8 +7,7 @@
|
|||
<clear />
|
||||
<add key="dotnet9" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json" />
|
||||
<add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
|
||||
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
|
||||
<add key="dotnet8-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
|
||||
<!-- Need this for the old version of System.CommandLine we use -->
|
||||
<add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
|
||||
|
|
|
|||
|
|
@ -1,19 +1,147 @@
|
|||
<Project InitialTargets="OverrideTestingVersions">
|
||||
<Target Name="OverrideTestingVersions">
|
||||
|
||||
<PropertyGroup>
|
||||
<RuntimeVersion60>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net6.0')->Metadata('Runtime'))</RuntimeVersion60>
|
||||
<RuntimeVersion70>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net7.0')->Metadata('Runtime'))</RuntimeVersion70>
|
||||
<RuntimeVersion80>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('Runtime'))</RuntimeVersion80>
|
||||
<RuntimeVersion90>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('Runtime'))</RuntimeVersion90>
|
||||
|
||||
<AspNetVersion60>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net6.0')->Metadata('AspNet'))</AspNetVersion60>
|
||||
<AspNetVersion70>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net7.0')->Metadata('AspNet'))</AspNetVersion70>
|
||||
<AspNetVersion80>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('AspNet'))</AspNetVersion80>
|
||||
<AspNetVersion90>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('AspNet'))</AspNetVersion90>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<KnownFrameworkReference>
|
||||
<TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
<KnownAppHostPack>
|
||||
<AppHostPackVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
<KnownCrossgen2Pack>
|
||||
<Crossgen2PackVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</Crossgen2PackVersion>
|
||||
<!--
|
||||
CrossGen2 Pack
|
||||
-->
|
||||
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
|
||||
<Crossgen2PackVersion>$(RuntimeVersion60)</Crossgen2PackVersion>
|
||||
</KnownCrossgen2Pack>
|
||||
<KnownRuntimePack>
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</LatestRuntimeFrameworkVersion>
|
||||
|
||||
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
|
||||
<Crossgen2PackVersion>$(RuntimeVersion70)</Crossgen2PackVersion>
|
||||
</KnownCrossgen2Pack>
|
||||
|
||||
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
|
||||
<Crossgen2PackVersion>$(RuntimeVersion80)</Crossgen2PackVersion>
|
||||
</KnownCrossgen2Pack>
|
||||
|
||||
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
|
||||
<Crossgen2PackVersion>$(RuntimeVersion90)</Crossgen2PackVersion>
|
||||
</KnownCrossgen2Pack>
|
||||
|
||||
<!--
|
||||
Microsoft.NETCore.App Runtimes
|
||||
-->
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<TargetingPackVersion>$(RuntimeVersion60)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion60)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<TargetingPackVersion>$(RuntimeVersion70)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion70)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<TargetingPackVersion>$(RuntimeVersion80)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion80)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<TargetingPackVersion>$(RuntimeVersion90)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<AppHostPackVersion>$(RuntimeVersion60)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<AppHostPackVersion>$(RuntimeVersion70)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<AppHostPackVersion>$(RuntimeVersion80)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<AppHostPackVersion>$(RuntimeVersion90)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion60)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion70)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion80)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<!--
|
||||
Microsoft.AspNetCore.App Runtimes
|
||||
-->
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<TargetingPackVersion>$(AspNetVersion60)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion60)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<TargetingPackVersion>$(AspNetVersion70)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion70)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<TargetingPackVersion>$(AspNetVersion80)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<TargetingPackVersion>$(AspNetVersion90)</TargetingPackVersion>
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
|
||||
</KnownFrameworkReference>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<AppHostPackVersion>$(AspNetVersion60)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<AppHostPackVersion>$(AspNetVersion70)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<AppHostPackVersion>$(AspNetVersion80)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<AppHostPackVersion>$(AspNetVersion90)</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion60)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net7.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion70)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
|
||||
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
|
||||
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<Project Sdk="Microsoft.Build.NoTargets">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<SkipGetTargetFrameworkProperties>false</SkipGetTargetFrameworkProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(RepositoryEngineeringDir)\InstallRuntimes.proj" />
|
||||
</Project>
|
||||
|
|
@ -1,49 +1,24 @@
|
|||
<!-- All Rights Reserved. Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
|
||||
<Project Sdk="Microsoft.Build.NoTargets">
|
||||
<!--
|
||||
$(BuildArch) - architecture to test (x64, x86, arm, arm64). Defaults to x64.
|
||||
$(PrivateBuildPath) - if non-empty, path to private runtime build to copy/test
|
||||
$(BuildArch) - architecture to test (x64, x86, arm, arm64). Defaults to x64.
|
||||
|
||||
Internal service release testing:
|
||||
From Versions.props:
|
||||
|
||||
$(DotnetRuntimeVersion) - the service release version to test against (fx-version option value) i.e. 2.1.17, 3.1.3 or "default"
|
||||
$(DotnetRuntimeDownloadVersion) - the service release package version i.e. 2.1.17, 3.1.3-servicing.20128.1 or "default"
|
||||
$(RuntimeSourceFeed) - the service release internal blob storage link
|
||||
$(RuntimeSourceFeedKey) - the service release blob feed token
|
||||
|
||||
From Versions.props:
|
||||
$(MicrosoftDotnetSdkInternalVersion) - .NET SDK to use for testing
|
||||
$(InternalReleaseTesting) - if true, internal service release testing
|
||||
@(RuntimeTestVersions) - runtime/aspnetcore versions to install and test against
|
||||
|
||||
$(MicrosoftDotnetSdkInternalVersion) - .NET SDK to use for testing
|
||||
From Arcade:
|
||||
|
||||
$(VSRedistCommonNetCoreSharedFrameworkx6480Version) - latest dotnet runtime package version (the version to install)
|
||||
$(MicrosoftNETCoreAppRuntimewinx64Version) - latest dotnet runtime stable version (the version that actually is installed)
|
||||
|
||||
$(MicrosoftAspNetCoreAppRefInternalVersion) - latest dotnet aspnetcore package version (the version to install)
|
||||
$(MicrosoftAspNetCoreAppRefVersion) - latest dotnet aspnetcore stable version (the version that actually is installed)
|
||||
|
||||
$(MicrosoftNETCoreApp70Version) $(MicrosoftAspNetCoreApp70Version) - 7.0 version
|
||||
$(MicrosoftNETCoreApp60Version) $(MicrosoftAspNetCoreApp60Version) - 6.0 version
|
||||
|
||||
$(SingleFileRuntimeLatestVersion) - The latest version of the runtime used to build single-file apps
|
||||
$(SingleFileRuntime70Version) - The 7.0.x version of the runtime used to build single-file apps
|
||||
$(SingleFileRuntime60Version) - The 6.0.x version of the runtime used to build single-file apps
|
||||
|
||||
From Arcade:
|
||||
|
||||
$(RepoRoot) - the root of the diagnostics repo
|
||||
$(RepositoryEngineeringDir) - the "eng" directory
|
||||
$(VersionsPropsPath) - path of Versions.props
|
||||
$(RepoRoot) - the root of the diagnostics repo
|
||||
$(RepositoryEngineeringDir) - the "eng" directory
|
||||
$(VersionsPropsPath) - path of Versions.props
|
||||
-->
|
||||
|
||||
<PropertyGroup>
|
||||
<BuildArch Condition="'$(BuildArch)' == ''">$(Platform)</BuildArch>
|
||||
<BuildArch Condition="'$(BuildArch)' == 'AnyCpu'">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</BuildArch>
|
||||
<PrivateBuildTesting>false</PrivateBuildTesting>
|
||||
<PrivateBuildTesting Condition="'$(PrivateBuildPath)' != ''">true</PrivateBuildTesting>
|
||||
<DotnetRuntimeVersion Condition="'$(DotnetRuntimeVersion)' == ''">default</DotnetRuntimeVersion>
|
||||
<InternalReleaseTesting>false</InternalReleaseTesting>
|
||||
<InternalReleaseTesting Condition="'$(DotnetRuntimeVersion)' != 'default'">true</InternalReleaseTesting>
|
||||
<ExtraInstallArgs>-runtimesourcefeed '$(RuntimeSourceFeed)' -runtimesourcefeedkey '$(RuntimeSourceFeedKey)'</ExtraInstallArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(BuildArch)' != 'x86'">
|
||||
|
|
@ -79,32 +54,12 @@
|
|||
</Otherwise>
|
||||
</Choose>
|
||||
|
||||
<ItemGroup Condition="!$(InternalReleaseTesting) and !$(PrivateBuildTesting)">
|
||||
<TestVersions Include="Latest" RuntimeVersion="$(VSRedistCommonNetCoreSharedFrameworkx6480Version)" AspNetVersion="$(MicrosoftAspNetCoreAppRefInternalVersion)" />
|
||||
<TestVersions Include="SingleFileLatest" RuntimeVersion="$(SingleFileRuntimeLatestVersion)" />
|
||||
<TestVersions Include="70" RuntimeVersion="$(MicrosoftNETCoreApp70Version)" AspNetVersion="$(MicrosoftAspNetCoreApp70Version)" />
|
||||
<TestVersions Include="SingleFile70" RuntimeVersion="$(SingleFileRuntime70Version)" />
|
||||
<TestVersions Include="60" RuntimeVersion="$(MicrosoftNETCoreApp60Version)" AspNetVersion="$(MicrosoftAspNetCoreApp60Version)" />
|
||||
<TestVersions Include="SingleFile60" RuntimeVersion="$(SingleFileRuntime60Version)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Local private build testing -->
|
||||
<ItemGroup Condition="$(PrivateBuildTesting)">
|
||||
<TestVersions Include="Latest" RuntimeVersion="$(VSRedistCommonNetCoreSharedFrameworkx6480Version)" AspNetVersion="$(MicrosoftAspNetCoreAppRefInternalVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Internal service release testing -->
|
||||
<ItemGroup Condition="$(InternalReleaseTesting)">
|
||||
<TestVersions Include="Internal" RuntimeVersion="$(DotnetRuntimeDownloadVersion)" ExtraInstallArgs="$(ExtraInstallArgs)" Condition="'$(DotnetRuntimeDownloadVersion)' != 'default'"/>
|
||||
<TestVersions Include="Internal" RuntimeVersion="$(DotnetRuntimeVersion)" ExtraInstallArgs="$(ExtraInstallArgs)" Condition="'$(DotnetRuntimeDownloadVersion)' == 'default'"/>
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
Installs the runtimes for the SOS tests, handles private runtime build support or cleans up the private build registry keys
|
||||
-->
|
||||
|
||||
<Target Name="InstallTestRuntimes"
|
||||
DependsOnTargets="CleanupVersionManifest;InstallRuntimesWindows;InstallRuntimesUnix;CopyPrivateBuild;WriteTestVersionManifest;" />
|
||||
DependsOnTargets="CleanupVersionManifest;InstallRuntimesWindows;InstallRuntimesUnix;WriteTestVersionManifest;" />
|
||||
|
||||
<!--
|
||||
Installs the test runtimes on Windows
|
||||
|
|
@ -117,11 +72,11 @@
|
|||
<Exec Command="$(PowershellWrapper) "& { &$(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkInternalVersion) }""
|
||||
IgnoreStandardErrorWarningFormat="true" />
|
||||
|
||||
<Exec Command="$(PowershellWrapper) "& { &$(DotnetInstallScriptCmd) $(CommonInstallArgs) %(TestVersions.ExtraInstallArgs) -Version %(TestVersions.RuntimeVersion) -Runtime dotnet }""
|
||||
IgnoreStandardErrorWarningFormat="true" Condition="'%(TestVersions.RuntimeVersion)' != ''" />
|
||||
<Exec Command="$(PowershellWrapper) "& { &$(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.RuntimeDownload) -Runtime dotnet }""
|
||||
IgnoreStandardErrorWarningFormat="true" Condition="'%(RuntimeTestVersions.RuntimeDownload)' != ''" />
|
||||
|
||||
<Exec Command="$(PowershellWrapper) "& { &$(DotnetInstallScriptCmd) $(CommonInstallArgs) %(TestVersions.ExtraInstallArgs) -Version %(TestVersions.AspNetVersion) -Runtime aspnetcore }""
|
||||
IgnoreStandardErrorWarningFormat="true" Condition="'%(TestVersions.AspNetVersion)' != ''" />
|
||||
<Exec Command="$(PowershellWrapper) "& { &$(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.AspNetDownload) -Runtime aspnetcore }""
|
||||
IgnoreStandardErrorWarningFormat="true" Condition="'%(RuntimeTestVersions.AspNetDownload)' != ''" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
|
|
@ -135,13 +90,13 @@
|
|||
<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkInternalVersion)"
|
||||
IgnoreStandardErrorWarningFormat="true" />
|
||||
|
||||
<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) %(TestVersions.ExtraInstallArgs) -Version %(TestVersions.RuntimeVersion) -Runtime dotnet"
|
||||
<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.RuntimeDownload) -Runtime dotnet"
|
||||
IgnoreStandardErrorWarningFormat="true"
|
||||
Condition="'%(TestVersions.RuntimeVersion)' != ''" />
|
||||
Condition="'%(RuntimeTestVersions.RuntimeDownload)' != ''" />
|
||||
|
||||
<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) %(TestVersions.ExtraInstallArgs) -Version %(TestVersions.AspNetVersion) -Runtime aspnetcore"
|
||||
<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.AspNetDownload) -Runtime aspnetcore"
|
||||
IgnoreStandardErrorWarningFormat="true"
|
||||
Condition="'%(TestVersions.AspNetVersion)' != ''" />
|
||||
Condition="'%(RuntimeTestVersions.AspNetDownload)' != ''" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
|
|
@ -152,44 +107,33 @@
|
|||
Inputs="$(VersionsPropsPath)"
|
||||
Outputs="$(TestConfigFileName)">
|
||||
|
||||
<PropertyGroup Condition="'$(PrivateBuildTesting)' != 'true' AND '$(InternalReleaseTesting)' != 'true'">
|
||||
<RuntimeVersion60>$(MicrosoftNETCoreApp60Version)</RuntimeVersion60>
|
||||
<AspNetCoreVersion60>$(MicrosoftAspNetCoreApp60Version)</AspNetCoreVersion60>
|
||||
<RuntimeVersion70>$(MicrosoftNETCoreApp70Version)</RuntimeVersion70>
|
||||
<AspNetCoreVersion70>$(MicrosoftAspNetCoreApp70Version)</AspNetCoreVersion70>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<RuntimeVersionLatest>$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimeVersionLatest>
|
||||
<RuntimeVersionLatest Condition="$(InternalReleaseTesting)">$(DotnetRuntimeVersion)</RuntimeVersionLatest>
|
||||
<AspNetCoreVersionLatest>$(MicrosoftAspNetCoreAppRefVersion)</AspNetCoreVersionLatest>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<TestConfigFileLines>
|
||||
<ItemGroup>
|
||||
<TestConfigFileLines Include="Header">
|
||||
<ConfigFileEntry>
|
||||
<![CDATA[
|
||||
<Configuration>
|
||||
<PrivateBuildTesting>$(PrivateBuildTesting)</PrivateBuildTesting>
|
||||
<InternalReleaseTesting>$(InternalReleaseTesting)</InternalReleaseTesting>
|
||||
|
||||
<RuntimeVersion60>$(RuntimeVersion60)</RuntimeVersion60>
|
||||
<AspNetCoreVersion60>$(AspNetCoreVersion60)</AspNetCoreVersion60>
|
||||
|
||||
<RuntimeVersion70>$(RuntimeVersion70)</RuntimeVersion70>
|
||||
<AspNetCoreVersion70>$(AspNetCoreVersion70)</AspNetCoreVersion70>
|
||||
|
||||
<RuntimeVersionLatest>$(RuntimeVersionLatest)</RuntimeVersionLatest>
|
||||
<AspNetCoreVersionLatest>$(AspNetCoreVersionLatest)</AspNetCoreVersionLatest>
|
||||
|
||||
<SingleFileRuntimeLatestVersion>$(SingleFileRuntimeLatestVersion)</SingleFileRuntimeLatestVersion>
|
||||
<SingleFileRuntime60Version>$(SingleFileRuntime60Version)</SingleFileRuntime60Version>
|
||||
<SingleFileRuntime70Version>$(SingleFileRuntime70Version)</SingleFileRuntime70Version>
|
||||
]]>
|
||||
</ConfigFileEntry>
|
||||
</TestConfigFileLines>
|
||||
<TestConfigFileLines Include="@(RuntimeTestVersions)">
|
||||
<ConfigFileEntry>
|
||||
<![CDATA[
|
||||
<RuntimeVersion%(RuntimeTestVersions.Identity)>%(RuntimeTestVersions.Runtime)</RuntimeVersion%(RuntimeTestVersions.Identity)>
|
||||
<AspNetCoreVersion%(RuntimeTestVersions.Identity)>%(RuntimeTestVersions.AspNet)</AspNetCoreVersion%(RuntimeTestVersions.Identity)>
|
||||
]]>
|
||||
</ConfigFileEntry>
|
||||
</TestConfigFileLines>
|
||||
<TestConfigFileLines Include="End">
|
||||
<ConfigFileEntry>
|
||||
<![CDATA[
|
||||
</Configuration>
|
||||
]]>
|
||||
</ConfigFileEntry>
|
||||
</TestConfigFileLines>
|
||||
</PropertyGroup>
|
||||
|
||||
<WriteLinesToFile File="$(TestConfigFileName)" Lines="$(TestConfigFileLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<WriteLinesToFile File="$(TestConfigFileName)" Lines="@(TestConfigFileLines->Metadata('ConfigFileEntry'))" Overwrite="true" WriteOnlyWhenDifferent="true" />
|
||||
|
||||
<Message Importance="High" Text="Created config file $(TestConfigFileName)" />
|
||||
|
||||
|
|
@ -203,102 +147,10 @@
|
|||
-->
|
||||
|
||||
<Target Name="CleanupVersionManifest"
|
||||
Condition="$(InternalReleaseTesting) or $(PrivateBuildTesting)">
|
||||
Condition="$(InternalReleaseTesting)">
|
||||
|
||||
<!-- Make sure the config file gets regenerated in the WriteTestVersionManifest target -->
|
||||
<Delete Files="$(TestConfigFileName)" />
|
||||
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Copies the private runtime build binaries and on Windows adds registry keys
|
||||
-->
|
||||
|
||||
<Target Name="CopyPrivateBuild"
|
||||
Condition="'$(PrivateBuildPath)' != ''"
|
||||
DependsOnTargets="ModifyRegistry">
|
||||
|
||||
<ItemGroup>
|
||||
<PrivateBuildFiles Include="$(PrivateBuildPath)\*" />
|
||||
</ItemGroup>
|
||||
|
||||
<Message Importance="High" Text="Copying private build binaries from $(PrivateBuildPath) to $(DotNetInstallDir.Replace('\\', '\'))" />
|
||||
|
||||
<Copy SourceFiles="@(PrivateBuildFiles)" DestinationFolder="$(DotNetInstallDir.Replace('\\', '\'))" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Removes the private build registry keys
|
||||
-->
|
||||
|
||||
<Target Name="CleanupPrivateBuild"
|
||||
Condition="Exists($(RemoveRegeditFileName))">
|
||||
|
||||
<Exec Command="$(RegeditCommand) $(RemoveRegeditFileName)" />
|
||||
<!--
|
||||
Delete only the AddRegeditFileName so the target ModifyRegistry will run on next
|
||||
build. Leaving the remove reg key file so this target can be run multiple times.
|
||||
-->
|
||||
<Delete Files="$(AddRegeditFileName)" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
On Windows adds the registry keys to allow the unsigned private build DAC to generate dumps
|
||||
-->
|
||||
|
||||
<Target Name="ModifyRegistry"
|
||||
Condition="$([MSBuild]::IsOsPlatform(Windows))"
|
||||
DependsOnTargets="CreateRemoveRegFile"
|
||||
Inputs="$(VersionsPropsPath)"
|
||||
Outputs="$(AddRegeditFileName)">
|
||||
|
||||
<PropertyGroup>
|
||||
<AddRegeditFileLines>
|
||||
<![CDATA[
|
||||
Windows Registry Editor Version 5.00
|
||||
|
||||
[$(RegistryRoot)\Microsoft\Windows NT\CurrentVersion\KnownManagedDebuggingDlls]
|
||||
"$(DotNetInstallDir)mscordaccore.dll"=dword:0
|
||||
|
||||
[$(RegistryRoot)\Microsoft\Windows NT\CurrentVersion\MiniDumpAuxiliaryDlls]
|
||||
"$(DotNetInstallDir)coreclr.dll"="$(DotNetInstallDir)mscordaccore.dll"
|
||||
]]>
|
||||
</AddRegeditFileLines>
|
||||
</PropertyGroup>
|
||||
|
||||
<WriteLinesToFile File="$(AddRegeditFileName)" Lines="$(AddRegeditFileLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
|
||||
|
||||
<ItemGroup>
|
||||
<FileWrites Include="$(AddRegeditFileName)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Exec Command="$(RegeditCommand) $(AddRegeditFileName)" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Creates the reg file to remove the registry keys added in ModifyRegistry
|
||||
-->
|
||||
|
||||
<Target Name="CreateRemoveRegFile">
|
||||
<PropertyGroup>
|
||||
<RemoveRegeditFileLines>
|
||||
<![CDATA[
|
||||
Windows Registry Editor Version 5.00
|
||||
|
||||
[$(RegistryRoot)\Microsoft\Windows NT\CurrentVersion\KnownManagedDebuggingDlls]
|
||||
"$(DotNetInstallDir)mscordaccore.dll"=-
|
||||
|
||||
[$(RegistryRoot)\Microsoft\Windows NT\CurrentVersion\MiniDumpAuxiliaryDlls]
|
||||
"$(DotNetInstallDir)coreclr.dll"=-
|
||||
]]>
|
||||
</RemoveRegeditFileLines>
|
||||
</PropertyGroup>
|
||||
|
||||
<WriteLinesToFile File="$(RemoveRegeditFileName)" Lines="$(RemoveRegeditFileLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
|
||||
|
||||
<ItemGroup>
|
||||
<FileWrites Include="$(RemoveRegeditFileName)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -97,4 +97,83 @@
|
|||
<MicrosoftCodeAnalysisVersion>4.8.0-2.23422.14</MicrosoftCodeAnalysisVersion>
|
||||
<MicrosoftNetCompilersToolsetVersion>4.8.0-2.23422.14</MicrosoftNetCompilersToolsetVersion>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
SOS test runtime versions
|
||||
|
||||
Internal service release testing:
|
||||
|
||||
$(DotnetRuntimeVersion) - the service release version to test against (fx-version option value) i.e. 2.1.17, 3.1.3 or "default"
|
||||
$(DotnetRuntimeDownloadVersion) - the service release package version i.e. 2.1.17, 3.1.3-servicing.20128.1 or "default"
|
||||
$(RuntimeSourceFeed) - the service release internal blob storage link
|
||||
$(RuntimeSourceFeedKey) - the service release blob feed token
|
||||
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftNETCoreApp80Version>8.0.2</MicrosoftNETCoreApp80Version>
|
||||
<MicrosoftNETCoreApp70Version>7.0.16</MicrosoftNETCoreApp70Version>
|
||||
<MicrosoftNETCoreApp60Version>6.0.27</MicrosoftNETCoreApp60Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DotnetRuntimeVersion Condition="'$(DotnetRuntimeVersion)' == ''">default</DotnetRuntimeVersion>
|
||||
<InternalReleaseTesting>false</InternalReleaseTesting>
|
||||
<InternalReleaseTesting Condition="'$(DotnetRuntimeVersion)' != 'default'">true</InternalReleaseTesting>
|
||||
<ExtraInstallArgs>-runtimesourcefeed '$(RuntimeSourceFeed)' -runtimesourcefeedkey '$(RuntimeSourceFeedKey)'</ExtraInstallArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="!$(InternalReleaseTesting)">
|
||||
<RuntimeTestVersions Include="Latest">
|
||||
<!--
|
||||
<RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx6490Version)</RuntimeDownload>
|
||||
<Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
|
||||
<AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
|
||||
<AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
|
||||
-->
|
||||
<RuntimeDownload>9.0.0-preview.3.24160.3</RuntimeDownload>
|
||||
<Runtime>9.0.0-preview.3.24160.3</Runtime>
|
||||
<AspNetDownload>9.0.0-preview.3.24158.2</AspNetDownload>
|
||||
<AspNet>9.0.0-preview.3.24158.2</AspNet>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
</RuntimeTestVersions>
|
||||
|
||||
<RuntimeTestVersions Include="Servicing1">
|
||||
<RuntimeDownload>$(MicrosoftNETCoreApp80Version)</RuntimeDownload>
|
||||
<Runtime>$(MicrosoftNETCoreApp80Version)</Runtime>
|
||||
<AspNetDownload>$(MicrosoftNETCoreApp80Version)</AspNetDownload>
|
||||
<AspNet>$(MicrosoftNETCoreApp80Version)</AspNet>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
</RuntimeTestVersions>
|
||||
|
||||
<RuntimeTestVersions Include="Servicing2">
|
||||
<RuntimeDownload>$(MicrosoftNETCoreApp70Version)</RuntimeDownload>
|
||||
<Runtime>$(MicrosoftNETCoreApp70Version)</Runtime>
|
||||
<AspNetDownload>$(MicrosoftNETCoreApp70Version)</AspNetDownload>
|
||||
<AspNet>$(MicrosoftNETCoreApp70Version)</AspNet>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
</RuntimeTestVersions>
|
||||
|
||||
<RuntimeTestVersions Include="Servicing3">
|
||||
<RuntimeDownload>$(MicrosoftNETCoreApp60Version)</RuntimeDownload>
|
||||
<Runtime>$(MicrosoftNETCoreApp60Version)</Runtime>
|
||||
<AspNetDownload>$(MicrosoftNETCoreApp60Version)</AspNetDownload>
|
||||
<AspNet>$(MicrosoftNETCoreApp60Version)</AspNet>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
</RuntimeTestVersions>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Internal service release testing -->
|
||||
<ItemGroup Condition="$(InternalReleaseTesting)">
|
||||
<RuntimeTestVersions Include="Latest" Condition="'$(DotnetRuntimeDownloadVersion)' != 'default'" >
|
||||
<RuntimeDownload>$(DotnetRuntimeDownloadVersion)</RuntimeDownload>
|
||||
<Runtime>$(DotnetRuntimeDownloadVersion)</Runtime>
|
||||
<ExtraInstallArgs>$(ExtraInstallArgs)</ExtraInstallArgs>
|
||||
</RuntimeTestVersions>
|
||||
|
||||
<RuntimeTestVersions Include="Latest" Condition="'$(DotnetRuntimeDownloadVersion)' == 'default'" >
|
||||
<RuntimeDownload>$(DotnetRuntimeVersion)</RuntimeDownload>
|
||||
<Runtime>$(DotnetRuntimeVersion)</Runtime>
|
||||
<ExtraInstallArgs>$(ExtraInstallArgs)</ExtraInstallArgs>
|
||||
</RuntimeTestVersions>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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" `
|
||||
|
|
|
|||
|
|
@ -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" \
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
"dotnet": [
|
||||
"$(MicrosoftNETCoreApp60Version)",
|
||||
"$(MicrosoftNETCoreApp70Version)",
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx6480Version)"
|
||||
"$(MicrosoftNETCoreApp80Version)"
|
||||
],
|
||||
"dotnet/x86": [
|
||||
"$(MicrosoftNETCoreApp60Version)",
|
||||
"$(MicrosoftNETCoreApp70Version)",
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx6480Version)"
|
||||
"$(MicrosoftNETCoreApp80Version)"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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<IModuleService>().GetModuleFromBaseAddress(info.RuntimeBaseAddress);
|
||||
if (runtimeModule != null)
|
||||
|
|
|
|||
|
|
@ -27,10 +27,6 @@
|
|||
<TestWebApp3>true</TestWebApp3>
|
||||
<TestWebApp3 Condition="'$(InternalReleaseTesting)' == 'true'">false</TestWebApp3>
|
||||
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '8')">net8.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
|
||||
|
||||
<DebuggeeSourceRoot>$(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees</DebuggeeSourceRoot>
|
||||
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
|
||||
<DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
|
||||
|
|
@ -40,10 +36,6 @@
|
|||
|
||||
<NuGetPackageFeeds>
|
||||
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
|
||||
</NuGetPackageFeeds>
|
||||
|
||||
|
|
@ -51,54 +43,58 @@
|
|||
<!--
|
||||
Single file (debuggees cli built)
|
||||
-->
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime70Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime70Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime60Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime60Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<!--
|
||||
Default (prebuilt)
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<!--
|
||||
SOS.TestExtensions
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<TestName>SOS.TestExtensions</TestName>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
<DotNetDiagnosticExtensions>$(RootBinDir)/bin/TestExtension/$(TargetConfiguration)/netstandard2.0/TestExtension.dll</DotNetDiagnosticExtensions>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
|
|
@ -110,38 +106,41 @@
|
|||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees</DebuggeeBuildRoot>
|
||||
<TestName>SOS.StackAndOtherTests</TestName>
|
||||
<Options>
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime70Version)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime70Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime60Version)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime60Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
</Option>
|
||||
|
|
@ -152,20 +151,21 @@
|
|||
<TestName>SOS.WebApp3</TestName>
|
||||
<Options>
|
||||
<Option Condition="'$(AspNetCoreVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
<!-- This turns off the -fx-version to the dotnet host allowing it use the correct runtime version -->
|
||||
<SetFxVersion>false</SetFxVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersion70)</FrameworkVersion>
|
||||
<Option Condition="'$(AspNetCoreVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersionServicing1)</FrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersion60)</FrameworkVersion>
|
||||
<Option Condition="'$(AspNetCoreVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersionServicing2)</FrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersionServicing3)</FrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
</Option>
|
||||
|
|
@ -175,6 +175,11 @@
|
|||
<RuntimeSymbolsPath>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</RuntimeSymbolsPath>
|
||||
<LLDBHelperScript>$(ScriptRootDir)/lldbhelper.py</LLDBHelperScript>
|
||||
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '9')">net9.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '8')">net8.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '7')">net7.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '6')">net6.0</BuildProjectFramework>
|
||||
|
||||
<!-- Single-file debuggees don't need the host -->
|
||||
<SetHostExe Condition="'$(PublishSingleFile)' == 'true'">false</SetHostExe>
|
||||
<SetFxVersion Condition="'$(PublishSingleFile)' == 'true'">false</SetFxVersion>
|
||||
|
|
|
|||
|
|
@ -29,14 +29,9 @@
|
|||
<TestWebApp3 Condition="'$(InternalReleaseTesting)' == 'true'">false</TestWebApp3>
|
||||
|
||||
<TestDesktop>true</TestDesktop>
|
||||
<TestDesktop Condition="'$(PrivateBuildTesting)' == 'true'">false</TestDesktop>
|
||||
<TestDesktop Condition="'$(InternalReleaseTesting)' == 'true'">false</TestDesktop>
|
||||
<TestDesktop Condition="'$(TargetArchitecture)' == 'arm64'">false</TestDesktop>
|
||||
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '8')">net8.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
|
||||
|
||||
<DesktopFrameworkPath Condition="$(TargetArchitecture) == x64">$(WinDir)\Microsoft.Net\Framework64\v4.0.30319\</DesktopFrameworkPath>
|
||||
<DesktopFrameworkPath Condition="$(TargetArchitecture) != x64">$(WinDir)\Microsoft.Net\Framework\v4.0.30319\</DesktopFrameworkPath>
|
||||
<DesktopFramework>net462</DesktopFramework>
|
||||
|
|
@ -50,10 +45,6 @@
|
|||
|
||||
<NuGetPackageFeeds>
|
||||
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
|
||||
</NuGetPackageFeeds>
|
||||
|
||||
|
|
@ -67,54 +58,58 @@
|
|||
<!--
|
||||
Single file (debuggees cli built)
|
||||
-->
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime70Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime70Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime60Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime60Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<!--
|
||||
Default (prebuilt)
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<!--
|
||||
SOS.TestExtensions
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<TestName>SOS.TestExtensions</TestName>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
<DotNetDiagnosticExtensions>$(RootBinDir)\bin\TestExtension\$(TargetConfiguration)\netstandard2.0\TestExtension.dll</DotNetDiagnosticExtensions>
|
||||
<Options>
|
||||
<Option>
|
||||
|
|
@ -133,38 +128,41 @@
|
|||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
|
||||
<TestName>SOS.StackAndOtherTests</TestName>
|
||||
<Options>
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime70Version)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime70Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime60Version)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime60Version)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
</Option>
|
||||
|
|
@ -184,29 +182,29 @@
|
|||
</Option>
|
||||
</Options>
|
||||
<Options>
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<Option Condition="'$(RuntimeLatestVersion)' != ''">
|
||||
<DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
<!-- This turns off the -fx-version to the dotnet host allowing it use the correct runtime version -->
|
||||
<SetFxVersion>false</SetFxVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersion70)</FrameworkVersion>
|
||||
<Option Condition="'$(AspNetCoreVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersionServicing1)</FrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersion60)</FrameworkVersion>
|
||||
<Option Condition="'$(AspNetCoreVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersionServicing2)</FrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(AspNetCoreVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
<FrameworkVersion>$(AspNetCoreVersionServicing3)</FrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
</Option>
|
||||
|
|
@ -215,6 +213,11 @@
|
|||
<FrameworkVersion Condition="'$(FrameworkVersion)' == ''">$(RuntimeFrameworkVersion)</FrameworkVersion>
|
||||
<RuntimeSymbolsPath>$(DotNetRoot)\shared\Microsoft.NETCore.App\$(RuntimeFrameworkVersion)</RuntimeSymbolsPath>
|
||||
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '9')">net9.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '8')">net8.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '7')">net7.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '6')">net6.0</BuildProjectFramework>
|
||||
|
||||
<!-- Single-file debuggees don't need the host -->
|
||||
<SetHostExe Condition="'$(PublishSingleFile)' == 'true'">false</SetHostExe>
|
||||
<SetFxVersion Condition="'$(PublishSingleFile)' == 'true'">false</SetFxVersion>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<DebugType Condition="'$(TargetFramework)' == 'net462'">full</DebugType>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Optimize>false</Optimize>
|
||||
<BuildTargetFrameworks>net6.0;net7.0;net8.0</BuildTargetFrameworks>
|
||||
<BuildTargetFrameworks>net6.0;net7.0;net8.0;net9.0</BuildTargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,11 +7,6 @@
|
|||
<InstallDir>$(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
|
||||
<LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp)</LogDir>
|
||||
|
||||
<!-- Build the debuggee for this framework version but run it on latest -->
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '8')">net8.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
|
||||
|
||||
<TestProduct>ProjectK</TestProduct>
|
||||
<DebuggeeSourceRoot>$(RepoRootDir)/src/tests</DebuggeeSourceRoot>
|
||||
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
|
||||
|
|
@ -23,10 +18,6 @@
|
|||
|
||||
<NuGetPackageFeeds>
|
||||
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
|
||||
</NuGetPackageFeeds>
|
||||
|
||||
|
|
@ -35,19 +26,24 @@
|
|||
Default (prebuilt)
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '9')">net9.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '8')">net8.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '7')">net7.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '6')">net6.0</BuildProjectFramework>
|
||||
|
||||
<!-- Single-file debuggees don't need the host -->
|
||||
<HostExe Condition="'$(PublishSingleFile)' != 'true'">$(DotNetRoot)/dotnet</HostExe>
|
||||
<HostArgs Condition="'$(PublishSingleFile)' != 'true'">--fx-version $(RuntimeFrameworkVersion)</HostArgs>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,6 @@
|
|||
<InstallDir>$(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
|
||||
<LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp)</LogDir>
|
||||
|
||||
<!-- Build the debuggee for this framework version but run it on latest -->
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '8')">net8.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
|
||||
|
||||
<TestProduct>ProjectK</TestProduct>
|
||||
<DebuggeeSourceRoot>$(RepoRootDir)\src\tests</DebuggeeSourceRoot>
|
||||
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
|
||||
|
|
@ -22,10 +17,6 @@
|
|||
|
||||
<NuGetPackageFeeds>
|
||||
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
|
||||
</NuGetPackageFeeds>
|
||||
|
||||
|
|
@ -34,19 +25,24 @@
|
|||
Default (prebuilt)
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '9')">net9.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '8')">net8.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '7')">net7.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '6')">net6.0</BuildProjectFramework>
|
||||
|
||||
<!-- Single-file debuggees don't need the host -->
|
||||
<HostExe Condition="'$(PublishSingleFile)' != 'true'">$(DotNetRoot)\dotnet.exe</HostExe>
|
||||
<HostArgs Condition="'$(PublishSingleFile)' != 'true'">--fx-version $(RuntimeFrameworkVersion)</HostArgs>
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@
|
|||
<InstallDir>$(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
|
||||
<LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp)</LogDir>
|
||||
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '8')">net8.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
|
||||
|
||||
<TestProduct>ProjectK</TestProduct>
|
||||
<DebuggeeSourceRoot>$(RepoRootDir)/src/tests/DbgShim.UnitTests/Debuggees</DebuggeeSourceRoot>
|
||||
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
|
||||
|
|
@ -22,10 +18,6 @@
|
|||
|
||||
<NuGetPackageFeeds>
|
||||
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
|
||||
</NuGetPackageFeeds>
|
||||
|
||||
|
|
@ -67,44 +59,48 @@
|
|||
<!--
|
||||
Single file
|
||||
-->
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime70Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime70Version)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime60Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime60Version)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees/SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<!--
|
||||
Default
|
||||
-->
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)/Debuggees</DebuggeeBuildRoot>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
</Option>
|
||||
|
|
@ -116,6 +112,11 @@
|
|||
|
||||
<RuntimeModuleDir>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</RuntimeModuleDir>
|
||||
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '9')">net9.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '8')">net8.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '7')">net7.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '6')">net6.0</BuildProjectFramework>
|
||||
|
||||
<Options>
|
||||
<Option Condition="'$(OS)' == 'linux'">
|
||||
<DbgShimPath>$(InstallDir)/libdbgshim.so</DbgShimPath>
|
||||
|
|
|
|||
|
|
@ -8,10 +8,6 @@
|
|||
<InstallDir>$(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
|
||||
<LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp)</LogDir>
|
||||
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '8')">net8.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
|
||||
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
|
||||
|
||||
<TestProduct>ProjectK</TestProduct>
|
||||
<DebuggeeSourceRoot>$(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees</DebuggeeSourceRoot>
|
||||
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
|
||||
|
|
@ -22,10 +18,6 @@
|
|||
|
||||
<NuGetPackageFeeds>
|
||||
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
|
||||
</NuGetPackageFeeds>
|
||||
|
||||
|
|
@ -66,46 +58,50 @@
|
|||
<Option>
|
||||
<Options>
|
||||
<!--
|
||||
Single file
|
||||
Single file (debuggees cli built)
|
||||
-->
|
||||
<Option Condition="'$(SingleFileRuntimeLatestVersion)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntimeLatestVersion)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime70Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime70Version)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(SingleFileRuntime60Version)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(SingleFileRuntime60Version)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees\SingleFile</DebuggeeBuildRoot>
|
||||
<PublishSingleFile>true</PublishSingleFile>
|
||||
<BuildProjectRuntime>$(TargetRid)</BuildProjectRuntime>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<!--
|
||||
Default
|
||||
Default (debuggees cli built)
|
||||
-->
|
||||
<Option Condition="'$(RuntimeVersionLatest)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion70)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing1)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net7.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion70)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing1)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersion60)' != ''">
|
||||
<Option Condition="'$(RuntimeVersionServicing2)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
|
||||
<BuildProjectFramework>net6.0</BuildProjectFramework>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing2)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
<Option Condition="'$(RuntimeVersionServicing3)' != ''">
|
||||
<DebuggeeBuildRoot>$(RootBinDir)\Debuggees</DebuggeeBuildRoot>
|
||||
<RuntimeFrameworkVersion>$(RuntimeVersionServicing3)</RuntimeFrameworkVersion>
|
||||
</Option>
|
||||
</Options>
|
||||
</Option>
|
||||
|
|
@ -117,6 +113,11 @@
|
|||
|
||||
<RuntimeModuleDir>$(DotNetRoot)\shared\Microsoft.NETCore.App\$(RuntimeFrameworkVersion)</RuntimeModuleDir>
|
||||
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '9')">net9.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '8')">net8.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '7')">net7.0</BuildProjectFramework>
|
||||
<BuildProjectFramework Condition="StartsWith('$(RuntimeFrameworkVersion)', '6')">net6.0</BuildProjectFramework>
|
||||
|
||||
<DbgShimPath>$(InstallDir)\dbgshim.dll</DbgShimPath>
|
||||
<RuntimeModulePath Condition="'$(RuntimeModuleDir)' != ''">$(RuntimeModuleDir)\coreclr.dll</RuntimeModulePath>
|
||||
<DbiModulePath Condition="'$(RuntimeModuleDir)' != ''">$(RuntimeModuleDir)\mscordbi.dll</DbiModulePath>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
<Project>
|
||||
<Import Project="$(MSBuildThisFileDirectory)..\..\Directory.Build.props"/>
|
||||
<Import Project="$(RepoRoot)eng/AuxMsbuildFiles/SdkPackOverrides.targets"/>
|
||||
</Project>
|
||||
|
|
@ -4,7 +4,8 @@
|
|||
<PropertyGroup>
|
||||
<BuildArch Condition="'$(BuildArch)' == ''">$(Platform)</BuildArch>
|
||||
<BuildArch Condition="'$(BuildArch)' == 'AnyCpu'">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</BuildArch>
|
||||
<UnitTestTargetFrameworks>net6.0;net7.0</UnitTestTargetFrameworks>
|
||||
<UnitTestTargetFrameworks>net6.0;net7.0;net8.0</UnitTestTargetFrameworks>
|
||||
<BuildTargetFrameworks>net6.0;net7.0;net8.0;net9.0</BuildTargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">net6.0;net7.0;net8.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">net6.0;net7.0;net8.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">net6.0;net7.0;net8.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">net6.0;net7.0;net8.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0</TargetFrameworks>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче