Skip to content

Commit

Permalink
Merge pull request #332 from tannergooding/10.0.20348.4
Browse files Browse the repository at this point in the history 
Updating the projects to support .NET 7
  • Loading branch information
@tannergooding
tannergooding authored Oct 9, 2022
2 parents ce500b4 + 2cff65b commit f962f52
Show file tree
Hide file tree
Showing 4,893 changed files with 23,947 additions and 7,060 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
<Product>TerraFX.Interop.Windows</Product>
<RootNamespace>TerraFX.Interop</RootNamespace>
<VersionPrefix>10.0.20348.3</VersionPrefix>
<VersionPrefix>10.0.20348.4</VersionPrefix>
<VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
<VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion generation/remap-types.rsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5558,4 +5558,4 @@ __NCRYPT_PCP_TPM_WEB_AUTHN_ATTESTATION_STATEMENT=NCRYPT_PCP_TPM_WEB_AUTHN_ATTEST
__NCRYPT_SUPPORTED_LENGTHS=NCRYPT_SUPPORTED_LENGTHS
__NCRYPT_UI_POLICY=NCRYPT_UI_POLICY
__NSConstantString_tag=__NSConstantString
__PUBLIC_OBJECT_TYPE_INFORMATION=PUBLIC_OBJECT_TYPE_INFORMATIO
__PUBLIC_OBJECT_TYPE_INFORMATION=PUBLIC_OBJECT_TYPE_INFORMATION
2 changes: 2 additions & 0 deletions generation/settings.rsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ generate-aggressive-inlining
generate-cpp-attributes
generate-doc-includes
generate-file-scoped-namespaces
generate-guid-member
generate-macro-bindings
generate-marker-interfaces
generate-native-inheritance-attribute
Expand All @@ -27,6 +28,7 @@ generate-unmanaged-constants
generate-vtbl-index-attribute
log-potential-typedef-remappings
multi-file
preview-codegen
trimmable-vtbls
--define-macro
GDIPVER=0x0110
Expand Down
2 changes: 1 addition & 1 deletion samples/DirectX/TerraFX.Samples.DirectX.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/WinForms/TerraFX.Samples.WinForms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions scripts/build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ try {
Create-Directory -Path $DotNetInstallDirectory

& $DotNetInstallScript -Channel 6.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
& $DotNetInstallScript -Channel 7.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Quality preview

$env:PATH="$DotNetInstallDirectory;$env:PATH"
}
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='ID3D11On12On7.xml' path='doc/member[@name="ID3D11On12On7"]/*' />
[Guid("00000000-0000-0000-0000-000000000000")]
[NativeTypeName("struct ID3D11On12On7 : IUnknown")]
[NativeInheritance("IUnknown")]
public unsafe partial struct ID3D11On12On7 : ID3D11On12On7.Interface
public unsafe partial struct ID3D11On12On7 : ID3D11On12On7.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_ID3D11On12On7));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='ID3D12CommandQueueDownlevel.xml' path='doc/member[@name="ID3D12CommandQueueDownlevel"]/*' />
[Guid("38A8C5EF-7CCB-4E81-914F-A6E9D072C494")]
[NativeTypeName("struct ID3D12CommandQueueDownlevel : IUnknown")]
[NativeInheritance("IUnknown")]
public unsafe partial struct ID3D12CommandQueueDownlevel : ID3D12CommandQueueDownlevel.Interface
public unsafe partial struct ID3D12CommandQueueDownlevel : ID3D12CommandQueueDownlevel.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_ID3D12CommandQueueDownlevel));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='ID3D12DeviceDownlevel.xml' path='doc/member[@name="ID3D12DeviceDownlevel"]/*' />
[Guid("74EAEE3F-2F4B-476D-82BA-2B85CB49E310")]
[NativeTypeName("struct ID3D12DeviceDownlevel : IUnknown")]
[NativeInheritance("IUnknown")]
public unsafe partial struct ID3D12DeviceDownlevel : ID3D12DeviceDownlevel.Interface
public unsafe partial struct ID3D12DeviceDownlevel : ID3D12DeviceDownlevel.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_ID3D12DeviceDownlevel));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
3 changes: 3 additions & 0 deletions sources/Interop/Windows/DirectX/other/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESC.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// Original source is Copyright © Microsoft. All rights reserved. Licensed under the MIT License (MIT).

using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
Expand Down Expand Up @@ -74,6 +75,7 @@ public partial struct _RTVFormats_e__FixedBuffer
public DXGI_FORMAT e6;
public DXGI_FORMAT e7;

