Remove a couple WinRT types that cause heavy conflicts and have a 1-t…

…o-1 with a builtin BCL type
terrafx · Dec 26, 2023 · 2cce2ee · 2cce2ee
1 parent fd330eb
commit 2cce2ee
Show file tree

Hide file tree

Showing 177 changed files with 664 additions and 798 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -47,7 +47,7 @@
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>TerraFX.Interop.Windows</Product>
     <RootNamespace>TerraFX.Interop</RootNamespace>
-    <VersionPrefix>10.0.22621.3</VersionPrefix>
+    <VersionPrefix>10.0.22621.4</VersionPrefix>
     <VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
     <VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
   </PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,8 +12,8 @@
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="NUnit" Version="4.0.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/generation/WinRT/winrt/windows.foundation.numerics/generate.rsp b/generation/WinRT/winrt/windows.foundation.numerics/generate.rsp
@@ -1,6 +1,13 @@
 @../../../settings.rsp
 @../../../remap.rsp
 --exclude
+ABI::Windows::Foundation::Numerics::Matrix3x2
+ABI::Windows::Foundation::Numerics::Matrix4x4
+ABI::Windows::Foundation::Numerics::Plane
+ABI::Windows::Foundation::Numerics::Quaternion
+ABI::Windows::Foundation::Numerics::Vector2
+ABI::Windows::Foundation::Numerics::Vector3
+ABI::Windows::Foundation::Numerics::Vector4
 CHECK_NS_PREFIX_STATE
 DEPRECATEDENUMERATOR
 WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION

diff --git a/generation/WinRT/winrt/windows.foundation/generate.rsp b/generation/WinRT/winrt/windows.foundation/generate.rsp
@@ -20,6 +20,7 @@ ABI::Windows::Foundation::Collections::IVectorView<ABI::Windows::Foundation::IWw
 ABI::Windows::Foundation::Collections::MapChangedEventHandler<HSTRING__ *, HSTRING__ *>
 ABI::Windows::Foundation::Collections::MapChangedEventHandler<HSTRING__ *, IInspectable *>
 ABI::Windows::Foundation::ITypedEventHandler<ABI::Windows::Foundation::IMemoryBufferReference *, IInspectable *>
+ABI::Windows::Foundation::TimeSpan
 CHECK_NS_PREFIX_STATE
 DEPRECATEDENUMERATOR
 IID_IAsyncAction

diff --git a/generation/remap-namespaces.rsp b/generation/remap-namespaces.rsp
@@ -359,6 +359,8 @@ LVS=TerraFX.Interop.Windows
 LWA=TerraFX.Interop.Windows
 MA=TerraFX.Interop.Windows
 MARK=TerraFX.Interop.Windows
+Matrix3x2=System.Numerics
+Matrix4x4=System.Numerics
 MAX=TerraFX.Interop.Windows
 MAXIMUM=TerraFX.Interop.Windows
 MB=TerraFX.Interop.Windows
@@ -456,6 +458,7 @@ PKCS12=TerraFX.Interop.Windows
 PKCS=TerraFX.Interop.Windows
 PKEY=TerraFX.Interop.Windows
 PLA=TerraFX.Interop.Windows
+Plane=System.Numerics
 PM=TerraFX.Interop.Windows
 POINT=TerraFX.Interop.Windows
 POINTER=TerraFX.Interop.Windows
@@ -478,6 +481,7 @@ PSN=TerraFX.Interop.Windows
 PSP=TerraFX.Interop.Windows
 PST=TerraFX.Interop.Windows
 QS=TerraFX.Interop.Windows
+Quaternion=System.Numerics
 QUERY=TerraFX.Interop.Windows
 R2=TerraFX.Interop.Windows
 RB=TerraFX.Interop.Windows
@@ -606,6 +610,7 @@ TD=TerraFX.Interop.Windows
 TF=TerraFX.Interop.Windows
 THREAD=TerraFX.Interop.Windows
 TIME=TerraFX.Interop.Windows
+TimeSpan=System
 TIMESTAMP=TerraFX.Interop.Windows
 TLS1=TerraFX.Interop.Windows
 TME=TerraFX.Interop.Windows
