Merge branch 'main' into winml

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,27 @@
+---
+name: Bug
+about: " An issue for something that does not behave as expected."
+title: ''
+labels: bug, untriaged
+assignees: ''
+
+---
+
+#### Description (optional)
+
+This section should contain an expanded description of the bug, if the title is
+not sufficient.
+
+#### Reproduction Steps
+
+This section should contain an ordered list of steps that can be used to
+reproduce the bug. Ideally, you would include as much information about your
+environment as possible to help use in determining the best fix for the issue.
+
+#### Expected Behavior
+
+This section should contain a description of the behavior that is expected.
+
+#### Actual Behavior
+
+This section should contain a description of the actual behavior being observed.

.github/ISSUE_TEMPLATE/proposal.md

@@ -0,0 +1,43 @@
+---
+name: Proposal
+about: " An issue that represents a proposed feature or change to the repo."
+title: ''
+labels: proposal, untriaged
+assignees: ''
+
+---
+
+#### Description (optional)
+
+This section should contain an expanded description of the proposal, if the
+title is not sufficient.
+
+#### Rationale
+
+This section should contain the reasoning behind the proposal. It should include
+things like "Why do we need this", "How will it improve a developers quality of
+life", etc.
+
+#### Proposed API
+
+This section should contain the APIs being proposed along with a brief
+description of what each API does.
+
+#### Drawbacks
+
+This should contain any drawbacks for the proposal that came up during the
+discussions.
+
+#### Alternatives
+
+This should contain any alternative proposals that came up during the
+discussions.
+
+#### Other thoughts
+
+This should contain any additional thoughts or footnotes on the proposal.
+
+#### Discussions (optional)
+
+This section should contain a link to all discussions related to the proposal
+that have been made thus far.

.github/ISSUE_TEMPLATE/regression.md

@@ -0,0 +1,27 @@
+---
+name: Regression
+about: An issue for something that behaves differently to a past release.
+title: ''
+labels: regression, untriaged
+assignees: ''
+
+---
+
+#### Description (optional)
+
+This section should contain an expanded description of the regression, if the title is
+not sufficient.
+
+#### Reproduction Steps
+
+This section should contain an ordered list of steps that can be used to
+reproduce the regression. Ideally, you would include as much information about your
+environment as possible to help use in determining the best fix for the issue.
+
+#### Expected Behavior
+
+This section should contain a description of the behavior that is expected.
+
+#### Actual Behavior
+
+This section should contain a description of the actual behavior being observed.

.github/workflows/ci.yml

@@ -87,35 +87,36 @@ jobs:
           ./artifacts/pkg/**/*
           ./artifacts/tst/**/*
         if-no-files-found: error
-  publishAz:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
-    needs: [ windows-x64, windows-x86, linux-x64, macos-x64 ]
+  build-nuget:
+    runs-on: windows-latest
     steps:
-    - uses: actions/download-artifact@v2
-      with:
-        name: windows_release_x64
-        path: ./artifacts
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-        source-url: https://pkgs.terrafx.dev/index.json
+    - uses: actions/checkout@v2
+    - run: ./scripts/cibuild.cmd -configuration release -architecture x64
+      shell: cmd
       env:
-        NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
-    - run: dotnet nuget push ./artifacts/pkg/Release/*.nupkg --api-key AzureDevOps
-  publishGH:
+        EXCLUDE_RUN_ID_FROM_PACKAGE: true
+    - uses: actions/upload-artifact@v2
+      with:
+        name: nuget
+        path: |
+          ./artifacts/bin/**/*
+          ./artifacts/log/**/*
+          ./artifacts/pkg/**/*
+          ./artifacts/tst/**/*
+        if-no-files-found: error
+  publish-nightlies:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' }}
-    needs: [ windows-x64, windows-x86, linux-x64, macos-x64 ]
+    needs: [ windows-x64, windows-x86, linux-x64, macos-x64, build-nuget ]
     steps:
     - uses: actions/download-artifact@v2
       with:
         name: windows_release_x64
         path: ./artifacts
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
-        source-url: https://nuget.pkg.github.com/terrafx/index.json
+        dotnet-version: '5.0.x'
+        source-url: https://pkgs.terrafx.dev/index.json
       env:
