Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed

xamarin · Apr 13, 2021 · a1242da · a1242da · vs-mobiletools-engineering-service2 · Apr 13, 2021
2 parents 27e8d31 + c423a62
commit a1242da
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,13 +4,13 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>ae55aee247b7aeb1fef48a3fb1c8b4f6112a2fb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21205.2">
+    <Dependency Name="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21212.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>388fef00320370785b08bbc42dda4a87f3fa38ab</Sha>
+      <Sha>6bfa2c0657d2dcfd6dce684ab34b470ce567631a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21205.2">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21212.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>388fef00320370785b08bbc42dda4a87f3fa38ab</Sha>
+      <Sha>6bfa2c0657d2dcfd6dce684ab34b470ce567631a</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -2,7 +2,7 @@
   <!--Package versions-->
   <PropertyGroup>
     <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21210.1</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkPackageVersion>6.0.100-preview.2.21205.2</MicrosoftNETILLinkPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.2.21205.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkPackageVersion>6.0.100-preview.2.21212.1</MicrosoftNETILLinkPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.2.21212.1</MicrosoftNETILLinkTasksPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/tests/common/PlatformInfo.cs b/tests/common/PlatformInfo.cs
@@ -125,8 +125,11 @@ public static AvailabilityBaseAttribute Convert (this OSPlatformAttribute a)
 			}
 			bool versioned = Version.TryParse (a.PlatformName [n..], out var v);
 
-			if (a is SupportedOSPlatformAttribute)
+			if (a is SupportedOSPlatformAttribute) {
+				if (!versioned)
+					throw new FormatException (a.PlatformName);
 				return new IntroducedAttribute (p, v.Major, v.Minor);
+			}
 			if (a is UnsupportedOSPlatformAttribute) {
 				// if a version is provided then it means it was deprecated
 				// if no version is provided then it means it's unavailable