Skip to content

[release/6.0] Expand System.Runtime.InteropServices.NFloat to support the APIs required by Xamarin #64556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
safern merged 13 commits into from
Feb 11, 2022
Merged

[release/6.0] Expand System.Runtime.InteropServices.NFloat to support the APIs required by Xamarin #64556

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a77af35
Expand System.Runtime.InteropServices.NFloat to support the APIs requ…
tannergooding Jan 24, 2022
4c75ac3
Apply suggestions from code review
tannergooding Jan 25, 2022
f56dced
Adding NFloat tests (p1)
tannergooding Jan 26, 2022
57eb8ed
Temporarily disable negative conversions involving nfloat->nint
tannergooding Jan 27, 2022
a33d524
Adjusting the skip condition for the Mono failures
tannergooding Jan 27, 2022
0cf315d
Adding additional tests covering the NFloat.Is* APIs
tannergooding Jan 27, 2022
96b9ac0
Fixing the IsNormal and IsSubnormal test to account for 64-bit vs 32-bit
tannergooding Jan 27, 2022
7ae9004
Adding a System.Runtime.InteropServices.Experimental package that ove…
tannergooding Feb 1, 2022
fb7f17b
Ensure the test project is using the right path
tannergooding Feb 4, 2022
c6fc8ae
Ensure that the right reference assembly is referenced for the tests
tannergooding Feb 10, 2022
ddb89e4
Include IsNetCoreAppRef in assembly version calculation for servicing
tannergooding Feb 11, 2022
8939775
Ensure NuGet doesn't warn for reference only assembly
tannergooding Feb 11, 2022
d138240
Rename to System.Runtime.InteropServices.NFloat.Internal and ensure t…
tannergooding Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Include IsNetCoreAppRef in assembly version calculation for servicing
  • Loading branch information
@tannergooding
tannergooding committed Feb 11, 2022
commit ddb89e435b585026455f8b008c0c0c82b8bcf664
8 changes: 4 additions & 4 deletions eng/packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<DisablePackageBaselineValidation Condition="'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">6.0.0</PackageValidationBaselineVersion>
<!-- PackDependsOn is the right hook in a targets file if the NuGet.Build.Tasks.Pack nuget package is used, otherwise
BeforePack must be used. Setting both to ensure that we are always running before other targets. -->
BeforePack must be used. Setting both to ensure that we are always running before other targets. -->
<PackDependsOn>AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(PackDependsOn)</PackDependsOn>
<BeforePack>AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(BeforePack)</BeforePack>
<SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludePrivateProjectReferencesWithPackAttributeInPackage</TargetsForTfmSpecificContentInPackage>
<TargetsForTfmSpecificDebugSymbolsInPackage>$(TargetsForTfmSpecificDebugSymbolsInPackage);AddRuntimeSpecificSymbolToPackage</TargetsForTfmSpecificDebugSymbolsInPackage>
<IncludeBuildOutput Condition="'$(TargetsAnyOS)' != 'true' or '$(ExcludeFromPackage)' == 'true'">false</IncludeBuildOutput>
<IncludeBuildOutput Condition="'$(TargetsAnyOS)' != 'true' or '$(ExcludeFromPackage)' == 'true'">false</IncludeBuildOutput>
<!-- Don't include target platform specific dependencies, since we use the target platform to represent RIDs instead -->
<SuppressDependenciesWhenPacking Condition="'$(ExcludeFromPackage)' == 'true' or ('$(TargetsAnyOS)' != 'true' and $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0')))">true</SuppressDependenciesWhenPacking>
<PackageDesignerMarkerFile>$(MSBuildThisFileDirectory)useSharedDesignerContext.txt</PackageDesignerMarkerFile>
Expand Down Expand Up @@ -54,7 +54,7 @@
<Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version>
<_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
<_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(IsNetCoreAppRef)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
<!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
<AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
</PropertyGroup>
Expand Down Expand Up @@ -276,7 +276,7 @@
</ItemGroup>
</Target>

<Target Name="ValidateAssemblyVersionsInRefPack"
<Target Name="ValidateAssemblyVersionsInRefPack"
Condition="'$(SkipValidateAssemblyVersion)' != 'true' and '$(_AssemblyInTargetingPack)' == 'true' and '$(PreReleaseVersionLabel)' == 'servicing'"
AfterTargets="CoreCompile" >
<Error Condition="'$(AssemblyVersion)' != '$(LastReleasedStableAssemblyVersion)'" Text="AssemblyVersion should match last released assembly version $(LastReleasedStableAssemblyVersion)" />
Expand Down