diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cf8542841ae..d1a6bbc343c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,244 +41,244 @@ https://github.com/dotnet/efcore 5d7ca16a1a6f85834a6bb44afb5979c1ea0ff47e - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb - + https://github.com/dotnet/runtime - b3a9b0b740cce9322b03200db0b4ab736d7cd12d + 0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index fe59a779e3aa..a55022d41326 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,65 +65,65 @@ --> - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 + 6.0.0-rc.2.21466.4 - 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21466.4 6.0.0-rc.2.21465.1 6.0.0-rc.2.21465.1 diff --git a/eng/tools/RepoTasks/CreateFrameworkListFile.cs b/eng/tools/RepoTasks/CreateFrameworkListFile.cs index 5772283fa6c1..0179c116fb20 100644 --- a/eng/tools/RepoTasks/CreateFrameworkListFile.cs +++ b/eng/tools/RepoTasks/CreateFrameworkListFile.cs @@ -73,15 +73,19 @@ public override bool Execute() var pathParts = path.Split('/'); - if (pathParts.Length < 3 || !pathParts[1].Equals("dotnet", StringComparison.Ordinal) || pathParts.Length > 4) + if (pathParts.Length < 3 || !pathParts[1].Equals("dotnet", StringComparison.Ordinal) || pathParts.Length > 5) { - Log.LogError($"Unexpected analyzer path format {path}. Expected 'analyzers/dotnet(/language)/analyzer.dll"); + Log.LogError($"Unexpected analyzer path format {path}. Expected 'analyzers/dotnet(/roslyn)(/language)/analyzer.dll"); } - // Check if we have enough parts for language directory and include it - if (pathParts.Length > 3) + // Check if we have enough parts for language directory and include it. + // There could be a roslyn folder before the language folder. Check for it. + bool hasRoslynVersion = pathParts[2].StartsWith("roslyn", StringComparison.Ordinal); + int languageLengthCheck = hasRoslynVersion ? 4 : 3; + int potentialLanguageIndex = hasRoslynVersion ? 3 : 2; + if (pathParts.Length > languageLengthCheck) { - element.Add(new XAttribute("Language", pathParts[2])); + element.Add(new XAttribute("Language", pathParts[potentialLanguageIndex])); } }