Merge pull request #322 from tannergooding/v10.0.20348.2

Regenerating bindings for v10.0.20348.2

.github/workflows/ci.yml

@@ -28,46 +28,6 @@ jobs:
           ./artifacts/pkg/**/*
           ./artifacts/tst/**/*
         if-no-files-found: error
-  linux-x64:
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      matrix:
-        architecture: [ x64 ]
-        configuration: [ debug, release ]
-        os: [ ubuntu ]
-    steps:
-    - uses: actions/checkout@v2
-    - run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
-      shell: bash
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
-        path: |
-          ./artifacts/bin/**/*
-          ./artifacts/log/**/*
-          ./artifacts/pkg/**/*
-          ./artifacts/tst/**/*
-        if-no-files-found: error
-  macos-x64:
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      matrix:
-        architecture: [ x64 ]
-        configuration: [ debug, release ]
-        os: [ macos ]
-    steps:
-    - uses: actions/checkout@v2
-    - run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
-      shell: bash
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
-        path: |
-          ./artifacts/bin/**/*
-          ./artifacts/log/**/*
-          ./artifacts/pkg/**/*
-          ./artifacts/tst/**/*
-        if-no-files-found: error
   build-nuget-preview:
     runs-on: windows-2022
     steps:
@@ -107,7 +67,7 @@ jobs:
   publish-nightlies-azure:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' }}
-    needs: [ windows-x64, linux-x64, macos-x64, build-nuget-preview, build-nuget-release ]
+    needs: [ windows-x64, build-nuget-preview, build-nuget-release ]
     steps:
     - uses: actions/download-artifact@v2
       with:
@@ -123,7 +83,7 @@ jobs:
   publish-nightlies-github:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' }}
-    needs: [ windows-x64, linux-x64, macos-x64, build-nuget-preview, build-nuget-release ]
+    needs: [ windows-x64, build-nuget-preview, build-nuget-release ]
     steps:
     - uses: actions/download-artifact@v2
       with:

Directory.Build.props

@@ -20,9 +20,11 @@
   <!-- Default settings that explicitly differ from the Sdk.props defaults  -->
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AnalysisLevel>preview</AnalysisLevel>
     <BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
     <DebugType>embedded</DebugType>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <Nullable>enable</Nullable>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>
@@ -44,7 +46,7 @@
     <Product>TerraFX.Interop.Windows</Product>
     <RootNamespace>TerraFX.Interop</RootNamespace>
     <VersionPrefix>10.0.20348.2</VersionPrefix>
-    <VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc3</VersionSuffix>
+    <VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
     <VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
   </PropertyGroup>
 

Directory.Build.targets

@@ -12,7 +12,7 @@
 
   <!-- Settings that append the existing setting value -->
   <PropertyGroup>
-    <NoWarn>$(NoWarn);AD0001;NU5105</NoWarn>
+    <NoWarn>$(NoWarn);AD0001;NU1507;NU5105</NoWarn>
   </PropertyGroup>
 
   <!-- Settings that are only set for CI builds -->
@@ -31,12 +31,11 @@
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
-  <!-- Package versions for package references across all projects -->
+  <!-- Assembly attributes to include for every project -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageReference Update="NUnit" Version="3.13.2" />
-    <PackageReference Update="NUnit3TestAdapter" Version="4.0.0" />
+    <AssemblyAttribute Include="System.Runtime.Versioning.SupportedOSPlatformAttribute">
+      <_Parameter1>windows7.0</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
 
 </Project>

Directory.Packages.props

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--
+    Directory.Packages.props is automatically picked up and imported by
+    Microsoft.Common.targets. This file needs to exist, even if empty so that
+    files in the parent directory tree, with the same name, are not imported
+    instead. The import fairly late and most other props/targets will have been
+    imported beforehand. We also don't need to add ourselves to
+    MSBuildAllProjects, as that is done by the file that imports us.
+  -->
+
+  <!-- Package versions for package references across all projects -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
+  </ItemGroup>
+
+</Project>

TerraFX.Interop.Windows.sln

