Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions eng/AuxMsbuildFiles/SdkPackOverrides.targets
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
<KnownRuntimePack>
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

<KnownFrameworkReference>
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'netcoreapp3.1'">$(MicrosoftNETCoreApp31Version)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>
<KnownAppHostPack>
<AppHostPackVersion Condition="'%(TargetFramework)' == 'netcoreapp3.1'">$(MicrosoftNETCoreApp31Version)</AppHostPackVersion>
</KnownAppHostPack>
</ItemGroup>
</Target>
</Project>
9 changes: 5 additions & 4 deletions eng/Build-Native.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ if /i %__BuildCrossArch% EQU 1 (

echo Generating Version Header
set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__ProjectDir%\eng\common\msbuild.ps1" "%__ProjectDir%\eng\CreateVersionFile.csproj" /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /restore /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__ArtifactsIntermediatesDir%\_version.h %__CommonBuildArgs%
powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__ProjectDir%\eng\common\msbuild.ps1" "%__ProjectDir%\eng\CreateVersionFile.proj" /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /restore /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__ArtifactsIntermediatesDir%\_version.h %__CommonBuildArgs%
if not !errorlevel! == 0 (
echo Generate Version Header FAILED
goto ExitWithError
Expand Down Expand Up @@ -253,7 +253,7 @@ if %__Build% EQU 1 (

echo Generating Version Header
set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__ProjectDir%\eng\common\msbuild.ps1" "%__ProjectDir%\eng\CreateVersionFile.csproj" /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /restore /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__ArtifactsIntermediatesDir%\_version.h %__CommonBuildArgs%
powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__ProjectDir%\eng\common\msbuild.ps1" "%__ProjectDir%\eng\CreateVersionFile.proj" /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /restore /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__ArtifactsIntermediatesDir%\_version.h %__CommonBuildArgs%
if not !errorlevel! == 0 (
echo Generate Version Header FAILED
goto ExitWithError
Expand Down Expand Up @@ -296,8 +296,9 @@ if %__Build% EQU 1 (

REM Copy the native SOS binaries to where these tools expect for CI & VS testing

set "__dotnet_sos=%__RootBinDir%\bin\dotnet-sos\%__BuildType%\netcoreapp3.1"
set "__dotnet_dump=%__RootBinDir%\bin\dotnet-dump\%__BuildType%\netcoreapp3.1"
set "__targetRid=net6.0"
set "__dotnet_sos=%__RootBinDir%\bin\dotnet-sos\%__BuildType%\%__targetRid%"
set "__dotnet_dump=%__RootBinDir%\bin\dotnet-dump\%__BuildType%\%__targetRid%"
mkdir %__dotnet_sos%\win-%__BuildArch%
mkdir %__dotnet_sos%\publish\win-%__BuildArch%
mkdir %__dotnet_dump%\win-%__BuildArch%
Expand Down
8 changes: 0 additions & 8 deletions eng/CleanupPrivateBuild.csproj

This file was deleted.

9 changes: 9 additions & 0 deletions eng/CleanupPrivateBuild.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>false</SkipGetTargetFrameworkProperties>
</PropertyGroup>

<Import Project="$(RepositoryEngineeringDir)\InstallRuntimes.proj" />
</Project>
8 changes: 5 additions & 3 deletions eng/CreateVersionFile.csproj → eng/CreateVersionFile.proj
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<!-- All Rights Reserved. Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>false</SkipGetTargetFrameworkProperties>
</PropertyGroup>

<Target Name="GenerateVersionFiles" DependsOnTargets="GenerateVersionHeader;GenerateVersionSourceFile" />

Expand Down
6 changes: 1 addition & 5 deletions eng/InstallRuntimes.proj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
$(MicrosoftAspNetCoreAppRefVersion) - latest dotnet aspnetcore stable version (the version that actually is installed)

$(MicrosoftNETCoreApp60Version) $(MicrosoftAspNetCoreApp60Version) - 6.0 version
$(MicrosoftNETCoreApp31Version) $(MicrosoftAspNetCoreApp31Version) - 3.1 version

$(SingleFileRuntimeLatestVersion) - The latest 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
Expand Down Expand Up @@ -86,7 +85,6 @@
<ItemGroup Condition="!$(InternalReleaseTesting) and !$(PrivateBuildTesting)">
<TestVersions Include="Latest" RuntimeVersion="$(VSRedistCommonNetCoreSharedFrameworkx6470Version)" AspNetVersion="$(MicrosoftAspNetCoreAppRefInternalVersion)" />
<TestVersions Include="60" RuntimeVersion="$(MicrosoftNETCoreApp60Version)" AspNetVersion="$(MicrosoftAspNetCoreApp60Version)" />
<TestVersions Include="31" RuntimeVersion="$(MicrosoftNETCoreApp31Version)" AspNetVersion="$(MicrosoftAspNetCoreApp31Version)" Condition="$(Enable31Testing)" />
</ItemGroup>

<!-- Local private build testing -->
Expand Down Expand Up @@ -153,11 +151,9 @@
Outputs="$(TestConfigFileName)">

<PropertyGroup Condition="'$(PrivateBuildTesting)' != 'true' AND '$(InternalReleaseTesting)' != 'true'">
<RuntimeVersion31 Condition="$(Enable31Testing)">$(MicrosoftNETCoreApp31Version)</RuntimeVersion31>
<AspNetCoreVersion31 Condition="$(Enable31Testing)">$(MicrosoftAspNetCoreApp31Version)</AspNetCoreVersion31>

<RuntimeVersion60>$(MicrosoftNETCoreApp60Version)</RuntimeVersion60>
<AspNetCoreVersion60>$(MicrosoftAspNetCoreApp60Version)</AspNetCoreVersion60>
<!-- TODO: Add others -->
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
</PropertyGroup>
<PropertyGroup>
<!-- Runtime versions to test -->
<MicrosoftNETCoreApp31Version>3.1.28</MicrosoftNETCoreApp31Version>
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
<MicrosoftNETCoreApp60Version>6.0.8</MicrosoftNETCoreApp60Version>
<MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
<!-- The SDK runtime version used to build single-file apps (currently hardcoded) -->
Expand Down
2 changes: 1 addition & 1 deletion eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if ($bundletools) {

# Remove the private build registry keys
if ($cleanupprivatebuild) {
Invoke-Expression "& `"$engroot\common\msbuild.ps1`" $engroot\CleanupPrivateBuild.csproj /v:$verbosity /t:CleanupPrivateBuild /p:BuildArch=$architecture /p:TestArchitectures=$architecture"
Invoke-Expression "& `"$engroot\common\msbuild.ps1`" $engroot\CleanupPrivateBuild.proj /v:$verbosity /t:CleanupPrivateBuild /p:BuildArch=$architecture /p:TestArchitectures=$architecture"
exit $lastExitCode
}

Expand Down
7 changes: 4 additions & 3 deletions eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ if [[ "$__NativeBuild" == 1 ]]; then
__GenerateVersionLog="$__LogsDir/GenerateVersion.binlog"

"$__RepoRootDir/eng/common/msbuild.sh" \
$__RepoRootDir/eng/CreateVersionFile.csproj \
$__RepoRootDir/eng/CreateVersionFile.proj \
/bl:$__GenerateVersionLog \
/t:GenerateVersionFiles \
/restore \
Expand Down Expand Up @@ -230,8 +230,9 @@ fi
#

if [[ "$__NativeBuild" == 1 || "$__Test" == 1 ]]; then
__dotnet_sos=$__RootBinDir/bin/dotnet-sos/$__BuildType/netcoreapp3.1/publish/$__DistroRid
__dotnet_dump=$__RootBinDir/bin/dotnet-dump/$__BuildType/netcoreapp3.1/publish/$__DistroRid
__targetRid=net6.0
__dotnet_sos=$__RootBinDir/bin/dotnet-sos/$__BuildType/$__targetRid/publish/$__DistroRid
__dotnet_dump=$__RootBinDir/bin/dotnet-dump/$__BuildType/$__targetRid/publish/$__DistroRid

mkdir -p "$__dotnet_sos"
mkdir -p "$__dotnet_dump"
Expand Down
12 changes: 0 additions & 12 deletions eng/configure-toolset.ps1

This file was deleted.

12 changes: 0 additions & 12 deletions eng/configure-toolset.sh

This file was deleted.

4 changes: 1 addition & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
"tools": {
"dotnet": "7.0.100",
"dotnet": "7.0.101",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCoreApp31Version)",
"$(MicrosoftNETCoreApp60Version)",
"$(VSRedistCommonNetCoreSharedFrameworkx6470Version)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreApp31Version)",
"$(MicrosoftNETCoreApp60Version)",
"$(VSRedistCommonNetCoreSharedFrameworkx6470Version)"
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp6.0</TargetFrameworks>
<RootNamespace>Microsoft.Diagnostics.NETCore.Client</RootNamespace>
<Description>.NET Core Diagnostics Client Library</Description>
<VersionPrefix>0.2.0</VersionPrefix>
Expand Down
33 changes: 11 additions & 22 deletions src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.IO;
using System.IO.Compression;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using Xunit.Abstractions;

Expand Down Expand Up @@ -133,28 +133,17 @@ async protected override Task DoWork(ITestOutputHelper output)
async static Task DownloadFile(string remotePath, string localPath, ITestOutputHelper output)
{
output.WriteLine("Downloading: " + remotePath + " -> " + localPath);
using HttpClient client = new ();
using HttpResponseMessage response = await client.GetAsync(remotePath);
response.EnsureSuccessStatusCode();
using Stream stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
Directory.CreateDirectory(Path.GetDirectoryName(localPath));
WebRequest request = HttpWebRequest.Create(remotePath);
WebResponse response = await request.GetResponseAsync();
using (FileStream localZipStream = File.OpenWrite(localPath))
{
// TODO: restore the CopyToAsync code after System.Net.Http.dll is
// updated to a newer version. The current old version has a bug
// where the copy never finished.
// await response.GetResponseStream().CopyToAsync(localZipStream);
byte[] buffer = new byte[16 * 1024];
long bytesLeft = response.ContentLength;

while (bytesLeft > 0)
{
int read = response.GetResponseStream().Read(buffer, 0, buffer.Length);
if (read == 0)
break;
localZipStream.Write(buffer, 0, read);
bytesLeft -= read;
}
output.WriteLine("Downloading finished");
}
using FileStream localZipStream = File.OpenWrite(localPath);
// TODO: restore the CopyToAsync code after System.Net.Http.dll is
// updated to a newer version. The current old version has a bug
// where the copy never finished.
await stream.CopyToAsync(localZipStream);
output.WriteLine("Downloading finished");
}

async static Task UnGZip(string gzipPath, string expandedFilePath, ITestOutputHelper output)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private static Dictionary<string,string> GetBuildProperties(TestConfiguration co

protected override string GetFramework(TestConfiguration config)
{
return config.BuildProjectFramework ?? "netcoreapp3.1";
return config.BuildProjectFramework ?? "net6.0";
}

protected override string GetDebuggeeBinaryDirPath(string debuggeeProjectDirPath, string framework, string runtime)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>;1591;1701</NoWarn>
<IsTestProject>false</IsTestProject>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '5')">net5.0</BuildProjectFrameworkLatest>
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '3.1')">netcoreapp3.1</BuildProjectFrameworkLatest>

<DebuggeeSourceRoot>$(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees</DebuggeeSourceRoot>
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
Expand Down Expand Up @@ -80,11 +79,6 @@
<BuildProjectFramework>net6.0</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
</Option>
<Option Condition="'$(RuntimeVersion31)' != ''">
<BuildProjectFramework>netcoreapp3.1</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion31)</RuntimeFrameworkVersion>
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
</Option>
<!--
SOS.StackAndOtherTests (cli because tested with embedded, portable PDBs and single-file)
-->
Expand Down Expand Up @@ -117,10 +111,6 @@
<BuildProjectFramework>net6.0</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
</Option>
<Option Condition="'$(RuntimeVersion31)' != ''">
<BuildProjectFramework>netcoreapp3.1</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion31)</RuntimeFrameworkVersion>
</Option>
</Options>
</Option>
<!--
Expand All @@ -138,11 +128,6 @@
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
<FrameworkVersion>$(AspNetCoreVersion60)</FrameworkVersion>
</Option>
<Option Condition="'$(AspNetCoreVersion31)' != ''">
<BuildProjectFramework>netcoreapp3.1</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion31)</RuntimeFrameworkVersion>
<FrameworkVersion>$(AspNetCoreVersion31)</FrameworkVersion>
</Option>
</Options>
</Option>
</Options>
Expand All @@ -165,7 +150,7 @@
</Options>

<DotNetDumpHost>$(DotNetRoot)/dotnet</DotNetDumpHost>
<DotNetDumpPath>$(RootBinDir)/bin/dotnet-dump/$(TargetConfiguration)/netcoreapp3.1/publish/dotnet-dump.dll</DotNetDumpPath>
<DotNetDumpPath>$(RootBinDir)/bin/dotnet-dump/$(TargetConfiguration)/net6.0/publish/dotnet-dump.dll</DotNetDumpPath>
<DebuggeeDumpOutputRootDir>$(DumpDir)/$(TestProduct)/$(RuntimeFrameworkVersion)/$(BuildProjectFramework)</DebuggeeDumpOutputRootDir>
<DebuggeeDumpInputRootDir>$(DebuggeeDumpOutputRootDir)</DebuggeeDumpInputRootDir>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '7')">net7.0</BuildProjectFrameworkLatest>
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '5')">net5.0</BuildProjectFrameworkLatest>
<BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '3.1')">netcoreapp3.1</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>
Expand Down Expand Up @@ -96,11 +95,6 @@
<BuildProjectFramework>net6.0</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
</Option>
<Option Condition="'$(RuntimeVersion31)' != ''">
<BuildProjectFramework>netcoreapp3.1</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion31)</RuntimeFrameworkVersion>
<SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
</Option>
<!--
SOS.StackAndOtherTests (cli because tested with full, embedded and portable PDBs)
-->
Expand Down Expand Up @@ -133,10 +127,6 @@
<BuildProjectFramework>net6.0</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
</Option>
<Option Condition="'$(RuntimeVersion31)' != ''">
<BuildProjectFramework>netcoreapp3.1</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion31)</RuntimeFrameworkVersion>
</Option>
</Options>
</Option>
<!--
Expand Down Expand Up @@ -173,11 +163,6 @@
<RuntimeFrameworkVersion>$(RuntimeVersion60)</RuntimeFrameworkVersion>
<FrameworkVersion>$(AspNetCoreVersion60)</FrameworkVersion>
</Option>
<Option Condition="'$(AspNetCoreVersion31)' != ''">
<BuildProjectFramework>netcoreapp3.1</BuildProjectFramework>
<RuntimeFrameworkVersion>$(RuntimeVersion31)</RuntimeFrameworkVersion>
<FrameworkVersion>$(AspNetCoreVersion31)</FrameworkVersion>
</Option>
</Options>
</Option>
</Options>
Expand Down Expand Up @@ -216,7 +201,7 @@

