diff --git a/eng/AuxMsbuildFiles/SdkPackOverrides.targets b/eng/AuxMsbuildFiles/SdkPackOverrides.targets index 6251cd2389..710727a87c 100644 --- a/eng/AuxMsbuildFiles/SdkPackOverrides.targets +++ b/eng/AuxMsbuildFiles/SdkPackOverrides.targets @@ -14,13 +14,6 @@ $(MicrosoftNETCoreApp60Version) - - - $(MicrosoftNETCoreApp31Version) - - - $(MicrosoftNETCoreApp31Version) - \ No newline at end of file diff --git a/eng/Build-Native.cmd b/eng/Build-Native.cmd index bf16c8a02e..7af07daa6d 100644 --- a/eng/Build-Native.cmd +++ b/eng/Build-Native.cmd @@ -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 @@ -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 @@ -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% diff --git a/eng/CleanupPrivateBuild.csproj b/eng/CleanupPrivateBuild.csproj deleted file mode 100644 index bb22950b13..0000000000 --- a/eng/CleanupPrivateBuild.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - netcoreapp3.1 - - - - - diff --git a/eng/CleanupPrivateBuild.proj b/eng/CleanupPrivateBuild.proj new file mode 100644 index 0000000000..7f48d9c94b --- /dev/null +++ b/eng/CleanupPrivateBuild.proj @@ -0,0 +1,9 @@ + + + netstandard2.0 + false + false + + + + diff --git a/eng/CreateVersionFile.csproj b/eng/CreateVersionFile.proj similarity index 94% rename from eng/CreateVersionFile.csproj rename to eng/CreateVersionFile.proj index f3d5d14912..0ebcdee497 100644 --- a/eng/CreateVersionFile.csproj +++ b/eng/CreateVersionFile.proj @@ -1,8 +1,10 @@ - + - netcoreapp3.1 - + netstandard2.0 + false + false + diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj index eac7bdc378..5e466ed3ad 100644 --- a/eng/InstallRuntimes.proj +++ b/eng/InstallRuntimes.proj @@ -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 @@ -86,7 +85,6 @@ - @@ -153,11 +151,9 @@ Outputs="$(TestConfigFileName)"> - $(MicrosoftNETCoreApp31Version) - $(MicrosoftAspNetCoreApp31Version) - $(MicrosoftNETCoreApp60Version) $(MicrosoftAspNetCoreApp60Version) + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index c1b6dfbf05..26918f1556 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index cd2c640bd3..bea2f5e08b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,8 +28,6 @@ - 3.1.28 - $(MicrosoftNETCoreApp31Version) 6.0.8 $(MicrosoftNETCoreApp60Version) diff --git a/eng/build.ps1 b/eng/build.ps1 index 722f061bcc..b107d42088 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -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 } diff --git a/eng/build.sh b/eng/build.sh index 654ab0c0f5..3e4e9e8691 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -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 \ @@ -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" diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 deleted file mode 100644 index 377252c468..0000000000 --- a/eng/configure-toolset.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -# We depend on a local cli for a number of our buildtool -# commands like init-tools so for now we need to disable -# using the globally installed dotnet - -$script:useInstalledDotNetCli = $false - -# Always use the local repo packages directory instead of -# the user's NuGet cache -#$script:useGlobalNuGetCache = $false - -# Working around issue https://github.com/dotnet/arcade/issues/2673 -$script:DisableNativeToolsetInstalls = $true diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh deleted file mode 100644 index ca72d0b4e9..0000000000 --- a/eng/configure-toolset.sh +++ /dev/null @@ -1,12 +0,0 @@ -# We depend on a local cli for a number of our buildtool -# commands like init-tools so for now we need to disable -# using the globally installed dotnet - -use_installed_dotnet_cli=false - -# Always use the local repo packages directory instead of -# the user's NuGet cache -#use_global_nuget_cache=false - -# Working around issue https://github.com/dotnet/arcade/issues/2673 -DisableNativeToolsetInstalls=true diff --git a/global.json b/global.json index 245cbef910..f842cbeb6b 100644 --- a/global.json +++ b/global.json @@ -1,14 +1,12 @@ { "tools": { - "dotnet": "7.0.100", + "dotnet": "7.0.101", "runtimes": { "dotnet/x64": [ - "$(MicrosoftNETCoreApp31Version)", "$(MicrosoftNETCoreApp60Version)", "$(VSRedistCommonNetCoreSharedFrameworkx6470Version)" ], "dotnet/x86": [ - "$(MicrosoftNETCoreApp31Version)", "$(MicrosoftNETCoreApp60Version)", "$(VSRedistCommonNetCoreSharedFrameworkx6470Version)" ], diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj index 3d097fafcb..ff2856f1c2 100644 --- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj +++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj @@ -1,7 +1,8 @@  Library - netstandard2.0;netcoreapp3.1 + netstandard2.0;net6.0 + netstandard2.0 Microsoft.Diagnostics.NETCore.Client .NET Core Diagnostics Client Library 0.2.0 diff --git a/src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs b/src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs index e5b088231a..b078b6c34e 100644 --- a/src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs +++ b/src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs @@ -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; @@ -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) diff --git a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs b/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs index c1ec9a9023..2f1a51873e 100644 --- a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs +++ b/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs @@ -52,7 +52,7 @@ private static Dictionary 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) diff --git a/src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj b/src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj index f2d83c5aa1..d1316d1f77 100644 --- a/src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj +++ b/src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 true ;1591;1701 false diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 873b2f3b36..c29ae7de11 100644 --- a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -25,9 +25,7 @@ false net7.0 - net5.0 net6.0 - netcoreapp3.1 $(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles @@ -80,11 +78,6 @@ net6.0 $(RuntimeVersion60) - @@ -117,10 +110,6 @@ net6.0 $(RuntimeVersion60) - @@ -133,10 +127,6 @@ net6.0 $(RuntimeVersion60) - @@ -51,5 +46,5 @@ --fx-version $(RuntimeFrameworkVersion) $(DotNetRoot)/dotnet - $(RootBinDir)/bin/dotnet-trace/$(TargetConfiguration)/netcoreapp3.1/dotnet-trace.dll + $(RootBinDir)/bin/dotnet-trace/$(TargetConfiguration)/net6.0/dotnet-trace.dll diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt index ea51d1d00f..704c426a2c 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -12,7 +12,6 @@ net7.0 net6.0 net5.0 - netcoreapp3.1 ProjectK $(RepoRootDir)\src\tests @@ -39,10 +38,6 @@ net6.0 $(RuntimeVersion60) - @@ -50,5 +45,5 @@ --fx-version $(RuntimeFrameworkVersion) $(DotNetRoot)\dotnet.exe - $(RootBinDir)\bin\dotnet-trace\$(TargetConfiguration)\netcoreapp3.1\dotnet-trace.dll + $(RootBinDir)\bin\dotnet-trace\$(TargetConfiguration)\net6.0\dotnet-trace.dll diff --git a/src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj b/src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj index c73e0d1692..41f1d5ad4b 100644 --- a/src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj +++ b/src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index eaf4b4e2f5..fe30b78e06 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -4,13 +4,7 @@ $(Platform) $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - - - true - false - - netcoreapp3.1;net6.0;net7.0 - net6.0;net7.0 + net6.0;net7.0 diff --git a/src/tests/EventPipeTracee/EventPipeTracee.csproj b/src/tests/EventPipeTracee/EventPipeTracee.csproj index 0d7605719e..fad4801e17 100644 --- a/src/tests/EventPipeTracee/EventPipeTracee.csproj +++ b/src/tests/EventPipeTracee/EventPipeTracee.csproj @@ -2,7 +2,7 @@ Exe $(BuildProjectFramework) - netcoreapp3.1;net6.0;net7.0 + net6.0;net7.0 diff --git a/src/tests/ExitCodeTracee/ExitCodeTracee.csproj b/src/tests/ExitCodeTracee/ExitCodeTracee.csproj index 6b634ef181..05388fd5f4 100644 --- a/src/tests/ExitCodeTracee/ExitCodeTracee.csproj +++ b/src/tests/ExitCodeTracee/ExitCodeTracee.csproj @@ -2,6 +2,6 @@ Exe $(BuildProjectFramework) - netcoreapp3.1;net6.0;net7.0 + net6.0;net7.0 diff --git a/src/tests/Grape/Grape.csproj b/src/tests/Grape/Grape.csproj index 4b033d9a1d..e72911e15d 100644 --- a/src/tests/Grape/Grape.csproj +++ b/src/tests/Grape/Grape.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/src/tests/StackTracee/StackTracee.csproj b/src/tests/StackTracee/StackTracee.csproj index 6b634ef181..05388fd5f4 100644 --- a/src/tests/StackTracee/StackTracee.csproj +++ b/src/tests/StackTracee/StackTracee.csproj @@ -2,6 +2,6 @@ Exe $(BuildProjectFramework) - netcoreapp3.1;net6.0;net7.0 + net6.0;net7.0 diff --git a/src/tests/Tracee/Tracee.csproj b/src/tests/Tracee/Tracee.csproj index 6b634ef181..05388fd5f4 100644 --- a/src/tests/Tracee/Tracee.csproj +++ b/src/tests/Tracee/Tracee.csproj @@ -2,6 +2,6 @@ Exe $(BuildProjectFramework) - netcoreapp3.1;net6.0;net7.0 + net6.0;net7.0 diff --git a/src/tests/benchmarks/benchmarks.csproj b/src/tests/benchmarks/benchmarks.csproj index 59e56dcba3..5173a12603 100644 --- a/src/tests/benchmarks/benchmarks.csproj +++ b/src/tests/benchmarks/benchmarks.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0