diff --git a/NuGet.config b/NuGet.config
index fe0022aab..d9a356e15 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,6 +18,7 @@
+
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 212f8dd22..9fc54899c 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
- 28ae95bc8703be1ebc194391b03b6477cf59bed2
+ a57b7a3727ee289642a69a78ffa0eab48ec161d8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 28ae95bc8703be1ebc194391b03b6477cf59bed2
+ a57b7a3727ee289642a69a78ffa0eab48ec161d8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 28ae95bc8703be1ebc194391b03b6477cf59bed2
+ a57b7a3727ee289642a69a78ffa0eab48ec161d8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 28ae95bc8703be1ebc194391b03b6477cf59bed2
+ a57b7a3727ee289642a69a78ffa0eab48ec161d8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
@@ -52,55 +52,55 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2aade6beb02ea367fd97c4070a4198802fe61c03
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 2f1db20456007c9515068a35a65afdf99af70bc6
+ b8139c5ee58f1708b0e3368a1b241400edd6cbc4
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ 2f05eac8d343353adf03367b5a72a13ebb97ce57
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ 2f05eac8d343353adf03367b5a72a13ebb97ce57
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ 2f05eac8d343353adf03367b5a72a13ebb97ce57
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 3ecaf32089ff44b59b6cfc518baf20be49886604
+
+ https://github.com/dotnet/sdk
+ 2f05eac8d343353adf03367b5a72a13ebb97ce57
https://github.com/dotnet/test-templates
@@ -124,57 +124,57 @@
7d2f2719628e6744f3172a2d48e0d1f600b360c0
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611
+ b0051e354c0e48009444fb4907a6ce61ac497910
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 43bb8cc831c2658e1117415019264bfe6f644f94
+ 86a51738adbb65141dea966de2cce47ae2061812
-
+
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
+ 3b8b000a0e115700b18265d8ec8c6307056dc94d
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn
- 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea
+
+ https://github.com/dotnet/roslyn
+ 92051d4c24bc13ff58232104a647910bf22cd105
-
+
https://github.com/dotnet/msbuild
- 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc
+ 0c86109772ea0fae22af6a7ad7b582e75d280689
-
+
https://github.com/nuget/nuget.client
- fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf
+ c0d441fc5e99e6765c9e0b2f77de162b9866b305
https://github.com/Microsoft/ApplicationInsights-dotnet
53b80940842204f78708a538628288ff5d741a1d
-
- https://github.com/dotnet/emsdk
- a64772f521c578bc9925578b1384d3a08a02d31d
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-emsdk
+ 6a447a096ee9b580465138e4944699db298c12c7
-
- https://github.com/dotnet/emsdk
- a64772f521c578bc9925578b1384d3a08a02d31d
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-emsdk
+ 6a447a096ee9b580465138e4944699db298c12c7
diff --git a/eng/Versions.props b/eng/Versions.props
index 8028cd046..f0c5ee2d7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,13 +7,13 @@
8
0
- 3
- 04
+ 4
+ 00
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
- true
+ false
release
preview
@@ -25,8 +25,8 @@
30
32
17
- $([MSBuild]::Add($(VersionFeature), 29))
- 20
+ 30
+ 19
<_NET70ILLinkPackVersion>7.0.100-1.23401.1
@@ -47,11 +47,11 @@
- 8.0.7-servicing.24313.8
+ 8.0.6-servicing.24269.9
- 8.0.7-servicing.24313.7
+ 8.0.6-servicing.24269.6
@@ -65,50 +65,50 @@
- 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
+ 8.0.6
+ 8.0.6
+ 8.0.6-servicing.24269.9
+ 8.0.6-servicing.24269.9
+ 8.0.6-servicing.24269.9
+ 8.0.6-servicing.24269.9
+ 8.0.6-servicing.24269.9
0.2.0
- 8.0.303
- 8.0.303-servicing.24317.6
- 8.0.303-servicing.24317.6
+ 8.0.400-preview.24353.11
+ 8.0.400-preview.24353.11
+ 8.0.400-preview.24353.11
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 4.10.0-3.24314.14
+ 4.11.0-3.24329.1
- 8.0.7-servicing.24313.11
+ 8.0.6-servicing.24267.15
- 8.0.7-servicing.24313.11
- 8.0.7-servicing.24313.11
- 8.0.7
- 8.0.7
- 8.0.7
- 8.0.7
+ 8.0.6-servicing.24267.15
+ 8.0.6-servicing.24267.15
+ 8.0.6
+ 8.0.6
+ 8.0.6
+ 8.0.6
2.1.0
- 8.0.7-servicing.24314.3
- 8.0.7-servicing.24314.3
- 8.0.7
- 8.0.7
+ 8.0.6-servicing.24270.9
+ 8.0.6-servicing.24270.9
+ 8.0.6
+ 8.0.6
@@ -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
@@ -202,7 +202,7 @@
14.0.8478
17.0.8478
- 8.0.7
+ 8.0.6
$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)
8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))
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 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+