@@ -640,6 +645,9 @@ URLACTION=TerraFX.Interop.Windows
 URLPOLICY=TerraFX.Interop.Windows
 USN=TerraFX.Interop.Windows
 UTC=TerraFX.Interop.Windows
+Vector2=System.Numerics
+Vector3=System.Numerics
+Vector4=System.Numerics
 VER=TerraFX.Interop.Windows
 VIEW=TerraFX.Interop.Windows
 VK=TerraFX.Interop.Windows

diff --git a/generation/remap-types.rsp b/generation/remap-types.rsp
@@ -11,6 +11,7 @@ ABI::Windows::Foundation::Collections::IVector=IVector
 ABI::Windows::Foundation::Collections::IVectorView=IVectorView
 ABI::Windows::Foundation::Collections::MapChangedEventHandler=MapChangedEventHandler
 ABI::Windows::Foundation::Collections::VectorChangedEventHandler=VectorChangedEventHandler
+ABI::Windows::Foundation::DateTime=WinRTDateTime
 ABI::Windows::Foundation::IAsyncActionProgressHandler=IAsyncActionProgressHandler
 ABI::Windows::Foundation::IAsyncActionWithProgress=IAsyncActionWithProgress
 ABI::Windows::Foundation::IAsyncActionWithProgressCompletedHandler=IAsyncActionWithProgressCompletedHandler

diff --git a/...ndows.applicationmodel.activation/IAppointmentsProviderShowTimeFrameActivatedEventArgs.cs b/...ndows.applicationmodel.activation/IAppointmentsProviderShowTimeFrameActivatedEventArgs.cs
@@ -74,9 +74,9 @@ public HRESULT GetTrustLevel(TrustLevel* trustLevel)
     /// <include file='IAppointmentsProviderShowTimeFrameActivatedEventArgs.xml' path='doc/member[@name="IAppointmentsProviderShowTimeFrameActivatedEventArgs.get_TimeToShow"]/*' />
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [VtblIndex(6)]
-    public HRESULT get_TimeToShow([NativeTypeName("ABI::Windows::Foundation::DateTime *")] DateTime* value)
+    public HRESULT get_TimeToShow([NativeTypeName("ABI::Windows::Foundation::DateTime *")] WinRTDateTime* value)
     {
-        return ((delegate* unmanaged[MemberFunction]<IAppointmentsProviderShowTimeFrameActivatedEventArgs*, DateTime*, int>)(lpVtbl[6]))((IAppointmentsProviderShowTimeFrameActivatedEventArgs*)Unsafe.AsPointer(ref this), value);
+        return ((delegate* unmanaged[MemberFunction]<IAppointmentsProviderShowTimeFrameActivatedEventArgs*, WinRTDateTime*, int>)(lpVtbl[6]))((IAppointmentsProviderShowTimeFrameActivatedEventArgs*)Unsafe.AsPointer(ref this), value);
     }
 
     /// <include file='IAppointmentsProviderShowTimeFrameActivatedEventArgs.xml' path='doc/member[@name="IAppointmentsProviderShowTimeFrameActivatedEventArgs.get_Duration"]/*' />
