Skip to content
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

Updating the repo to use .NET 5.0 #69

Merged
merged 5 commits into from
May 22, 2020
Merged

Updating the repo to use .NET 5.0 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85b9440
Updating dependencies to their latest versions
tannergooding May 19, 2020
0a4ec39
Updating to release/5.0.1xx-preview4 of the .NET SDK
tannergooding May 19, 2020
033db5b
Changing the target framework from netcoreapp5.0 to net5.0
tannergooding May 19, 2020
c0c7534
Updating the generation.rsp files to use preview-codegen-nint
tannergooding May 22, 2020
0b042dc
Regenerating the various header files to use nint and nuint
tannergooding May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

<!-- Package versions for package references across all projects -->
<ItemGroup>
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.6.0-2.final" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.7.0-1.final" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageReference Update="NUnit" Version="3.12.0" />
<PackageReference Update="NUnit3TestAdapter" Version="3.16.1" />
Expand Down
11 changes: 9 additions & 2 deletions generation/shared/devpropdef/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
Equals
NotEquals
--file
shared-devpropdef.h
--headerFile
Expand All @@ -10,8 +19,6 @@ header.txt
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared
--include-directory
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um
--libraryPath
unused
--methodClassName
Windows
--namespace
Expand Down
8 changes: 7 additions & 1 deletion generation/shared/dxgi/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_dxgi_0000_0000_v0_0_c_ifspec
__MIDL_itf_dxgi_0000_0000_v0_0_s_ifspec
Expand Down Expand Up @@ -58,7 +64,7 @@ HDC__*=IntPtr
HINSTANCE__*=IntPtr
HMONITOR__*=IntPtr
HWND__*=IntPtr
SIZE_T=UIntPtr
SIZE_T=nuint
tagRECT=RECT
--traverse
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared/dxgi.h
Expand Down
8 changes: 7 additions & 1 deletion generation/shared/dxgi1_2/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_dxgi1_2_0000_0000_v0_0_c_ifspec
__MIDL_itf_dxgi1_2_0000_0000_v0_0_s_ifspec
Expand Down Expand Up @@ -51,7 +57,7 @@ HANDLE=IntPtr
HDC__*=IntPtr
HINSTANCE__*=IntPtr
HWND__*=IntPtr
SIZE_T=UIntPtr
SIZE_T=nuint
tagPOINT=POINT
tagRECT=RECT
--traverse
Expand Down
6 changes: 6 additions & 0 deletions generation/shared/dxgi1_3/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_dxgi1_3_0000_0000_v0_0_c_ifspec
__MIDL_itf_dxgi1_3_0000_0000_v0_0_s_ifspec
Expand Down
6 changes: 6 additions & 0 deletions generation/shared/dxgi1_4/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_dxgi1_4_0000_0000_v0_0_c_ifspec
__MIDL_itf_dxgi1_4_0000_0000_v0_0_s_ifspec
Expand Down
6 changes: 6 additions & 0 deletions generation/shared/dxgi1_5/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_dxgi1_5_0000_0000_v0_0_c_ifspec
__MIDL_itf_dxgi1_5_0000_0000_v0_0_s_ifspec
Expand Down
8 changes: 7 additions & 1 deletion generation/shared/dxgi1_6/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_dxgi1_6_0000_0000_v0_0_c_ifspec
__MIDL_itf_dxgi1_6_0000_0000_v0_0_s_ifspec
Expand Down Expand Up @@ -44,7 +50,7 @@ HANDLE=IntPtr
HINSTANCE__*=IntPtr
HMONITOR__*=IntPtr
HWND__*=IntPtr
SIZE_T=UIntPtr
SIZE_T=nuint
tagRECT=RECT
--traverse
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared/dxgi1_6.h
Expand Down
6 changes: 6 additions & 0 deletions generation/shared/dxgicommon/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--file
shared-dxgicommon.h
--headerFile
Expand Down
1 change: 1 addition & 0 deletions generation/shared/dxgiformat/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
-m32
--config
multi-file
preview-codegen-nint
--file
shared-dxgiformat.h
--headerFile
Expand Down
6 changes: 6 additions & 0 deletions generation/shared/dxgitype/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--file
shared-dxgitype.h
--headerFile
Expand Down
13 changes: 11 additions & 2 deletions generation/shared/hidclass/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
GUID_DEVINTERFACE_HID
GUID_HID_INTERFACE_NOTIFY
GUID_HID_INTERFACE_HIDPARSE
--file
shared-hidclass.h
--headerFile
Expand All @@ -10,15 +20,14 @@ header.txt
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared
--include-directory
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um
--libraryPath
hid
--methodClassName
Windows
--namespace
TerraFX.Interop
--output
../../../sources/Interop/Windows/shared/hidclass
--remap
_GUID=Guid
_HID_COLLECTION_INFORMATION=HID_COLLECTION_INFORMATION
_HID_DRIVER_CONFIG=HID_DRIVER_CONFIG
_HID_XFER_PACKET=HID_XFER_PACKET
Expand Down
8 changes: 6 additions & 2 deletions generation/shared/hidpi/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
_HIDP_PREPARSED_DATA
--file
Expand All @@ -12,8 +18,6 @@ header.txt
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared
--include-directory
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um
--libraryPath
hid
--methodClassName
Hid
--namespace
Expand Down
8 changes: 6 additions & 2 deletions generation/shared/hidsdi/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
_HIDP_PREPARSED_DATA
--file
Expand All @@ -12,8 +18,6 @@ header.txt
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared
--include-directory
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um
--libraryPath
hid
--methodClassName
Hid
--namespace
Expand Down
6 changes: 6 additions & 0 deletions generation/shared/tvout/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--define-macro
NOSYSPARAMSINFO
--file
Expand Down
6 changes: 6 additions & 0 deletions generation/um/DXGIMessages/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--file
um-DXGIMessages.h
--headerFile
Expand Down
6 changes: 6 additions & 0 deletions generation/um/ObjIdlbase/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
__MIDL_itf_objidlbase_0000_0000_v0_0_c_ifspec
__MIDL_itf_objidlbase_0000_0000_v0_0_s_ifspec
Expand Down
8 changes: 7 additions & 1 deletion generation/um/SetupAPI/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--file
um-SetupAPI.h
--headerFile
Expand Down Expand Up @@ -97,7 +103,7 @@ HKEY__*=IntPtr
HICON__=IntPtr
HINSTANCE__*=IntPtr
HWND__*=IntPtr
ULONG_PTR=UIntPtr
ULONG_PTR=nuint
tagRECT=RECT
--traverse
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/SetupAPI.h
Expand Down
8 changes: 7 additions & 1 deletion generation/um/SoftPub/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--file
um-SoftPub.h
--headerFile
Expand Down Expand Up @@ -39,7 +45,7 @@ CONFIG_CI_PROV_INFO_RESULT_=CONFIG_CI_PROV_INFO_RESULT
DRIVER_VER_INFO_=DRIVER_VER_INFO
DRIVER_VER_MAJORMINOR_=DRIVER_VER_MAJORMINOR
HANDLE=IntPtr
ULONG_PTR=UIntPtr
ULONG_PTR=nuint
--traverse
C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/SoftPub.h
--with-callconv
Expand Down
6 changes: 6 additions & 0 deletions generation/um/WinBase/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
unsigned long long _InterlockedIncrement(volatile unsigned long long *)
unsigned long long _InterlockedDecrement(volatile unsigned long long *)
Expand Down
6 changes: 6 additions & 0 deletions generation/um/WinTrust/generate.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
--additional
-m32
-Wno-expansion-to-defined
-Wno-ignored-attributes
-Wno-ignored-pragma-intrinsic
-Wno-nonportable-include-path
-Wno-pragma-pack
--config
multi-file
preview-codegen-nint
--exclude
SIP_DISPATCH_INFO_
SIP_INDIRECT_DATA_
Expand Down
Loading