[UnscopedRef]
public ref DXGI_FORMAT this[int index]
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand All @@ -84,6 +86,7 @@ public ref DXGI_FORMAT this[int index]
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[UnscopedRef]
public Span<DXGI_FORMAT> AsSpan() => MemoryMarshal.CreateSpan(ref e0, 8);
}
}
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIAdapter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIAdapter.xml' path='doc/member[@name="IDXGIAdapter"]/*' />
[Guid("2411E7E1-12AC-4CCF-BD14-9798E8534DC0")]
[NativeTypeName("struct IDXGIAdapter : IDXGIObject")]
[NativeInheritance("IDXGIObject")]
public unsafe partial struct IDXGIAdapter : IDXGIAdapter.Interface
public unsafe partial struct IDXGIAdapter : IDXGIAdapter.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIAdapter));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIAdapter1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIAdapter1.xml' path='doc/member[@name="IDXGIAdapter1"]/*' />
[Guid("29038F61-3839-4626-91FD-086879011A05")]
[NativeTypeName("struct IDXGIAdapter1 : IDXGIAdapter")]
[NativeInheritance("IDXGIAdapter")]
public unsafe partial struct IDXGIAdapter1 : IDXGIAdapter1.Interface
public unsafe partial struct IDXGIAdapter1 : IDXGIAdapter1.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIAdapter1));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIDevice.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIDevice.xml' path='doc/member[@name="IDXGIDevice"]/*' />
[Guid("54EC77FA-1377-44E6-8C32-88FD5F44C84C")]
[NativeTypeName("struct IDXGIDevice : IDXGIObject")]
[NativeInheritance("IDXGIObject")]
public unsafe partial struct IDXGIDevice : IDXGIDevice.Interface
public unsafe partial struct IDXGIDevice : IDXGIDevice.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIDevice));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIDevice1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIDevice1.xml' path='doc/member[@name="IDXGIDevice1"]/*' />
[Guid("77DB970F-6276-48BA-BA28-070143B4392C")]
[NativeTypeName("struct IDXGIDevice1 : IDXGIDevice")]
[NativeInheritance("IDXGIDevice")]
public unsafe partial struct IDXGIDevice1 : IDXGIDevice1.Interface
public unsafe partial struct IDXGIDevice1 : IDXGIDevice1.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIDevice1));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIDeviceSubObject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIDeviceSubObject.xml' path='doc/member[@name="IDXGIDeviceSubObject"]/*' />
[Guid("3D3E0379-F9DE-4D58-BB6C-18D62992F1A6")]
[NativeTypeName("struct IDXGIDeviceSubObject : IDXGIObject")]
[NativeInheritance("IDXGIObject")]
public unsafe partial struct IDXGIDeviceSubObject : IDXGIDeviceSubObject.Interface
public unsafe partial struct IDXGIDeviceSubObject : IDXGIDeviceSubObject.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIDeviceSubObject));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIFactory.xml' path='doc/member[@name="IDXGIFactory"]/*' />
[Guid("7B7166EC-21C7-44AE-B21A-C9AE321AE369")]
[NativeTypeName("struct IDXGIFactory : IDXGIObject")]
[NativeInheritance("IDXGIObject")]
public unsafe partial struct IDXGIFactory : IDXGIFactory.Interface
public unsafe partial struct IDXGIFactory : IDXGIFactory.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIFactory));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIFactory1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIFactory1.xml' path='doc/member[@name="IDXGIFactory1"]/*' />
[Guid("770AAE78-F26F-4DBA-A829-253C83D1B387")]
[NativeTypeName("struct IDXGIFactory1 : IDXGIFactory")]
[NativeInheritance("IDXGIFactory")]
public unsafe partial struct IDXGIFactory1 : IDXGIFactory1.Interface
public unsafe partial struct IDXGIFactory1 : IDXGIFactory1.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIFactory1));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIKeyedMutex.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIKeyedMutex.xml' path='doc/member[@name="IDXGIKeyedMutex"]/*' />
[Guid("9D8E1289-D7B3-465F-8126-250E349AF85D")]
[NativeTypeName("struct IDXGIKeyedMutex : IDXGIDeviceSubObject")]
[NativeInheritance("IDXGIDeviceSubObject")]
public unsafe partial struct IDXGIKeyedMutex : IDXGIKeyedMutex.Interface
public unsafe partial struct IDXGIKeyedMutex : IDXGIKeyedMutex.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIKeyedMutex));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIObject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIObject.xml' path='doc/member[@name="IDXGIObject"]/*' />
[Guid("AEC22FB8-76F3-4639-9BE0-28EB43A67A2E")]
[NativeTypeName("struct IDXGIObject : IUnknown")]
[NativeInheritance("IUnknown")]
public unsafe partial struct IDXGIObject : IDXGIObject.Interface
public unsafe partial struct IDXGIObject : IDXGIObject.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIObject));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIOutput.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIOutput.xml' path='doc/member[@name="IDXGIOutput"]/*' />
[Guid("AE02EEDB-C735-4690-8D52-5A8DC20213AA")]
[NativeTypeName("struct IDXGIOutput : IDXGIObject")]
[NativeInheritance("IDXGIObject")]
public unsafe partial struct IDXGIOutput : IDXGIOutput.Interface
public unsafe partial struct IDXGIOutput : IDXGIOutput.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIOutput));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGIResource.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGIResource.xml' path='doc/member[@name="IDXGIResource"]/*' />
[Guid("035F3AB4-482E-4E50-B41F-8A7F8BD8960B")]
[NativeTypeName("struct IDXGIResource : IDXGIDeviceSubObject")]
[NativeInheritance("IDXGIDeviceSubObject")]
public unsafe partial struct IDXGIResource : IDXGIResource.Interface
public unsafe partial struct IDXGIResource : IDXGIResource.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGIResource));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
5 changes: 4 additions & 1 deletion sources/Interop/Windows/DirectX/shared/dxgi/IDXGISurface.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TerraFX.Interop.Windows;
using static TerraFX.Interop.Windows.IID;

namespace TerraFX.Interop.DirectX;

/// <include file='IDXGISurface.xml' path='doc/member[@name="IDXGISurface"]/*' />
[Guid("CAFCB56C-6AC3-4889-BF47-9E23BBD260EC")]
[NativeTypeName("struct IDXGISurface : IDXGIDeviceSubObject")]
[NativeInheritance("IDXGIDeviceSubObject")]
public unsafe partial struct IDXGISurface : IDXGISurface.Interface
public unsafe partial struct IDXGISurface : IDXGISurface.Interface, INativeGuid
{
static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_IDXGISurface));

public void** lpVtbl;

/// <inheritdoc cref="IUnknown.QueryInterface" />
Expand Down
Loading

0 comments on commit f962f52

Please sign in to comment.