diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 6423c125b8ba..fd487120de34 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.106-servicing.24278.1.centos.9-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.106-centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.107-servicing.24317.1.centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.107-centos.9-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index ce17211bbbcd..b9cdecbb124e 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.106" + "dotnet": "8.0.107" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 6cf694f759d1..3dee5919a8a7 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -63,25 +63,11 @@ msft,./sdk/x.y.z/**/System.Windows.Extensions.dll msft,./sdk/x.y.z/**/System.Security.Permissions.dll msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Diagnostics.EventLog.dll -# netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/3285 -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Win32.SystemEvents.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/* -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Drawing.Common.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll - -# netfx runtimes for dotnet-format - https://github.com/dotnet/source-build/issues/3509 -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Elfie.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Win32.SystemEvents.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/* -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Configuration.ConfigurationManager.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll -msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll +# Exclude format and watch tools due to too much noise +msft,./sdk/x.y.z/DotnetTools/dotnet-format/** +msft,./sdk/x.y.z/DotnetTools/dotnet-watch/** +sb,./sdk/x.y.z/DotnetTools/dotnet-format/** +sb,./sdk/x.y.z/DotnetTools/dotnet-watch/** # netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290 msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll @@ -96,4 +82,4 @@ msft,./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll # runtime components in roslyn layout - https://github.com/dotnet/source-build/issues/3286 # Expected - build is filtering components present in target platform. msft,./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll -msft,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll +msft,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll \ No newline at end of file diff --git a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch deleted file mode 100644 index 6569164b87ce..000000000000 --- a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 05ad51a9be428012328a1ee199a4edaff20b5efe Mon Sep 17 00:00:00 2001 -From: Antoine Martin -Date: Tue, 12 Sep 2023 18:55:46 -0400 -Subject: [PATCH] crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t - -Backport: https://github.com/dotnet/runtime/pull/101272 - ---- - src/coreclr/debug/createdump/crashinfo.cpp | 2 +- - src/coreclr/debug/createdump/crashinfounix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp -index 996f3a81935d..d1d1b0ea0218 100644 ---- a/src/coreclr/debug/createdump/crashinfo.cpp -+++ b/src/coreclr/debug/createdump/crashinfo.cpp -@@ -803,7 +803,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) - } - - uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); -- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); -+ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); - if (seekResult != pagemapOffset) - { - int seekErrno = errno; -diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp -index 24b975e3d655..2f4ea079de3b 100644 ---- a/src/coreclr/debug/createdump/crashinfounix.cpp -+++ b/src/coreclr/debug/createdump/crashinfounix.cpp -@@ -516,7 +516,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r - // performance optimization. - m_canUseProcVmReadSyscall = false; - assert(m_fdMem != -1); -- *read = pread64(m_fdMem, buffer, size, (off64_t)address); -+ *read = pread(m_fdMem, buffer, size, (off_t)address); - } - - if (*read == (size_t)-1)