diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props index 7c204fad33abc..44f9452dad04e 100644 --- a/eng/Directory.Packages.props +++ b/eng/Directory.Packages.props @@ -21,7 +21,7 @@ 8.0.0 2.4.1 2.1.0 - 17.9.43-preview-1 + 17.10.22-preview-1 - + @@ -88,34 +88,32 @@ - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + - - - - - diff --git a/eng/generate-vssdk-versions.csx b/eng/generate-vssdk-versions.csx index ceacfcaa4fd8f..00418d83313e0 100644 --- a/eng/generate-vssdk-versions.csx +++ b/eng/generate-vssdk-versions.csx @@ -30,7 +30,7 @@ if (!File.Exists(vssdkPackageSpecPath)) var vssdkPackageSpec = XDocument.Parse(File.ReadAllText(vssdkPackageSpecPath)); -var properties = new List(); +var properties = new List<(string packageId, string version)>(); foreach (var node in vssdkPackageSpec.Descendants()) { @@ -44,6 +44,7 @@ foreach (var node in vssdkPackageSpec.Descendants()) if (!id.StartsWith("Microsoft.VisualStudio") && !id.StartsWith("Microsoft.ServiceHub") && + !id.StartsWith("Microsoft.Build") && id != "Newtonsoft.Json" && id != "StreamJsonRpc" && id != "Nerdbank.Streams") @@ -56,15 +57,31 @@ foreach (var node in vssdkPackageSpec.Descendants()) continue; } - properties.Add($""); + properties.Add((id, version)); } } properties.Sort(); -foreach (var property in properties) +var seenMsbuild = false; +foreach (var (id, version) in properties) { - Console.WriteLine(property); + if (!id.StartsWith("Microsoft.Build")) + { + Console.WriteLine($""); + } + else if (!seenMsbuild) + { + Console.WriteLine($$""" + + + + + + """); + + seenMsbuild = true; + } } return 0;