Fix FXVersion.ToString, and test checking manifest version

dotnet · Apr 30, 2021 · ff83aa9 · ff83aa9
1 parent be21df6
commit ff83aa9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);