diff --git a/NuGet.config b/NuGet.config
index 9a66abf45cc8..6307db2abe6a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -25,20 +25,17 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
@@ -67,14 +64,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index f2075af7425f..2622db83de85 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8f774aeb5316..c336a656b443 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -85,22 +85,22 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
31d685b2d9a86ca1243014d175a3da813f78e428
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 55a73a0e7f0c08bb832c2dceeb49287223efef1f
+ f6ad34c0ba03ad79257a09903033493414af4ffa
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 55a73a0e7f0c08bb832c2dceeb49287223efef1f
+ f6ad34c0ba03ad79257a09903033493414af4ffa
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 55a73a0e7f0c08bb832c2dceeb49287223efef1f
+ f6ad34c0ba03ad79257a09903033493414af4ffa
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 55a73a0e7f0c08bb832c2dceeb49287223efef1f
+ f6ad34c0ba03ad79257a09903033493414af4ffa
https://github.com/dotnet/test-templates
@@ -132,36 +132,36 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
6a2a510ae56ff16665d95b96a0920e2fd45e1d2b
-
+
https://github.com/dotnet/fsharp
- 80c165644db640d0f309affe0daa281c7e17b939
+ e11d7079bebc6f101c5313fe0d1de9e3d38a7c02
-
+
https://github.com/dotnet/fsharp
- 80c165644db640d0f309affe0daa281c7e17b939
+ e11d7079bebc6f101c5313fe0d1de9e3d38a7c02
-
+
https://github.com/microsoft/vstest
- c4d80397805bec06b354d20aeb1773e243c6add0
+ 7855c9b221686104532ebf3380f2d45b3613b369
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
89ef51c5d8f5239345127a1e282e11036e590c8b
-
+
https://github.com/dotnet/roslyn
- 64e323ff5a3f88b1eae1c6d728441e73a38a9daa
+ bc1c3011064a493b0ca527df6fb7215e2e5cfa96
-
+
https://github.com/dotnet/msbuild
- 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc
+ a69bbaaf5f8d7249b8cab7309e81ad2221ce396c
-
+
https://github.com/nuget/nuget.client
- b42cb884109d8d33c956311f1a8c89a90be0c195
+ 5469bd0d9de8108f15f21644759773b85471366c
diff --git a/eng/Versions.props b/eng/Versions.props
index 2635bf7c8e98..2d30eb7db243 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,8 +7,8 @@
8
0
- 3
- 09
+ 4
+ 06
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
@@ -77,16 +77,16 @@
- 8.0.308
- 8.0.308-servicing.24604.16
- 8.0.308-servicing.24604.16
+ 8.0.405
+ 8.0.405-servicing.24604.17
+ 8.0.405-servicing.24604.17
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 4.10.0-3.24574.6
+ 4.11.0-3.24554.2
@@ -122,11 +122,11 @@
- 6.10.2-rc.8
+ 6.11.1-rc.2
- 17.10.4
+ 17.11.9
@@ -168,7 +168,7 @@
2.2.0-beta.19072.10
2.0.0
- 17.10.0-release-24317-02
+ 17.11.1-release-24455-02
8.0.0-alpha.1.22557.12
diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc
new file mode 100644
index 000000000000..66328a26fef1
--- /dev/null
+++ b/github-merge-flow.jsonc
@@ -0,0 +1,15 @@
+// IMPORTANT: This file is read by the merge flow from main branch only.
+{
+ "merge-flow-configurations": {
+ // Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx
+ "release/8.0.1xx":{
+ "MergeToBranch": "release/8.0.3xx",
+ "ExtraSwitches": "-QuietComments"
+ },
+ // Automate opening PRs to merge cli release/8.0.3xx to 8.0.4xx
+ "release/8.0.3xx":{
+ "MergeToBranch": "release/8.0.4xx",
+ "ExtraSwitches": "-QuietComments"
+ }
+ }
+}
diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets
index b5d03d5a90c1..5e395d3f4752 100644
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -333,17 +333,17 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+