You've already forked linux-packaging-mono
							
							Imported Upstream version 5.4.0.167
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
		
						parent
						
							e49d6f06c0
						
					
				
				
					commit
					536cd135cc
				
			| @@ -2,9 +2,9 @@ | ||||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||
|   <Import Project="..\dir.props" /> | ||||
|   <PropertyGroup> | ||||
|     <AssemblyVersion>4.1.3.0</AssemblyVersion> | ||||
|     <AssemblyVersion>4.1.4.0</AssemblyVersion> | ||||
|     <AssemblyKey>MSFT</AssemblyKey> | ||||
|     <IsNETCoreApp>true</IsNETCoreApp> | ||||
|     <IsDesktopFacade>true</IsDesktopFacade> | ||||
|     <IsUAP>true</IsUAP> | ||||
|   </PropertyGroup> | ||||
| </Project> | ||||
| @@ -15,8 +15,8 @@ | ||||
|     <ProjectReference Include="..\src\System.Numerics.Vectors.csproj" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <InboxOnTargetFramework Include="netstandard2.0" /> | ||||
|     <InboxOnTargetFramework Include="netcoreapp2.0" /> | ||||
|     <InboxOnTargetFramework Include="uap10.1" /> | ||||
|     <InboxOnTargetFramework Include="MonoAndroid10" /> | ||||
|     <InboxOnTargetFramework Include="MonoTouch10" /> | ||||
|     <InboxOnTargetFramework Include="xamarinios10" /> | ||||
|   | ||||
| @@ -4,12 +4,12 @@ | ||||
|     <PackageConfigurations> | ||||
|       netstandard1.0; | ||||
|       netstandard; | ||||
|       net46; | ||||
|     </PackageConfigurations> | ||||
|     <BuildConfigurations> | ||||
|       netcoreapp; | ||||
|       uap; | ||||
|       netfx; | ||||
|       net46; | ||||
|       $(PackageConfigurations); | ||||
|     </BuildConfigurations> | ||||
|   </PropertyGroup> | ||||
|   | ||||
| @@ -3,6 +3,7 @@ | ||||
|   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | ||||
|   <PropertyGroup> | ||||
|     <ProjectGuid>{650277B5-9423-4ACE-BB54-2659995B21C7}</ProjectGuid> | ||||
|     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Debug|AnyCPU'" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Release|AnyCPU'" /> | ||||
| @@ -21,6 +22,7 @@ | ||||
|   </ItemGroup> | ||||
|   <ItemGroup Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'"> | ||||
|     <Reference Include="mscorlib" /> | ||||
|     <Reference Include="System.Numerics" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'"> | ||||
|     <Reference Include="System.Runtime" /> | ||||
|   | ||||
| @@ -1 +1 @@ | ||||
| fbe9c695aecd020dd847e868fad5ddb79cceb71a | ||||
| 237b963749824233099ea81480d1ee87e2859f47 | ||||
| @@ -567,17 +567,17 @@ namespace System.Numerics.Tests | ||||
|                 }); | ||||
|         } | ||||
|  | ||||
|         [ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513 | ||||
|         [Fact] | ||||
|         public void DivisionByZeroExceptionByte() { TestDivisionByZeroException<Byte>(); } | ||||
|         [ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513 | ||||
|         [Fact] | ||||
|         public void DivisionByZeroExceptionSByte() { TestDivisionByZeroException<SByte>(); } | ||||
|         [ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513 | ||||
|         [Fact] | ||||
|         public void DivisionByZeroExceptionUInt16() { TestDivisionByZeroException<UInt16>(); } | ||||
|         [ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513 | ||||
|         [Fact] | ||||
|         public void DivisionByZeroExceptionInt16() { TestDivisionByZeroException<Int16>(); } | ||||
|         [ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513 | ||||
|         [Fact] | ||||
|         public void DivisionByZeroExceptionInt32() { TestDivisionByZeroException<Int32>(); } | ||||
|         [ConditionalFact(nameof(PlatformDetection) + "." + nameof(PlatformDetection.IsNotWindowsSubsystemForLinux))] // https://github.com/Microsoft/BashOnWindows/issues/513 | ||||
|         [Fact] | ||||
|         public void DivisionByZeroExceptionInt64() { TestDivisionByZeroException<Int64>(); } | ||||
|         private void TestDivisionByZeroException<T>() where T : struct | ||||
|         { | ||||
|   | ||||
| @@ -1 +1 @@ | ||||
| de98b6f9c40544439b0502c790590dd4f817f944 | ||||
| 1ffa6b5773f1d8097092e8df3bf73f15576ccbdb | ||||
| @@ -364,6 +364,9 @@ namespace System.Numerics.Tests | ||||
|  | ||||
|         // A test to make sure the fields are laid out how we expect | ||||
|         [Fact] | ||||
| #if MONO | ||||
|         [ActiveIssue("https://bugzilla.xamarin.com/show_bug.cgi?id=57336")] | ||||
| #endif | ||||
|         public unsafe void PlaneFieldOffsetTest() | ||||
|         { | ||||
|             Plane plane = new Plane(); | ||||
|   | ||||
| @@ -18,6 +18,7 @@ namespace System.Numerics.Tests | ||||
|         } | ||||
|  | ||||
|         [Fact] | ||||
|         [ActiveIssue("TFS 444567 - Codegen optimization issue", TargetFrameworkMonikers.UapAot)] | ||||
|         public void Vector2CopyToTest() | ||||
|         { | ||||
|             Vector2 v1 = new Vector2(2.0f, 3.0f); | ||||
| @@ -488,7 +489,7 @@ namespace System.Numerics.Tests | ||||
|             Vector2 actual; | ||||
|  | ||||
|             actual = Vector2.TransformNormal(v, m); | ||||
|             Assert.Equal(expected, actual); | ||||
|             Assert.True(MathHelper.Equal(expected, actual), "Vector2f.Tranform did not return the expected value."); | ||||
|         } | ||||
|  | ||||
|         // A test for TransformNormal (Vector2f, Matrix3x2) | ||||
| @@ -504,7 +505,7 @@ namespace System.Numerics.Tests | ||||
|             Vector2 actual; | ||||
|  | ||||
|             actual = Vector2.TransformNormal(v, m); | ||||
|             Assert.Equal(expected, actual); | ||||
|             Assert.True(MathHelper.Equal(expected, actual), "Vector2f.Transform did not return the expected value."); | ||||
|         } | ||||
|  | ||||
|         // A test for Transform (Vector2f, Quaternion) | ||||
| @@ -1128,6 +1129,9 @@ namespace System.Numerics.Tests | ||||
|  | ||||
|         // A test to make sure these types are blittable directly into GPU buffer memory layouts | ||||
|         [Fact] | ||||
| #if MONO | ||||
|         [ActiveIssue("https://bugzilla.xamarin.com/show_bug.cgi?id=57336")] | ||||
| #endif | ||||
|         public unsafe void Vector2SizeofTest() | ||||
|         { | ||||
|             Assert.Equal(8, sizeof(Vector2)); | ||||
|   | ||||
| @@ -1145,6 +1145,9 @@ namespace System.Numerics.Tests | ||||
|  | ||||
|         // A test to make sure these types are blittable directly into GPU buffer memory layouts | ||||
|         [Fact] | ||||
| #if MONO | ||||
|         [ActiveIssue("https://bugzilla.xamarin.com/show_bug.cgi?id=57336")] | ||||
| #endif | ||||
|         public unsafe void Vector3SizeofTest() | ||||
|         { | ||||
|             Assert.Equal(12, sizeof(Vector3)); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user