@@ -8,24 +8,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{2F337CB6
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		build.cmd = build.cmd
-		build.sh = build.sh
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
 		LICENSE.md = LICENSE.md
 		pack.cmd = pack.cmd
-		pack.sh = pack.sh
 		restore.cmd = restore.cmd
-		restore.sh = restore.sh
 		TerraFX.snk = TerraFX.snk
 		test.cmd = test.cmd
-		test.sh = test.sh
 		THIRD-PARTY-NOTICES.md = THIRD-PARTY-NOTICES.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{8793898A-6542-4606-AA82-AB14151D2D20}"
 	ProjectSection(SolutionItems) = preProject
-		docs\CODE_OF_CONDUCT.md = docs\CODE_OF_CONDUCT.md
 		docs\CODEOWNERS = docs\CODEOWNERS
+		docs\CODE_OF_CONDUCT.md = docs\CODE_OF_CONDUCT.md
 		docs\CONTRIBUTING.md = docs\CONTRIBUTING.md
 		docs\ISSUE_TEMPLATE.md = docs\ISSUE_TEMPLATE.md
 		docs\PULL_REQUEST_TEMPLATE.md = docs\PULL_REQUEST_TEMPLATE.md
@@ -453,9 +450,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{48E1F49D-7103-4DE6-9F69-915183B85095}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\build.ps1 = scripts\build.ps1
-		scripts\build.sh = scripts\build.sh
 		scripts\cibuild.cmd = scripts\cibuild.cmd
-		scripts\cibuild.sh = scripts\cibuild.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xinput", "Xinput", "{F54C5855-9C8D-4EDF-BFC8-41F2E46DBE3C}"
@@ -2998,6 +2993,41 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gdiplustypes", "gdiplustype
 		generation\Gdiplus\um\gdiplustypes\um-gdiplustypes.h = generation\Gdiplus\um\gdiplustypes\um-gdiplustypes.h
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{8891C297-49D7-495C-B66E-2A77C3D5F50D}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE\bug.md = .github\ISSUE_TEMPLATE\bug.md
+		.github\ISSUE_TEMPLATE\proposal.md = .github\ISSUE_TEMPLATE\proposal.md
+		.github\ISSUE_TEMPLATE\regression.md = .github\ISSUE_TEMPLATE\regression.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "evntprov", "evntprov", "{7ADEB031-2298-4F79-8103-79CFF01CA00C}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\shared\evntprov\generate.rsp = generation\Windows\shared\evntprov\generate.rsp
+		generation\Windows\shared\evntprov\header.txt = generation\Windows\shared\evntprov\header.txt
+		generation\Windows\shared\evntprov\shared-evntprov.h = generation\Windows\shared\evntprov\shared-evntprov.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "propkey", "propkey", "{21B748B3-53EF-42AD-B5F3-A5215C5AE574}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\um\propkey\generate.rsp = generation\Windows\um\propkey\generate.rsp
+		generation\Windows\um\propkey\header.txt = generation\Windows\um\propkey\header.txt
+		generation\Windows\um\propkey\um-propkey.h = generation\Windows\um\propkey\um-propkey.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "knownfolders", "knownfolders", "{DBA8B1B8-BE4B-4C8F-BD75-EAD47581AE39}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\um\knownfolders\generate.rsp = generation\Windows\um\knownfolders\generate.rsp
+		generation\Windows\um\knownfolders\header.txt = generation\Windows\um\knownfolders\header.txt
+		generation\Windows\um\knownfolders\um-knownfolders.h = generation\Windows\um\knownfolders\um-knownfolders.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "knownfolderpathscom", "knownfolderpathscom", "{EA5B695A-5F25-401E-9FD9-23BFDEFBA01B}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\um\knownfolderpathscom\generate.rsp = generation\Windows\um\knownfolderpathscom\generate.rsp
+		generation\Windows\um\knownfolderpathscom\header.txt = generation\Windows\um\knownfolderpathscom\header.txt
+		generation\Windows\um\knownfolderpathscom\um-knownfolderpathscom.h = generation\Windows\um\knownfolderpathscom\um-knownfolderpathscom.h
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -3459,6 +3489,11 @@ Global
 		{55FB5A64-9A0B-4294-87F0-D8F81BE30692} = {7C1DE5D1-1575-4443-8415-E7F70A687F4F}
 		{B281558F-E194-4AC3-BE1B-C7C2A748947E} = {7C1DE5D1-1575-4443-8415-E7F70A687F4F}
 		{9C6E88A3-997E-4F11-AF25-18A54B110404} = {7C1DE5D1-1575-4443-8415-E7F70A687F4F}
+		{8891C297-49D7-495C-B66E-2A77C3D5F50D} = {3BDDFFAD-B31F-4930-B557-E8486D23C67A}
+		{7ADEB031-2298-4F79-8103-79CFF01CA00C} = {F9716DD9-2967-4295-AC71-F1FD5A9EEFEF}
+		{21B748B3-53EF-42AD-B5F3-A5215C5AE574} = {67311E5E-FA9C-43A6-B431-9EF10047A0CE}
+		{DBA8B1B8-BE4B-4C8F-BD75-EAD47581AE39} = {67311E5E-FA9C-43A6-B431-9EF10047A0CE}
+		{EA5B695A-5F25-401E-9FD9-23BFDEFBA01B} = {67311E5E-FA9C-43A6-B431-9EF10047A0CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2FE36DF8-2D9C-4F20-8787-45DC74B57461}

generation/DirectX/other/D3D11On12On7/generate.rsp

@@ -2,6 +2,7 @@
 @../../../remap.rsp
 --exclude
 GetD3D11On12On7Interface
+IID_ID3D11On12On7
 --file
 other-d3d11on12on7.h
 --methodClassName
@@ -14,5 +15,7 @@ TerraFX.Interop.DirectX
 ../../../../tests/Interop/Windows/DirectX/other/D3D11On12On7
 --traverse
 ./D3D11On12On7.h
+--with-guid
+ID3D11On12On7=00000000-0000-0000-0000-000000000000
 --with-librarypath
 *=d3d11on12

generation/DirectX/um/d3d10_1shader/generate.rsp

@@ -12,3 +12,5 @@ TerraFX.Interop.DirectX
 ../../../../tests/Interop/Windows/DirectX/um/d3d10_1shader
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.20348.0/um/d3d10_1shader.h
+--with-guid
+ID3D10ShaderReflection1=C3457783-A846-47CE-9520-CEA6F66E7447

generation/DirectX/um/d3d10effect/generate.rsp

@@ -14,6 +14,10 @@ TerraFX.Interop.DirectX
 ../../../../tests/Interop/Windows/DirectX/um/d3d10effect
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.20348.0/um/d3d10effect.h
+--with-guid
+ID3D10Effect=51B0CA8B-EC0B-4519-870D-8EE1CB5017C7
+ID3D10EffectPool=9537AB04-3250-412E-8213-FCD2F8677933
+ID3D10StateBlock=0803425A-57F5-4dd6-9465-A87570834A08
 --with-librarypath
 D3D10CompileEffectFromMemory=d3d10
 D3D10CreateEffectFromMemory=d3d10

generation/DirectX/um/ddraw/generate.rsp

@@ -358,6 +358,20 @@ TerraFX.Interop.DirectX
 ../../../../tests/Interop/Windows/DirectX/um/ddraw
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.20348.0/um/ddraw.h
+--with-guid
+IDirectDraw=6C14DB80-A733-11CE-A521-0020AF0BE560
+IDirectDraw2=B3A6F3E0-2B43-11CF-A2DE-00AA00B93356
+IDirectDraw4=9C59509A-39BD-11D1-8C4A-00C04FD930C5
+IDirectDraw7=15E65EC0-3B9C-11D2-B92F-00609797EA5B
+IDirectDrawClipper=6C14DB85-A733-11CE-A521-0020AF0BE560
+IDirectDrawColorControl=4B9F0EE0-0D7E-11D0-9B06-00A0C903A3B8
+IDirectDrawGammaControl=69C11C3E-B46B-11D1-AD7A-00C04FC29B4E
+IDirectDrawPalette=6C14DB84-A733-11CE-A521-0020AF0BE560
+IDirectDrawSurface=6C14DB81-A733-11CE-A521-0020AF0BE560
+IDirectDrawSurface2=57805885-6EEC-11CF-9441-A82303C10E27
+IDirectDrawSurface3=DA044E00-69B2-11D0-A1D5-00AA00B8DFBB
+IDirectDrawSurface4=0B2B8630-AD35-11D0-8EA6-00609797EA5B
+IDirectDrawSurface7=06675A80-3B9B-11D2-B92F-00609797EA5B
 --with-librarypath
 DirectDrawCreate=ddraw
 DirectDrawCreateClipper=ddraw

generation/DirectX/um/dxdiag/generate.rsp

@@ -27,5 +27,8 @@ TerraFX.Interop.DirectX
 ../../../../tests/Interop/Windows/DirectX/um/dxdiag
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.20348.0/um/dxdiag.h
+--with-guid
+IDxDiagContainer=7D0F462F-4064-4862-BC7F-933E5058C10F
+IDxDiagProvider=9C6B4CB0-23F8-49CC-A3ED-45A55000A6D2
 --with-librarypath
 *=dxdiag

generation/Windows/other/cvconst/generate.rsp

@@ -1,7 +1,7 @@
 @../../../settings.rsp
 @../../../remap.rsp
 --include-directory
-C:/Program Files/Microsoft Visual Studio/2022/Preview/DIA SDK/include
+C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/include
 --file
 other-cvconst.h
 --methodClassName
@@ -13,4 +13,4 @@ TerraFX.Interop.Windows
 --test-output
 ../../../../tests/Interop/Windows/Windows/other/cvconst
 --traverse
-C:/Program Files/Microsoft Visual Studio/2022/Preview/DIA SDK/include/cvconst.h
+C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/include/cvconst.h

generation/Windows/other/dia2/generate.rsp

@@ -4,7 +4,7 @@
 __MIDL___MIDL_itf_dia2_0000_0000_0001
 __MIDL___MIDL_itf_dia2_0000_0035_0001
 --include-directory
-C:/Program Files/Microsoft Visual Studio/2022/Preview/DIA SDK/include
+C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/include
 --file
 other-dia2.h
 --methodClassName
@@ -16,4 +16,4 @@ TerraFX.Interop.Windows
 --test-output
 ../../../../tests/Interop/Windows/Windows/other/dia2
 --traverse
-C:/Program Files/Microsoft Visual Studio/2022/Preview/DIA SDK/include/dia2.h
+C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/include/dia2.h

generation/Windows/other/diacreate/generate.rsp

@@ -4,7 +4,7 @@
 NoRegCoCreate
 NoOleCoCreate
 --include-directory
-C:/Program Files/Microsoft Visual Studio/2022/Preview/DIA SDK/include
+C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/include
 --file
 other-diacreate.h
 --methodClassName
@@ -16,4 +16,4 @@ TerraFX.Interop.Windows
 --test-output
 ../../../../tests/Interop/Windows/Windows/other/diacreate
 --traverse
-C:/Program Files/Microsoft Visual Studio/2022/Preview/DIA SDK/include/diacreate.h
+C:/Program Files/Microsoft Visual Studio/2022/Community/DIA SDK/include/diacreate.h

generation/Windows/shared/evntprov/generate.rsp

@@ -0,0 +1,25 @@
+@../../../settings.rsp
+@../../../remap.rsp
+--file
+shared-evntprov.h
+--methodClassName
+Windows
+--namespace
+TerraFX.Interop.Windows
+--output
+../../../../sources/Interop/Windows/Windows/shared/evntprov
+--test-output
+../../../../tests/Interop/Windows/Windows/shared/evntprov
+--traverse
+C:/Program Files (x86)/Windows Kits/10/Include/10.0.20348.0/shared/evntprov.h
+--with-librarypath
+EventRegister=Advapi32
+EventUnregister=Advapi32
+EventEnabled=Advapi32
+EventProviderEnabled=Advapi32
+EventWrite=Advapi32
+EventWriteTransfer=Advapi32
+EventWriteEx=Advapi32
+EventWriteString=Advapi32
+EventActivityIdControl=Advapi32
+EventSetInformation=Advapi32

generation/Windows/shared/evntprov/header.txt

@@ -0,0 +1,4 @@
+// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information.
+
+// Ported from shared/evntprov.h in the Windows SDK for Windows 10.0.20348.0
+// Original source is Copyright © Microsoft. All rights reserved.

generation/Windows/shared/evntprov/shared-evntprov.h

@@ -0,0 +1,2 @@
+#include "..\..\..\TerraFX.h"
+#include <evntprov.h>

generation/Windows/um/Shlwapi/generate.rsp

@@ -34,6 +34,7 @@ UrlEscapeSpaces
 UrlIsFileUrlA
 UrlIsFileUrlW
 UrlUnescapeInPlace
+wnsprintf
 --file
 um-Shlwapi.h
 --methodClassName