<SOSPath>$(InstallDir)\sos.dll</SOSPath>
<DotNetDumpHost>$(DotNetRoot)\dotnet.exe</DotNetDumpHost>
<DotNetDumpPath>$(RootBinDir)\bin\dotnet-dump\$(TargetConfiguration)\netcoreapp3.1\publish\dotnet-dump.dll</DotNetDumpPath>
<DotNetDumpPath>$(RootBinDir)\bin\dotnet-dump\$(TargetConfiguration)\net6.0\publish\dotnet-dump.dll</DotNetDumpPath>
<DebuggeeDumpOutputRootDir>$(DumpDir)\$(TestProduct)\$(RuntimeFrameworkVersion)\$(BuildProjectFramework)</DebuggeeDumpOutputRootDir>
<DebuggeeDumpInputRootDir>$(DebuggeeDumpOutputRootDir)</DebuggeeDumpInputRootDir>
</Configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ add_library_clr(DesktopClrHost SHARED ${DESKTOPCLRHOST_SOURCES})

target_link_libraries(DesktopClrHost ${DESKTOPCLRHOST_LIBRARY})

install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/netcoreapp3.1)
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)
2 changes: 1 addition & 1 deletion src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<DebugType Condition="'$(TargetFramework)' == 'net462'">full</DebugType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<BuildTargetFrameworks>netcoreapp3.1;net6.0;net7.0</BuildTargetFrameworks>
<BuildTargetFrameworks>net6.0;net7.0</BuildTargetFrameworks>
</PropertyGroup>
</Project>
Loading