@@ -90,7 +90,7 @@ public HRESULT get_Duration([NativeTypeName("ABI::Windows::Foundation::TimeSpan
     public interface Interface : IInspectable.Interface
     {
         [VtblIndex(6)]
-        HRESULT get_TimeToShow([NativeTypeName("ABI::Windows::Foundation::DateTime *")] DateTime* value);
+        HRESULT get_TimeToShow([NativeTypeName("ABI::Windows::Foundation::DateTime *")] WinRTDateTime* value);
 
         [VtblIndex(7)]
         HRESULT get_Duration([NativeTypeName("ABI::Windows::Foundation::TimeSpan *")] TimeSpan* value);
@@ -118,7 +118,7 @@ public partial struct Vtbl<TSelf>
         public delegate* unmanaged[MemberFunction]<TSelf*, TrustLevel*, int> GetTrustLevel;
 
         [NativeTypeName("HRESULT (ABI::Windows::Foundation::DateTime *) __attribute__((stdcall))")]
-        public delegate* unmanaged[MemberFunction]<TSelf*, DateTime*, int> get_TimeToShow;
+        public delegate* unmanaged[MemberFunction]<TSelf*, WinRTDateTime*, int> get_TimeToShow;
 
         [NativeTypeName("HRESULT (ABI::Windows::Foundation::TimeSpan *) __attribute__((stdcall))")]
         public delegate* unmanaged[MemberFunction]<TSelf*, TimeSpan*, int> get_Duration;

diff --git a/sources/Interop/Windows/WinRT/winrt/windows.applicationmodel.appointments/IAppointment.cs b/sources/Interop/Windows/WinRT/winrt/windows.applicationmodel.appointments/IAppointment.cs
@@ -74,17 +74,17 @@ public HRESULT GetTrustLevel(TrustLevel* trustLevel)
     /// <include file='IAppointment.xml' path='doc/member[@name="IAppointment.get_StartTime"]/*' />
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [VtblIndex(6)]
-    public HRESULT get_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime *")] DateTime* value)
+    public HRESULT get_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime *")] WinRTDateTime* value)
     {
-        return ((delegate* unmanaged[MemberFunction]<IAppointment*, DateTime*, int>)(lpVtbl[6]))((IAppointment*)Unsafe.AsPointer(ref this), value);
+        return ((delegate* unmanaged[MemberFunction]<IAppointment*, WinRTDateTime*, int>)(lpVtbl[6]))((IAppointment*)Unsafe.AsPointer(ref this), value);
     }
 
     /// <include file='IAppointment.xml' path='doc/member[@name="IAppointment.put_StartTime"]/*' />
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [VtblIndex(7)]
-    public HRESULT put_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime")] DateTime value)
+    public HRESULT put_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime")] WinRTDateTime value)
     {
-        return ((delegate* unmanaged[MemberFunction]<IAppointment*, DateTime, int>)(lpVtbl[7]))((IAppointment*)Unsafe.AsPointer(ref this), value);
+        return ((delegate* unmanaged[MemberFunction]<IAppointment*, WinRTDateTime, int>)(lpVtbl[7]))((IAppointment*)Unsafe.AsPointer(ref this), value);
     }
 
     /// <include file='IAppointment.xml' path='doc/member[@name="IAppointment.get_Duration"]/*' />
@@ -274,10 +274,10 @@ public HRESULT put_Uri([NativeTypeName("ABI::Windows::Foundation::IUriRuntimeCla
     public interface Interface : IInspectable.Interface
     {
         [VtblIndex(6)]
-        HRESULT get_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime *")] DateTime* value);
+        HRESULT get_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime *")] WinRTDateTime* value);
 
         [VtblIndex(7)]
-        HRESULT put_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime")] DateTime value);
+        HRESULT put_StartTime([NativeTypeName("ABI::Windows::Foundation::DateTime")] WinRTDateTime value);
 
         [VtblIndex(8)]
         HRESULT get_Duration([NativeTypeName("ABI::Windows::Foundation::TimeSpan *")] TimeSpan* value);
@@ -371,10 +371,10 @@ public partial struct Vtbl<TSelf>
         public delegate* unmanaged[MemberFunction]<TSelf*, TrustLevel*, int> GetTrustLevel;
 
         [NativeTypeName("HRESULT (ABI::Windows::Foundation::DateTime *) __attribute__((stdcall))")]
-        public delegate* unmanaged[MemberFunction]<TSelf*, DateTime*, int> get_StartTime;
+        public delegate* unmanaged[MemberFunction]<TSelf*, WinRTDateTime*, int> get_StartTime;
 
         [NativeTypeName("HRESULT (ABI::Windows::Foundation::DateTime) __attribute__((stdcall))")]
-        public delegate* unmanaged[MemberFunction]<TSelf*, DateTime, int> put_StartTime;
+        public delegate* unmanaged[MemberFunction]<TSelf*, WinRTDateTime, int> put_StartTime;
 
         [NativeTypeName("HRESULT (ABI::Windows::Foundation::TimeSpan *) __attribute__((stdcall))")]
         public delegate* unmanaged[MemberFunction]<TSelf*, TimeSpan*, int> get_Duration;