-        NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - run: dotnet nuget push ./artifacts/pkg/Release/*.nupkg
+        NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
+    - run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --api-key AzureDevOps

Directory.Build.props

@@ -42,7 +42,7 @@
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>TerraFX.Interop.Windows</Product>
     <VersionPrefix>10.0.19041</VersionPrefix>
-    <VersionSuffix>alpha</VersionSuffix>
+    <VersionSuffix>beta1</VersionSuffix>
     <VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
   </PropertyGroup>
 
@@ -55,7 +55,7 @@
     <Features>strict</Features>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <HighEntropyVA>true</HighEntropyVA>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
     <MinClientVersion>4.3</MinClientVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>

Directory.Build.targets

@@ -19,12 +19,12 @@
   <!-- Settings that are only set for CI builds -->
   <PropertyGroup Condition="'$(GITHUB_RUN_ID)' != ''">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <PackageVersion>$(Version)-$(GITHUB_RUN_ID)</PackageVersion>
+    <PackageVersion Condition="'$(EXCLUDE_RUN_ID_FROM_PACKAGE)' == ''">$(Version)-$(GITHUB_RUN_ID)</PackageVersion>
   </PropertyGroup>
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200812-03" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
     <PackageReference Update="NUnit" Version="3.12.0" />
     <PackageReference Update="NUnit3TestAdapter" Version="3.17.0" />

generation/other/d3d11on12on7/generate.rsp

@@ -0,0 +1,12 @@
+@../../settings.rsp
+@../../remap.rsp
+--file
+other-d3d11on12on7.h
+--output
+../../../sources/Interop/Windows/other/d3d11on12on7
+--test-output
+../../../tests/Interop/Windows/other/d3d11on12on7
+--traverse
+d3d11on12on7.h
+--with-librarypath
+*=d3d11on12

generation/other/d3d11on12on7/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 d3d11on12on7.h in the https://www.nuget.org/packages/Microsoft.Direct3D.D3D12On7 nuget package, version 1.1.0
+// Original source is Copyright © Microsoft. All rights reserved. License details can be found here: https://www.nuget.org/packages/Microsoft.Direct3D.D3D12On7/1.1.0/License

generation/other/d3d11on12on7/other-d3d11on12on7.h

@@ -0,0 +1,3 @@
+#include <Windows.h>
+#include <d3d12.h>
+#include <d3d11on12on7.h>

generation/other/d3d12downlevel/generate.rsp

@@ -0,0 +1,14 @@
+@../../settings.rsp
+@../../remap.rsp
+--file
+other-d3d12downlevel.h
+--output
+../../../sources/Interop/Windows/other/d3d12downlevel
+--test-output
+../../../tests/Interop/Windows/other/d3d12downlevel
+--traverse
+d3d12downlevel.h
+--with-librarypath
+*=d3d12
+--with-attribute
+D3D12_DOWNLEVEL_PRESENT_FLAGS=Flags

generation/other/d3d12downlevel/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 d3d12downlevel in the https://www.nuget.org/packages/Microsoft.Direct3D.D3D12On7 nuget package, version 1.1.0
+// Original source is Copyright © Microsoft. All rights reserved. License details can be found here: https://www.nuget.org/packages/Microsoft.Direct3D.D3D12On7/1.1.0/License

generation/other/d3d12downlevel/other-d3d12downlevel.h

@@ -0,0 +1,2 @@
+#include <Windows.h>
+#include "d3d12downlevel.h"

generation/other/d3dx12/generate.rsp

@@ -1,10 +1,10 @@
-@../../../settings.rsp
-@../../../remap.rsp
+@../../settings.rsp
+@../../remap.rsp
 --file
 other-d3dx12.h
 --output
-../../../../sources/Interop/Windows/other/d3dx12
+../../../sources/Interop/Windows/other/d3dx12
 --test-output
-../../../../tests/Interop/Windows/other/d3dx12
+../../../tests/Interop/Windows/other/d3dx12
 --traverse
 d3dx12.h

generation/other/dxcapi/generate.rsp

@@ -1,5 +1,5 @@
-@../../../settings.rsp
-@../../../remap.rsp
+@../../settings.rsp
+@../../remap.rsp
 --exclude
 CLSID_DxcAssembler
 CLSID_DxcCompiler
@@ -45,9 +45,9 @@ IDxcVersionInfo2
 --file
 other-dxcapi.h
 --output
-../../../../sources/Interop/Windows/other/dxcapi
+../../../sources/Interop/Windows/other/dxcapi
 --test-output
-../../../../tests/Interop/Windows/other/dxcapi
+../../../tests/Interop/Windows/other/dxcapi
 --traverse
 dxcapi.h
 --with-librarypath

generation/remap.rsp

@@ -102,6 +102,7 @@ ID2D1DeviceContext4.DrawTextW=DrawText
 ID2D1RenderTarget.DrawTextW=DrawText
 ID3D10Blob=ID3DBlob
 ID3D11InfoQueue.GetMessageW=GetMessage
+ID3D11On12On7Resource*=void*
 ID3D12InfoQueue.GetMessageW=GetMessage
 IDesktopWindowTarget**=void**
 IDispatcherQueueController**=void**

generation/um/WinBase/generate.rsp

@@ -1,5 +1,7 @@
 @../../settings.rsp
 @../../remap.rsp
+--define-macro
+MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=1
 --exclude
 CaptureStackBackTrace
 DefineHandleTable