diff --git a/NuGet.config b/NuGet.config
index ca7dfc319..fd8027684 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -30,6 +30,7 @@
+
@@ -39,16 +40,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -80,16 +71,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index bf27fdb5f..428b2c3ef 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 ff5bcdc6c..3b35ea2e6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -85,22 +85,22 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
2f1db20456007c9515068a35a65afdf99af70bc6
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ a7681c04a92d48db3407d9f64e3c8ec31e332a0c
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ a7681c04a92d48db3407d9f64e3c8ec31e332a0c
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ a7681c04a92d48db3407d9f64e3c8ec31e332a0c
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ a7681c04a92d48db3407d9f64e3c8ec31e332a0c
https://github.com/dotnet/test-templates
@@ -132,36 +132,36 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
43bb8cc831c2658e1117415019264bfe6f644f94
-
+
https://github.com/dotnet/fsharp
- 80c165644db640d0f309affe0daa281c7e17b939
+ 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17
-
+
https://github.com/dotnet/fsharp
- 80c165644db640d0f309affe0daa281c7e17b939
+ 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17
-
+
https://github.com/microsoft/vstest
- 83d73f783bf54c336d1eab04a53d554f8a6c0b19
+ 910ca0dcc779068418464794f5af570eda195222
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
2aade6beb02ea367fd97c4070a4198802fe61c03
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn
- 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea
+
+ https://github.com/dotnet/roslyn
+ 26240cf3e46e45a9fc8c879f793793defe2c0b2a
-
+
https://github.com/dotnet/msbuild
- 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc
+ 0c86109772ea0fae22af6a7ad7b582e75d280689
-
+
https://github.com/nuget/nuget.client
- fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf
+ c0d441fc5e99e6765c9e0b2f77de162b9866b305
diff --git a/eng/Versions.props b/eng/Versions.props
index b5c54f07a..b2599a458 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,8 +7,8 @@
8
0
- 3
- 04
+ 4
+ 00
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
@@ -25,8 +25,8 @@
30
32
17
- $([MSBuild]::Add($(VersionFeature), 29))
- 20
+ 32
+ 19
<_NET70ILLinkPackVersion>7.0.100-1.23401.1
@@ -78,16 +78,16 @@
- 8.0.303
- 8.0.303-servicing.24317.6
- 8.0.303-servicing.24317.6
+ 8.0.400-preview.24362.13
+ 8.0.400-preview.24362.13
+ 8.0.400-preview.24362.13
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 4.10.0-3.24314.14
+ 4.11.0-3.24358.9
@@ -120,11 +120,11 @@
- 6.10.0-preview.2.97
+ 6.11.0-rc.122
- 17.10.4
+ 17.11.3
@@ -187,7 +187,7 @@
2.2.0-beta.19072.10
2.0.0
- 17.10.0-release-24272-11
+ 17.11.0-release-24352-05
8.0.0-alpha.1.22557.12
diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc
new file mode 100644
index 000000000..7c2ba0211
--- /dev/null
+++ b/github-merge-flow.jsonc
@@ -0,0 +1,25 @@
+// IMPORTANT: This file is read by the merge flow from main branch only.
+{
+ "merge-flow-configurations": {
+ // Automate opening PRs to merge cli release/6.0.1xx to .4xx
+ "release/6.0.1xx":{
+ "MergeToBranch": "release/6.0.4xx",
+ "ExtraSwitches": "-QuietComments"
+ },
+ // Automate opening PRs to merge cli release/6.0.4xx to 8.0.1xx
+ "release/6.0.4xx":{
+ "MergeToBranch": "release/8.0.1xx",
+ "ExtraSwitches": "-QuietComments"
+ },
+ // 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"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets
index b5d03d5a9..5e395d3f4 100644
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -333,17 +333,17 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+