diff --git a/NuGet.config b/NuGet.config index 60c9c5f54..dd5110190 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,31 +37,20 @@ + - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -86,26 +75,14 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + 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 0e0e1af8f..5f1b8fda8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + 375e4940f138725b41a8a1b75a7ceec82fe426cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + 375e4940f138725b41a8a1b75a7ceec82fe426cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + 375e4940f138725b41a8a1b75a7ceec82fe426cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + 375e4940f138725b41a8a1b75a7ceec82fe426cc https://github.com/dotnet/test-templates @@ -132,36 +132,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 883fc207bb50622d4458ff09ae6a62548783826a - + https://github.com/dotnet/fsharp - 80c165644db640d0f309affe0daa281c7e17b939 + 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17 - + https://github.com/dotnet/fsharp - 80c165644db640d0f309affe0daa281c7e17b939 + 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17 - + https://github.com/microsoft/vstest - c4d80397805bec06b354d20aeb1773e243c6add0 + 910ca0dcc779068418464794f5af570eda195222 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://github.com/dotnet/roslyn - 1f9b00a8865f2b30d14ff2012b00f4ce5ddc1086 + 9e9c7c1d223bcc6ff6922fd6792d9dfff9cd71ad - + 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 eee79dcbf..13d3813b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ 8 0 - 3 - 06 + 4 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -25,7 +25,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 29)) + $([MSBuild]::Add($(VersionFeature), 32)) 20 @@ -78,16 +78,16 @@ - 8.0.304 - 8.0.304-servicing.24369.9 - 8.0.304-servicing.24369.9 + 8.0.400 + 8.0.400-rtm.24374.10 + 8.0.400-rtm.24374.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24365.5 + 4.11.0-3.24365.8 @@ -122,11 +122,11 @@ - 6.10.0-preview.2.97 + 6.11.0-rc.122 - 17.10.4 + 17.11.3 @@ -189,7 +189,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24317-02 + 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 @@ - - - - - - - - + + + + + + + + - - + +