From ff83aa94bf14c53909a8cb9eabc808392fd8e3a0 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 30 Apr 2021 16:18:09 -0700 Subject: [PATCH] Fix FXVersion.ToString, and test checking manifest version --- .../Microsoft.DotNet.MSBuildSdkResolver/FXVersion.cs | 6 +++--- .../ManifestTests.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/FXVersion.cs b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/FXVersion.cs index 670ed2ba6be2..2c662f47fcfd 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/FXVersion.cs +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/FXVersion.cs @@ -320,9 +320,9 @@ public override string ToString() => (!string.IsNullOrEmpty(Pre), !string.IsNullOrEmpty(Build)) switch { (false, false) => $"{Major}.{Minor}.{Patch}", - (true, false) => $"{Major}.{Minor}.{Patch}-{Pre}", - (false, true) => $"{Major}.{Minor}.{Patch}+{Build}", - (true, true) => $"{Major}.{Minor}.{Patch}-{Pre}+{Build}", + (true, false) => $"{Major}.{Minor}.{Patch}{Pre}", + (false, true) => $"{Major}.{Minor}.{Patch}{Build}", + (true, true) => $"{Major}.{Minor}.{Patch}{Pre}{Build}", }; } } diff --git a/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/ManifestTests.cs b/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/ManifestTests.cs index 3b7d18f53ac7..8e92d87b7722 100644 --- a/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/ManifestTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/ManifestTests.cs @@ -31,7 +31,7 @@ public void ItCanDeserialize() using (FileStream fsSource = new FileStream(Path.Combine("Manifests", "Sample.json"), FileMode.Open, FileAccess.Read)) { var result = WorkloadManifestReader.ReadWorkloadManifest("Sample", fsSource); - result.Version.Should().Be("5.0.0"); + result.Version.Should().Be("5.0.0-preview1"); var xamAndroidId = new WorkloadPackId("Xamarin.Android.Sdk"); result.Packs[xamAndroidId].Id.Should().Be(xamAndroidId);