diff --git a/NuGet.config b/NuGet.config
index c8bd4d7c78fe..6f83e4126271 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,17 +7,22 @@
+
+
+
+
+
@@ -37,11 +42,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cebc01e95e5a..28d6f56a9b13 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,46 +5,46 @@
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
-->
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
+ 28ae95bc8703be1ebc194391b03b6477cf59bed2
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
+ 28ae95bc8703be1ebc194391b03b6477cf59bed2
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
+ 28ae95bc8703be1ebc194391b03b6477cf59bed2
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
+ 28ae95bc8703be1ebc194391b03b6477cf59bed2
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
@@ -52,55 +52,55 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
+ 2f1db20456007c9515068a35a65afdf99af70bc6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- ecfb8a05aeaa93057ae0003d406280239b2c4c7b
+ 289435f5c45053c7599cf237fefc8391d1eb7f0b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- ecfb8a05aeaa93057ae0003d406280239b2c4c7b
+ 289435f5c45053c7599cf237fefc8391d1eb7f0b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- ecfb8a05aeaa93057ae0003d406280239b2c4c7b
+ 289435f5c45053c7599cf237fefc8391d1eb7f0b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- ecfb8a05aeaa93057ae0003d406280239b2c4c7b
+ 289435f5c45053c7599cf237fefc8391d1eb7f0b
https://github.com/dotnet/test-templates
@@ -124,13 +124,13 @@
1e5f3603af2277910aad946736ee23283e7f3e16
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 6c37c986b6c8fc0669b38a03a03445a75b8227a6
+ fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- b5af29a8f41f880f38fd015c6bcb7aeb816fcef6
+ 43bb8cc831c2658e1117415019264bfe6f644f94
https://github.com/dotnet/fsharp
@@ -146,13 +146,13 @@
aa59400b11e1aeee2e8af48928dbd48748a8bef9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 087e15321bb712ef6fe8b0ba6f8bd12facf92629
+ 2aade6beb02ea367fd97c4070a4198802fe61c03
-
+
https://github.com/dotnet/roslyn
- 263571123fc3dc4a638e071234ac9fbf91913962
+ de75b3c77d41c21562fc2e9dbcc26b2268c80b26
@@ -173,18 +173,18 @@
https://github.com/Microsoft/ApplicationInsights-dotnet
53b80940842204f78708a538628288ff5d741a1d
-
+
https://github.com/dotnet/emsdk
- 71359b18c2d83c01a68bf155244a65962a7e8c8e
+ a64772f521c578bc9925578b1384d3a08a02d31d
https://dev.azure.com/dnceng/internal/_git/dotnet-aspire
48e42f59d64d84b404e904996a9ed61f2a17a569
-
+
https://github.com/dotnet/emsdk
- 71359b18c2d83c01a68bf155244a65962a7e8c8e
+ a64772f521c578bc9925578b1384d3a08a02d31d
diff --git a/eng/Versions.props b/eng/Versions.props
index 4cddaab3ecad..6cf92def30b1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,11 +48,11 @@
- 8.0.5-servicing.24217.4
+ 8.0.7-servicing.24313.8
- 8.0.5-servicing.24217.2
+ 8.0.7-servicing.24313.7
@@ -65,50 +65,50 @@
- 8.0.5
- 8.0.5
- 8.0.5-servicing.24224.4
- 8.0.5-servicing.24224.4
- 8.0.5-servicing.24224.4
- 8.0.5-servicing.24224.4
- 8.0.5-servicing.24224.4
+ 8.0.7
+ 8.0.7
+ 8.0.7-servicing.24314.2
+ 8.0.7-servicing.24314.2
+ 8.0.7-servicing.24314.2
+ 8.0.7-servicing.24314.2
+ 8.0.7-servicing.24314.2
0.2.0
- 8.0.105
- 8.0.105-servicing.24224.15
- 8.0.105-servicing.24224.15
+ 8.0.107
+ 8.0.107-servicing.24317.5
+ 8.0.107-servicing.24317.5
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 4.8.0-7.24067.24
+ 4.8.0-7.24225.6
- 8.0.5-servicing.24216.15
+ 8.0.7-servicing.24313.11
- 8.0.5-servicing.24216.15
- 8.0.5-servicing.24216.15
- 8.0.5
- 8.0.5
- 8.0.5
- 8.0.5
+ 8.0.7-servicing.24313.11
+ 8.0.7-servicing.24313.11
+ 8.0.7
+ 8.0.7
+ 8.0.7
+ 8.0.7
2.1.0
- 8.0.5-servicing.24217.5
- 8.0.5-servicing.24217.5
- 8.0.5
- 8.0.5
+ 8.0.7-servicing.24314.3
+ 8.0.7-servicing.24314.3
+ 8.0.7
+ 8.0.7
@@ -202,7 +202,7 @@
14.0.8478
17.0.8478
- 8.0.5
+ 8.0.7
$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)
8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))
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)