diff --git a/NuGet.config b/NuGet.config
index 9b822bf80186..9470a2b9a8f5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,50 +7,22 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -71,36 +43,17 @@
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d3a8c768c7b4..69fc29a85866 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
@@ -52,30 +52,30 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
189fbbd88d97dd6d65515ba2da05b62eab4e5039
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
https://github.com/dotnet/test-templates
@@ -90,36 +90,36 @@
c40ef7e056b48e011c43a21354d6790ba6b8b4fc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 2fdb78d36dc993a532bd80ee2682a2b534497413
+ 1e5db134e25b38b223858e7dd497f9f8a9312f4e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 2fdb78d36dc993a532bd80ee2682a2b534497413
+ 1e5db134e25b38b223858e7dd497f9f8a9312f4e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 2fdb78d36dc993a532bd80ee2682a2b534497413
+ 1e5db134e25b38b223858e7dd497f9f8a9312f4e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 902d4b651242b37d952aedd9ef8b17b9ed766d09
+ 954f381d16c2d44b573890786ca2d071c217a433
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 902d4b651242b37d952aedd9ef8b17b9ed766d09
+ 954f381d16c2d44b573890786ca2d071c217a433
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 6a984c48f3489b60f25deb72ede6e5051bb130d4
+ 9b5f402943986a66dfca2b6f4312cfca19d75c17
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- b660c1e83039451abe9d9190a7aabe87c03fd7ae
+ c9e44425226553e639116ff82698cfd2808f7769
https://github.com/dotnet/fsharp
@@ -146,9 +146,9 @@
487283bcd8d66693091f2800dcf1c8ae37cccdee
-
+
https://github.com/dotnet/msbuild
- d679d209277a156cdc0963c993585ffa5744dc5f
+ 85d71072f8fa22cc761d6b65954da263364bee4d
@@ -166,9 +166,9 @@
698fdad58fa64a55f16cd9562c90224cc498ed02
-
+
https://github.com/dotnet/emsdk
- 849e1a63a8319f9578b9e5f02da592d24d4aa2df
+ c68eace1f3c11ab25cdf30a425ab3792773bb2cc
https://github.com/dotnet/source-build
diff --git a/eng/Versions.props b/eng/Versions.props
index e090c7e9afba..3ee916654963 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
- 6.0.33-servicing.24366.4
+ 6.0.35-servicing.24462.9
- 6.0.33-servicing.24366.5
+ 6.0.35-servicing.24462.14
- 6.0.133
+ 6.0.135
@@ -43,20 +43,20 @@
- 6.0.33
- 6.0.33
- 6.0.33-servicing.24379.5
- 6.0.33-servicing.24379.5
- 6.0.33-servicing.24379.5
- 6.0.33-servicing.24379.5
+ 6.0.35
+ 6.0.35
+ 6.0.35-servicing.24462.14
+ 6.0.35-servicing.24462.14
+ 6.0.35-servicing.24462.14
+ 6.0.35-servicing.24462.14
0.2.0
- 6.0.133-servicing.24379.12
- 6.0.133-servicing.24379.12
+ 6.0.135-servicing.24466.24
+ 6.0.135-servicing.24466.24
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -67,20 +67,20 @@
- 6.0.33-servicing.24366.10
- 6.0.33-servicing.24366.10
- 6.0.33
- 6.0.33
- 6.0.33
- 6.0.33
+ 6.0.35-servicing.24459.18
+ 6.0.35-servicing.24459.18
+ 6.0.35
+ 6.0.35
+ 6.0.35
+ 6.0.35
2.1.0
- 6.0.33-servicing.24366.6
- 6.0.33-servicing.24366.6
- 6.0.33
- 6.0.33
+ 6.0.35-servicing.24463.5
+ 6.0.35-servicing.24463.5
+ 6.0.35
+ 6.0.35
@@ -97,7 +97,7 @@
- 17.0.3
+ 17.0.4
$(MicrosoftNETCoreAppRuntimePackageVersion)
@@ -115,7 +115,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.133
+ 6.0.135
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
@@ -155,7 +155,7 @@
12.0.101-preview.9.31
15.0.101-preview.9.31
$(MicrosoftNETCoreAppRefPackageVersion)
- 6.0.33
+ 6.0.35
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
index 6d3d215c4b7c..ec9a45ef5887 100644
--- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
+++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
@@ -14,20 +14,7 @@ index ------------
./packs/Microsoft.AspNetCore.App.Ref/
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
@@ ------------ @@
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
-./packs/Microsoft.NETCore.App.Host.portable-rid/
@@ -42,10 +29,6 @@ index ------------
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
+./packs/Microsoft.NETCore.App.Host.banana-rid/
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/
@@ -119,10 +102,9 @@ index ------------
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/
@@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll
@@ -220,7 +202,7 @@ index ------------
-./sdk/x.y.z/FSharp/System.CodeDom.dll
-./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll
-./sdk/x.y.z/FSharp/System.Drawing.Common.dll
-+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll
+ ./sdk/x.y.z/FSharp/System.Formats.Asn1.dll
./sdk/x.y.z/FSharp/System.Resources.Extensions.dll
+./sdk/x.y.z/FSharp/System.Security.AccessControl.dll
./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll
@@ -436,7 +418,7 @@ index ------------
+./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll
./sdk/x.y.z/System.Diagnostics.EventLog.dll
-./sdk/x.y.z/System.Drawing.Common.dll
-+./sdk/x.y.z/System.Formats.Asn1.dll
+ ./sdk/x.y.z/System.Formats.Asn1.dll
./sdk/x.y.z/System.Resources.Extensions.dll
+./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll
+./sdk/x.y.z/System.Security.AccessControl.dll
@@ -445,10 +427,10 @@ index ------------
./sdk/x.y.z/System.Security.Cryptography.Xml.dll
-./sdk/x.y.z/System.Security.Permissions.dll
./sdk/x.y.z/System.ServiceProcess.ServiceController.dll
--./sdk/x.y.z/System.Windows.Extensions.dll
+./sdk/x.y.z/System.Text.Encoding.CodePages.dll
+./sdk/x.y.z/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/System.Text.Json.dll
+ ./sdk/x.y.z/System.Text.Json.dll
+-./sdk/x.y.z/System.Windows.Extensions.dll
+./sdk/x.y.z/testhost.deps.json
+./sdk/x.y.z/testhost.dll
+./sdk/x.y.z/testhost.dll.config