From bc3d7f416cdd6ca7826f18ff61486a71d54c6f47 Mon Sep 17 00:00:00 2001 From: Aaron Carter <89698828+atcarter714@users.noreply.github.com> Date: Wed, 4 Nov 2026 11:52:38 -0600 Subject: [PATCH] Establish a reproducible .NET 10 build baseline --- .github/workflows/build.yml | 44 +++ .gitignore | 3 + DXSharp.sln | 8 +- Directory.Build.props | 173 ++++-------- Directory.Build.targets | 120 +-------- Directory.Packages.props | 18 ++ NuGet.Config | 7 + README.md | 15 +- build.ps1 | 51 ++++ build/VerifyPackages.ps1 | 62 +++++ build/msbuild/NativeDependencies.targets | 20 ++ doc/NET10-Build-Baseline.md | 75 ++++++ global.json | 7 + samples/AdvancedSample/AdvancedSample.csproj | 11 +- .../Framework/Graphics/GraphicsPipeline.cs | 2 +- samples/AdvancedSample/packages.lock.json | 23 ++ samples/BasicSample/BasicSample.csproj | 2 +- samples/BasicSample/packages.lock.json | 10 + samples/Directory.Build.props | 93 +------ samples/Directory.Build.targets | 57 +--- samples/HelloTexture/HelloTexture.csproj | 4 +- samples/HelloTexture/packages.lock.json | 10 + src/DXSharp.Dxc/DXSharp.Dxc.csproj | 78 +----- src/DXSharp.Dxc/packages.lock.json | 46 ++++ .../DXSharp.Framework.csproj | 29 +- src/DXSharp.Framework/packages.lock.json | 16 ++ src/DXSharp/DXSharp.csproj | 194 +------------- src/DXSharp/Direct3D12/Data/D3D12Structs.cs | 4 +- src/DXSharp/Windows/Renderform.cs | 4 +- src/DXSharp/nuget.config | 3 - src/DXSharp/packages.lock.json | 43 +++ tests/BasicTests/BasicTests.csproj | 15 +- tests/BasicTests/DXGITests.cs | 3 +- tests/BasicTests/packages.lock.json | 92 +++++++ tests/Directory.Build.props | 47 +--- tests/Directory.Build.targets | 42 +-- .../DXSharp.Tools.Builds.csproj | 63 +---- tools/DXSharp.Tools.Builds/packages.lock.json | 153 +++++++++++ tools/Directory.Build.props | 243 +---------------- tools/Directory.Build.targets | 253 +----------------- 40 files changed, 830 insertions(+), 1313 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 Directory.Packages.props create mode 100644 NuGet.Config create mode 100644 build.ps1 create mode 100644 build/VerifyPackages.ps1 create mode 100644 build/msbuild/NativeDependencies.targets create mode 100644 doc/NET10-Build-Baseline.md create mode 100644 global.json create mode 100644 samples/AdvancedSample/packages.lock.json create mode 100644 samples/BasicSample/packages.lock.json create mode 100644 samples/HelloTexture/packages.lock.json create mode 100644 src/DXSharp.Dxc/packages.lock.json create mode 100644 src/DXSharp.Framework/packages.lock.json delete mode 100644 src/DXSharp/nuget.config create mode 100644 src/DXSharp/packages.lock.json create mode 100644 tests/BasicTests/packages.lock.json create mode 100644 tools/DXSharp.Tools.Builds/packages.lock.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b641f46 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,44 @@ +name: .NET 10 build baseline + +on: + push: + branches: [main, 'migration/**'] + pull_request: + workflow_dispatch: + +permissions: + contents: read + +concurrency: + group: build-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + windows: + name: Windows ${{ matrix.configuration }} + runs-on: windows-2025 + timeout-minutes: 20 + strategy: + fail-fast: false + matrix: + configuration: [Debug, Release] + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-dotnet@v4 + with: + global-json-file: global.json + cache: true + cache-dependency-path: '**/packages.lock.json' + - name: Restore, build, baseline tests, pack, and consume packages + shell: pwsh + run: ./build.ps1 -Configuration ${{ matrix.configuration }} + - name: Upload build evidence + if: always() + uses: actions/upload-artifact@v4 + with: + name: baseline-${{ matrix.configuration }} + path: | + artifacts/build.binlog + artifacts/test-results/** + artifacts/packages/** + if-no-files-found: warn diff --git a/.gitignore b/.gitignore index 19dfca2..2d90788 100644 --- a/.gitignore +++ b/.gitignore @@ -359,3 +359,6 @@ healthchecksdb MigrationBackup/ .idea/.idea.DXSharp/.idea/ + +# SDK-style build baseline outputs +artifacts/ diff --git a/DXSharp.sln b/DXSharp.sln index bfb9f34..0f5951f 100644 --- a/DXSharp.sln +++ b/DXSharp.sln @@ -190,8 +190,8 @@ Global {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Debug|x64.Build.0 = Debug|x64 {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Debug|x86.ActiveCfg = Debug|Any CPU {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Debug|x86.Build.0 = Debug|Any CPU - {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|Any CPU.Build.0 = Debug|Any CPU + {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|Any CPU.Build.0 = Release|Any CPU {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|x64.ActiveCfg = Release|x64 {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|x64.Build.0 = Release|x64 {EE7A1499-C24D-4C17-93C0-0C907F5A7D53}.Release|x86.ActiveCfg = Release|Any CPU @@ -218,8 +218,8 @@ Global {4B5C9C89-A4A4-4081-8508-6E26388817F8}.Release|x64.Build.0 = Release|x64 {4B5C9C89-A4A4-4081-8508-6E26388817F8}.Release|x86.ActiveCfg = Release|x86 {4B5C9C89-A4A4-4081-8508-6E26388817F8}.Release|x86.Build.0 = Release|x86 - {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|Any CPU.ActiveCfg = InlineTasks|Any CPU - {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|Any CPU.Build.0 = InlineTasks|Any CPU + {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|x64.ActiveCfg = Debug|Any CPU {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|x64.Build.0 = Debug|Any CPU {2362EB4B-6F3D-4274-A836-C5394A9660FC}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/Directory.Build.props b/Directory.Build.props index a5bbb26..5dbaa2d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,128 +1,45 @@ - - - true - - - - - - - - - - - - false - true - $(NuGetPackageRoot) - true - - - - AnyCPU;x64;x86 - $(MSBuildThisFileDirectory) - net7.0-windows10.0.22621.0;net8.0-windows10.0.22621.0 - - - Debug - $(RepoRootPath)bin\$(MSBuildProjectName)\ - $(RepoRootPath)bin\Packages\$(Configuration)\ - $(RepoRootPath)obj\$([MSBuild]::MakeRelative($(RepoRootPath), $(MSBuildProjectDirectory)))\ - - - true - $(RepoRootPath)file\keys\strongname.snk - - - - - - Library - - - $(TargetCPUs) - $(DotNetTargets); - - enable - latest - true - true - preview - true - true - true - - - - - - true - true - true - git - https://github.com/atcarter714/DXSharp - $(RepoRootPath)build\pwsh - - - $(MSBuildThisFileDirectory) - - - embedded - embedded - - - - - - 1.0.1 - 0.3.3 - - README.md - DXSharp_Logo_00_512.png - true - - Arkaen Solutions - Aaron T. Carter, $(Company), Contributors - Copyright © Aaron T. Carter, Arkaen Solutions. All rights reserved. - - - true - true - https://github.com/atcarter714/DXSharp - - - true - - directx; dxsharp; interop; wrapper; 2d; 3d; graphics; d3d; d3d12; dxgi; win32; com; gamedev; arkaen; dxs; - Early preview: NOT intended for production use! - - - - - - true - [0.3.49-beta,) - - true - [56.0.13-preview,) - - - - - - TRACE, DEBUG_COM, DEV_BUILD, CACHE_SIZE_NORMAL - - - TRACE, DEV_BUILD, CACHE_SIZE_LARGE, STRIP_CHECKS, DXS_FAST - - - _WIN_32, X86 - _WIN_32, ARM - _WIN_64, X64 - _WIN_64, ARM64 - - \ No newline at end of file + + + $(MSBuildThisFileDirectory) + Debug + 10.0.26100.0 + net10.0-windows$(WinSDKVersion) + AnyCPU;x64;x86;ARM64 + $(TargetCPUs) + 14.0 + enable + enable + true + 10.0 + true + true + true + true + $(RepoRootPath)artifacts/bin/$(MSBuildProjectName)/ + $(RepoRootPath)artifacts/obj/$(MSBuildProjectName)/ + $(RepoRootPath)artifacts/packages/$(Configuration)/ + true + true + $(RepoRootPath)file/keys/strongname.snk + 0.4.0 + net10-preview.1 + Arkaen Solutions + Aaron T. Carter, Arkaen Solutions, Contributors + git + https://github.com/atcarter714/DXSharp + https://github.com/atcarter714/DXSharp + MIT + README.md + true + snupkg + true + portable + true + + $(DefineConstants);DEV_BUILD;CACHE_SIZE_NORMAL + $(DefineConstants);DEBUG_COM + + + + + diff --git a/Directory.Build.targets b/Directory.Build.targets index c0dbc6e..bc5d691 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,121 +1,3 @@ - - - - - - - - - - - - - - - $(DXSCorePrebuildDependsOn); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DXSBuildStartup.ps1 - $(MSBuildProjectName)_$(Configuration)_$(Platform)_Build - $(PowershellScriptsDir)\$(StartupScriptName) - $(RepoRootPath)build\logs\$(LogFileNamePrefix)_PreBuildToolsLog.log - - - - false - - 7 - "C:\Program Files\PowerShell\$(PWSH_VER)\pwsh.exe" - $(CustomPowershellPath) - pwsh.exe - - - - - $(PwshExe) - - $(ProjectName) - '$(StartupScriptArg)' - - - - - - - - - - - - - DXSharp SDK library build process completed for: '$(MSBuildProjectName)'. - Result: $(BuildResult) - - - - - - - - - - - - - - - - SDK library build failed for $(MSBuildProjectName)! - - - - + - diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..e5055fb --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,18 @@ + + + true + + + + + + + + + + + + + + + diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..4d736c1 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/README.md b/README.md index 05c16a3..8ce09c7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![DXSharp](./file/img/DXSharp_Logo_00_512.png) -**Modern DirectX 12 for .NET 7 & 8** +**DirectX 12 for .NET — .NET 10 migration in progress** [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![.NET 8](https://img.shields.io/badge/.NET-8.0-purple)](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) @@ -38,15 +38,22 @@ ## Getting Started 🌟 ### Prerequisites -- **.NET 8 SDK** installed -- **Windows 10/11** with DirectX 12 capable hardware +- **.NET 10 SDK** selected by [global.json](global.json) +- **PowerShell 7** for the build entry point +- **Windows** for test execution; DirectX 12 capable hardware for graphics samples ### Installation 1. **Clone the repository:** - git clone https://github.com/atcarter714/DXSharp.git -2. Once you've checked out the repo, you can simply build the solution and run the "Hello Triangle" sample application. +2. Build and validate the migration baseline: + + ```powershell + ./build.ps1 -Configuration Debug + ``` + + See [the .NET 10 build baseline](doc/NET10-Build-Baseline.md) for Release builds, locked dependencies, test scope, package checks, and current limitations. The original proof-of-concept architecture described below is being migrated incrementally; compilation does not establish production readiness. ## Roadmap 🛤️ diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 0000000..7b21717 --- /dev/null +++ b/build.ps1 @@ -0,0 +1,51 @@ +[CmdletBinding()] +param( + [ValidateSet('Debug', 'Release')] + [string] $Configuration = 'Debug', + [switch] $SkipTests, + [switch] $RunGraphicsTests +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version Latest +if ($SkipTests -and $RunGraphicsTests) { + throw 'SkipTests and RunGraphicsTests cannot be combined.' +} +if (-not $IsWindows -and -not $SkipTests) { + throw 'Executing this Windows-targeted test assembly requires Windows. Use -SkipTests for cross-compilation.' +} + +function Invoke-DotNet([string[]] $Arguments) { + & dotnet @Arguments + if ($LASTEXITCODE -ne 0) { + throw "dotnet $($Arguments -join ' ') failed with exit code $LASTEXITCODE." + } +} + +Push-Location $PSScriptRoot +try { + Invoke-DotNet -Arguments @('restore', 'DXSharp.sln', '--locked-mode', '-m:1') + Invoke-DotNet -Arguments @('build', 'DXSharp.sln', '--configuration', $Configuration, '--no-restore', '-m:1', '-bl:artifacts/build.binlog') + if (-not $SkipTests) { + $resultsDirectory = Join-Path $PSScriptRoot "artifacts/test-results/$Configuration" + New-Item -ItemType Directory -Force -Path $resultsDirectory | Out-Null + $trxPath = Join-Path $resultsDirectory 'baseline.trx' + if (Test-Path $trxPath) { Remove-Item $trxPath } + Invoke-DotNet -Arguments @('test', 'tests/BasicTests/BasicTests.csproj', '--configuration', $Configuration, + '--no-build', '--no-restore', '--filter', 'TestCategory=BuildBaseline', + '--logger', 'trx;LogFileName=baseline.trx', '--results-directory', $resultsDirectory) + [xml] $trx = Get-Content -Raw $trxPath + if ([int] $trx.TestRun.ResultSummary.Counters.executed -lt 1) { + throw 'The baseline test filter executed no tests.' + } + if ($RunGraphicsTests) { + Invoke-DotNet -Arguments @('test', 'tests/BasicTests/BasicTests.csproj', '--configuration', $Configuration, + '--no-build', '--no-restore', '--filter', 'TestCategory!=BuildBaseline', + '--logger', 'trx;LogFileName=graphics.trx', '--results-directory', $resultsDirectory) + } + } + Invoke-DotNet -Arguments @('pack', 'DXSharp.sln', '--configuration', $Configuration, '--no-build', '--no-restore', '-m:1') + & (Join-Path $PSScriptRoot 'build/VerifyPackages.ps1') -Configuration $Configuration +} finally { + Pop-Location +} diff --git a/build/VerifyPackages.ps1 b/build/VerifyPackages.ps1 new file mode 100644 index 0000000..2a45414 --- /dev/null +++ b/build/VerifyPackages.ps1 @@ -0,0 +1,62 @@ +[CmdletBinding()] +param( + [ValidateSet('Debug', 'Release')] + [string] $Configuration = 'Debug' +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version Latest +$repoRoot = Split-Path $PSScriptRoot -Parent +$packageDirectory = Join-Path $repoRoot "artifacts/packages/$Configuration" +$consumerDirectory = Join-Path ([System.IO.Path]::GetTempPath()) "dxsharp-package-consumer-$([Guid]::NewGuid().ToString('N'))" +New-Item -ItemType Directory -Path $consumerDirectory | Out-Null +try { + Copy-Item (Join-Path $repoRoot 'global.json') $consumerDirectory + $version = (& dotnet msbuild (Join-Path $repoRoot 'src/DXSharp/DXSharp.csproj') -getProperty:PackageVersion -nologo | Out-String).Trim() + if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($version)) { + throw 'Unable to evaluate the package version.' + } + foreach ($name in @('DXSharp', 'DXSharp.Dxc', 'DXSharp.Framework')) { + if (-not (Test-Path (Join-Path $packageDirectory "$name.$version.nupkg"))) { + throw "Missing package: $name.$version.nupkg" + } + } + @" + + + Exe + net10.0-windows10.0.26100.0 + true + true + + + + + +"@ | Set-Content (Join-Path $consumerDirectory 'Consumer.csproj') + @' +System.Console.WriteLine(typeof(DXSharp.Direct3D12.IDevice).Assembly.FullName); +System.Console.WriteLine(typeof(DXSharp.Dxc.ShaderBuilder).Assembly.FullName); +'@ | Set-Content (Join-Path $consumerDirectory 'Program.cs') + @" + + + + + + + +"@ | Set-Content (Join-Path $consumerDirectory 'NuGet.Config') + Push-Location $consumerDirectory + try { + # A private cache prevents a previously built package with the same preview version masking this build. + & dotnet restore Consumer.csproj --packages (Join-Path $consumerDirectory 'packages') + if ($LASTEXITCODE -ne 0) { throw 'Package consumer restore failed.' } + & dotnet build Consumer.csproj --configuration $Configuration --no-restore + if ($LASTEXITCODE -ne 0) { throw 'Package consumer build failed.' } + } finally { + Pop-Location + } +} finally { + Remove-Item -Recurse -Force $consumerDirectory +} diff --git a/build/msbuild/NativeDependencies.targets b/build/msbuild/NativeDependencies.targets new file mode 100644 index 0000000..1842fac --- /dev/null +++ b/build/msbuild/NativeDependencies.targets @@ -0,0 +1,20 @@ + + + x64 + x86 + arm64 + <_AgilityArchitecture>$(DXSharpNativeArchitecture) + <_AgilityArchitecture Condition="'$(DXSharpNativeArchitecture)' == 'x86'">win32 + + + + + + + + + diff --git a/doc/NET10-Build-Baseline.md b/doc/NET10-Build-Baseline.md new file mode 100644 index 0000000..5725e16 --- /dev/null +++ b/doc/NET10-Build-Baseline.md @@ -0,0 +1,75 @@ +# .NET 10 build baseline + +This is the first migration step from the experimental .NET 7/8 implementation. It establishes a repeatable toolchain, dependency graph, build, small non-GPU test gate, and package-consumer build. It does not qualify the old COM ownership code, runtime shader compilation, sample rendering, NativeAOT, or DirectML for production. + +## Prerequisites and commands + +Install the SDK selected by `global.json` (10.0.403, allowing servicing patches in the same feature band) and PowerShell 7. Use Windows for tests and graphics. The Windows reference target is `net10.0-windows10.0.26100.0`; runtime OS/hardware support remains subject to the later deployment and interop qualification work. + +From the checkout root: + +```powershell +./build.ps1 -Configuration Debug +./build.ps1 -Configuration Release +``` + +Each invocation performs locked restore, solution compilation, the `BuildBaseline` tests, packing, and a build of an isolated temporary application that consumes `DXSharp.Framework` and its transitive DXSharp packages. The consumer uses a private package cache so an older build with the same preview version cannot satisfy the test. This is a package compile check, not a GPU/deployment acceptance test. + +Cross-compilation on Linux/macOS is possible with the SDK's Windows targeting packs: + +```powershell +./build.ps1 -Configuration Debug -SkipTests +``` + +The script requires explicit `-SkipTests` outside Windows; it does not report unexecuted Windows tests as passing. + +For individual projects, `SolutionDir` and Visual Studio startup scripts are no longer prerequisites: + +```powershell +dotnet restore src/DXSharp/DXSharp.csproj --locked-mode +dotnet build src/DXSharp/DXSharp.csproj --configuration Release --no-restore +``` + +Outputs are under `artifacts/bin`, `artifacts/obj`, `artifacts/test-results`, and `artifacts/packages`. The build log is `artifacts/build.binlog`. CI uploads package, test, and build evidence separately for Debug and Release. + +## Dependency policy + +Versions live in `Directory.Packages.props`; each project commits its `packages.lock.json`. Normal builds use `--locked-mode`. For an intentional dependency update, edit the central version, run `dotnet restore DXSharp.sln --force-evaluate -m:1`, review all lock-file changes, and rerun both configurations. + +The legacy projection is deliberately frozen at CsWin32 0.3.49-beta and Win32Metadata 56.0.13-preview, the exact versions resolved by the original lower-bound ranges. This avoids mixing the baseline with the next step's generated-COM signature changes. Qualify CsWin32 0.3.367 and its matching metadata in the COM migration slice before replacing these pins. + +Native build inputs move to retail Agility 1.620.1 and DXC 1.9.2609.5. The unused System.CommandLine dependency is removed, and the MSBuild utility dependency moves to patched 17.14.28 while the build-task project retains `netstandard2.0` for its host contract. No native runtime is downloaded by a prebuild script; dependencies come through NuGet restore. + +Project-reference builds copy Agility files under `D3D12/` and DXC files next to the assembly, with debug-layer copies limited to Debug build output. **Copying Agility does not select it.** The existing runtime loader and NuGet native deployment/bootstrap must still be replaced and qualified in the subsequent interop/deployment work. These preview packages are not yet a standalone production distribution. + +## Test boundaries + +`BuildBaseline` labels the three existing DXGI data tests for mode-description conversions and rational values. Hosted Windows CI runs this group in both configurations and fails if the filter executes no tests. + +The other tests remain present and compiled. Several create windows, depend on hardware/debug interfaces, exercise unqualified COM lifetime paths, or assume the developer's historical working directory. To run them deliberately on a suitable Windows machine: + +```powershell +./build.ps1 -Configuration Debug -RunGraphicsTests +``` + +That flag runs the remaining suite in addition to the baseline. A failing full-suite run must be recorded and investigated; the baseline group is not evidence that all legacy tests pass. Hardware-independent ABI/ownership tests and a bounded WARP workload are the next migration gate. + +## Build repairs and preserved scope + +- Root and child `Directory.Build.*` files use explicit parent imports and file-relative paths. The active build no longer imports the old overlapping MSBuild/PowerShell/CSX orchestration. +- C# is pinned to 14.0, analysis to 10.0, and normal SDK configuration symbols are appended rather than overwritten. Legacy `DEV_BUILD` checks remain enabled in both configurations pending the ownership redesign; `STRIP_CHECKS` is not enabled. +- The Visual Studio shared-project container and HelloTexture's `.projitems` import remain available. The command-line build compiles the consuming project using the same shared sources. +- Solution configuration mappings now build DXC as Release in a Release/Any CPU build, and the build-tool project as Debug in a Debug/Any CPU build rather than the old InlineTasks configuration. The package-consumer check caught the DXC mismatch. +- An inaccessible `ABI.System.IDisposable` alias is corrected to `System.IDisposable`. +- RenderForm's existing false-valued properties receive designer default metadata required by modern WinForms analyzers; runtime defaults do not change. +- AdvancedSample supplies its actual command-list element type to the span-taking generic call. The legacy shader-target import is inactive; the sample's incomplete runtime implementation is not represented as working by a C# build. +- The existing strong-name key and friend-assembly declarations are retained. Packages are explicitly marked as experimental migration previews. +- Existing compiler/analyzer warnings remain visible. Warnings are not globally disabled or promoted to errors before their baseline is classified. + +The README's architectural self-assessment remains applicable. This step creates the foundation for replacing the duplicated interface/wrapper and lifetime machinery; it does not perform that redesign. + +## Recorded starting point + +The original baseline is `2a3adc07e02a81d0615f3ae01ee37dd633b82cc1`. A direct project evaluation without `SolutionDir` fails to resolve the Agility import. Restoring with the original wiring reports duplicate Agility package references. Building the original core with its .NET 7/8 targets and SDK 10.0.403 reaches compilation but fails on the inaccessible `IDisposable` alias. + +The original build-tool dependency, Microsoft.Build.Utilities.Core 17.8.3, also produces NuGet's high-severity advisory warning GHSA-w3q9-fxm7-j8fq. The upgraded dependency removes that baseline warning. Native execution and lifetime defects from the architecture assessment remain tracked for the next step. diff --git a/global.json b/global.json new file mode 100644 index 0000000..ddcd6c7 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "10.0.403", + "rollForward": "latestPatch", + "allowPrerelease": false + } +} diff --git a/samples/AdvancedSample/AdvancedSample.csproj b/samples/AdvancedSample/AdvancedSample.csproj index 59a4b11..ea8b2fc 100644 --- a/samples/AdvancedSample/AdvancedSample.csproj +++ b/samples/AdvancedSample/AdvancedSample.csproj @@ -2,7 +2,7 @@ - true + false Exe WinExe 0.1.0 @@ -13,7 +13,7 @@ Assets\DXSharp_ICON_256.ico $(TargetCPUs); - $(DotNetTargets); + $(DotNetTargets) @@ -24,13 +24,6 @@ - - - - - - diff --git a/samples/AdvancedSample/Framework/Graphics/GraphicsPipeline.cs b/samples/AdvancedSample/Framework/Graphics/GraphicsPipeline.cs index a4c49c1..7bbac44 100644 --- a/samples/AdvancedSample/Framework/Graphics/GraphicsPipeline.cs +++ b/samples/AdvancedSample/Framework/Graphics/GraphicsPipeline.cs @@ -296,7 +296,7 @@ public override void OnRender( ) { PopulateCommandList( ) ; // Execute the command list: - _cmdQueue!.ExecuteCommandLists< IGraphicsCommandList >( (uint)_commandLists.Length, _commandLists ) ; + _cmdQueue!.ExecuteCommandLists< IGraphicsCommandList9 >( (uint)_commandLists.Length, _commandLists ) ; // Present the frame: SwapChain!.Present( 1, 0 ) ; diff --git a/samples/AdvancedSample/packages.lock.json b/samples/AdvancedSample/packages.lock.json new file mode 100644 index 0000000..c79c7c1 --- /dev/null +++ b/samples/AdvancedSample/packages.lock.json @@ -0,0 +1,23 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "dxsharp": { + "type": "Project" + }, + "dxsharp.dxc": { + "type": "Project", + "dependencies": { + "DXSharp": "[0.4.0-net10-preview.1, )" + } + }, + "dxsharp.framework": { + "type": "Project", + "dependencies": { + "DXSharp": "[0.4.0-net10-preview.1, )", + "DXSharp.Dxc": "[0.4.0-net10-preview.1, )" + } + } + } + } +} \ No newline at end of file diff --git a/samples/BasicSample/BasicSample.csproj b/samples/BasicSample/BasicSample.csproj index 6b47aae..f99070f 100644 --- a/samples/BasicSample/BasicSample.csproj +++ b/samples/BasicSample/BasicSample.csproj @@ -5,7 +5,7 @@ enable enable $(TargetCPUs); - $(DotNetTargets); + $(DotNetTargets) diff --git a/samples/BasicSample/packages.lock.json b/samples/BasicSample/packages.lock.json new file mode 100644 index 0000000..1edce93 --- /dev/null +++ b/samples/BasicSample/packages.lock.json @@ -0,0 +1,10 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "dxsharp": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index ff5e5a5..458badb 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -1,86 +1,7 @@ - - - - - - - - - true - $(MSBuildThisFileDirectory) - - - Debug - $(SamplesRootPath)bin\$(MSBuildProjectName)\$(Platform)\ - $(SamplesRootPath)obj\$([MSBuild]::MakeRelative($(SamplesRootPath), $(MSBuildProjectDirectory)))\ - - false - false - false - false - false - - - - - - Arkaen Solutions - Aaron T. Carter, $(Company) - © $(Authors). All rights reserved. - $(ProjectName) - $(ProjectName) - $(ProjectName) - Sample application for the DXSharp SDK libraries ... - - - - - - Library - - - enable - latest - true - true - latest - true - true - - 10.0 - AnyCPU;x64;x86; - AnyCPU;x64; - net7.0-windows10.0.22621.0;net8.0-windows10.0.22621.0 - $(TargetCPUs) - $(DotNetTargets); - - - - - - false - false - true - git - https://github.com/atcarter714/DXSharp - - - embedded - embedded - - true - true - - - - - - TRACE, DEBUG_COM, DEV_BUILD - - - TRACE, STRIP_CHECKS, DXS_FAST - - \ No newline at end of file + + + + true + false + + diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 9e2d385..8064ac9 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -1,58 +1,3 @@ - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - Unknown - Success - Failed - - - - - - - - - - - - - - - - + diff --git a/samples/HelloTexture/HelloTexture.csproj b/samples/HelloTexture/HelloTexture.csproj index f9cd7a5..1a4c957 100644 --- a/samples/HelloTexture/HelloTexture.csproj +++ b/samples/HelloTexture/HelloTexture.csproj @@ -1,11 +1,11 @@ - + Exe WinExe $(TargetCPUs); - $(DotNetTargets); + $(DotNetTargets) diff --git a/samples/HelloTexture/packages.lock.json b/samples/HelloTexture/packages.lock.json new file mode 100644 index 0000000..1edce93 --- /dev/null +++ b/samples/HelloTexture/packages.lock.json @@ -0,0 +1,10 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "dxsharp": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DXSharp.Dxc/DXSharp.Dxc.csproj b/src/DXSharp.Dxc/DXSharp.Dxc.csproj index 44d3e15..27a8784 100644 --- a/src/DXSharp.Dxc/DXSharp.Dxc.csproj +++ b/src/DXSharp.Dxc/DXSharp.Dxc.csproj @@ -1,70 +1,12 @@ - - - true - x64;arm64;AnyCPU; - $(DotNetTargets); - $(DxcSupportedPlatforms) - - - - - - - - - - - - - - - all - - - - - - - - - - $(PkgMicrosoft_Direct3D_DXC) - - - - - - - + + $(DotNetTargets) + Experimental DXSharp DirectX Shader Compiler bindings. + + + + + + + diff --git a/src/DXSharp.Dxc/packages.lock.json b/src/DXSharp.Dxc/packages.lock.json new file mode 100644 index 0000000..0faf002 --- /dev/null +++ b/src/DXSharp.Dxc/packages.lock.json @@ -0,0 +1,46 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "Microsoft.Direct3D.DXC": { + "type": "Direct", + "requested": "[1.9.2609.5, )", + "resolved": "1.9.2609.5", + "contentHash": "jTWr7a2bMpqV+b0Uc7oxOo8ualplaUw3fsQ+p0kp9TwlWvvmREvt3SA4+Drl2Y0M31iscqZolrL3vpdnLoPpdg==" + }, + "Microsoft.Windows.CsWin32": { + "type": "Direct", + "requested": "[0.3.49-beta, )", + "resolved": "0.3.49-beta", + "contentHash": "/iAXplVDKESFyLz/MShuVYVx62YFvFePpq3qrzREl8KScQqG6Z2kV7r9UJTjQS1g+hfy3V+e4m1x9lsu24YNSg==", + "dependencies": { + "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha", + "Microsoft.Windows.SDK.Win32Metadata": "55.0.45-preview", + "Microsoft.Windows.WDK.Win32Metadata": "0.9.9-experimental" + } + }, + "Microsoft.Windows.SDK.Win32Metadata": { + "type": "Direct", + "requested": "[56.0.13-preview, )", + "resolved": "56.0.13-preview", + "contentHash": "FFYoqrwUuxbV94i3JEl3n7H0SuBsh1+8L6dhC4fKGvArIK6PjiCn29sQ1k0odJf88GqvedUvgkditRr8R7h7Uw==" + }, + "Microsoft.Windows.SDK.Win32Docs": { + "type": "Transitive", + "resolved": "0.1.42-alpha", + "contentHash": "Z/9po23gUA9aoukirh2ItMU2ZS9++Js9Gdds9fu5yuMojDrmArvY2y+tq9985tR3cxFxpZO1O35Wjfo0khj5HA==" + }, + "Microsoft.Windows.WDK.Win32Metadata": { + "type": "Transitive", + "resolved": "0.9.9-experimental", + "contentHash": "cncPlxLqR25mFOuvpxZPgXgJqRmXyV5eTULj/9w8AQvO/c1xJDEapohRsWkYaia7hCR/EwEzBHr7RU9u93T03w==", + "dependencies": { + "Microsoft.Windows.SDK.Win32Metadata": "55.0.45-preview" + } + }, + "dxsharp": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DXSharp.Framework/DXSharp.Framework.csproj b/src/DXSharp.Framework/DXSharp.Framework.csproj index 907e99a..cc0ac01 100644 --- a/src/DXSharp.Framework/DXSharp.Framework.csproj +++ b/src/DXSharp.Framework/DXSharp.Framework.csproj @@ -1,21 +1,10 @@ - - - - $(TargetCPUs); - $(DotNetTargets); - false - true - true - - - - - - - - - - - - + + + $(DotNetTargets) + Experimental DXSharp framework helpers. + + + + + diff --git a/src/DXSharp.Framework/packages.lock.json b/src/DXSharp.Framework/packages.lock.json new file mode 100644 index 0000000..d46a161 --- /dev/null +++ b/src/DXSharp.Framework/packages.lock.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "dxsharp": { + "type": "Project" + }, + "dxsharp.dxc": { + "type": "Project", + "dependencies": { + "DXSharp": "[0.4.0-net10-preview.1, )" + } + } + } + } +} \ No newline at end of file diff --git a/src/DXSharp/DXSharp.csproj b/src/DXSharp/DXSharp.csproj index 2d1ffb2..9d58931 100644 --- a/src/DXSharp/DXSharp.csproj +++ b/src/DXSharp/DXSharp.csproj @@ -1,117 +1,16 @@ - - - - true - true - true - - DXSharp - $(VersionPrefix) - $(DotNetTargets); - DXSharp_ICON_512.ico - A modern .NET Core wrapper for DirectX 12 Agility SDK, DXGI, DXCore and Dxc (DirectX Shader Compiler). - - true - true - $(RepoRootPath)doc\$(MSBuildProjectName).xml - $(RepoRootPath)obj\$(MSBuildProjectName)\ - - - - - - - True - \ - PreserveNewest - - - True - \ - - - - - - - - - - - - all - - - - - $(AgilityVersion) - true - runtime; build; native; contentfiles; - - - - - $(PkgMicrosoft_Direct3D_D3D12) - $(AgilityPackagePath)\build\native\bin\$(NativePlatformName) - - - - - - - - - PreserveNewest - $(OutputPath)%(RecursiveDir)%(FileName)%(Extension) - true - - - - - - %(Filename) - .\%(Filename)%(Extension) - - - - - - - - True - True - LibResources.resx - - - - ResXFileCodeGenerator - LibResources.Designer.cs - - - - - - - - - - PreserveNewest - - - - - - - $(PowershellScriptsFolder)\DXSPreBuild.ps1 - $(DXSBuildDir)logs\DXSharp_SDK_PreBuild_1.dxslog - - - + + + $(DotNetTargets) + true + A modern DirectX 12 binding for .NET. Experimental .NET 10 migration baseline. + DXSharp_Logo_00_512.png + + + + + + + - - - - - - - - - \ No newline at end of file diff --git a/src/DXSharp/Direct3D12/Data/D3D12Structs.cs b/src/DXSharp/Direct3D12/Data/D3D12Structs.cs index b62eccc..fe8cd4b 100644 --- a/src/DXSharp/Direct3D12/Data/D3D12Structs.cs +++ b/src/DXSharp/Direct3D12/Data/D3D12Structs.cs @@ -13,7 +13,7 @@ using DXSharp.DXGI ; using DXSharp.Windows ; using static DXSharp.InteropUtils ; -using IDisposable = ABI.System.IDisposable ; +using IDisposable = System.IDisposable ; #endregion namespace DXSharp.Direct3D12 ; @@ -2324,4 +2324,4 @@ public SerializedDataDriverMatchingIdentifier( in Guid driverOpaqueGUID, ReadOnl DriverOpaqueGUID = driverOpaqueGUID ; DriverOpaqueVersioningData = driverOpaqueVersioningData ; } -} ; \ No newline at end of file +} ; diff --git a/src/DXSharp/Windows/Renderform.cs b/src/DXSharp/Windows/Renderform.cs index 24dd014..a4d4f88 100644 --- a/src/DXSharp/Windows/Renderform.cs +++ b/src/DXSharp/Windows/Renderform.cs @@ -285,6 +285,7 @@ public event WndProcDelegate WindowsMessageReceived { /// for false - . /// /// true if this form can be resized by the user (by default); otherwise, false. + [System.ComponentModel.DefaultValue( false )] public bool AllowUserResizing { get => allowUserResizing ; set { @@ -305,6 +306,7 @@ public bool AllowUserResizing { /// If Toolkit is used, this property is set automatically, /// otherwise user should maintain it himself as it affects the behavior of property. /// + [System.ComponentModel.DefaultValue( false )] public bool IsFullscreen { get ; set ; } @@ -615,4 +617,4 @@ public static float GetDPIScaleFactor( int value, int g_dpi = 96 ) { // ======================================================================================== -} ; \ No newline at end of file +} ; diff --git a/src/DXSharp/nuget.config b/src/DXSharp/nuget.config deleted file mode 100644 index 2f0f232..0000000 --- a/src/DXSharp/nuget.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/DXSharp/packages.lock.json b/src/DXSharp/packages.lock.json new file mode 100644 index 0000000..4527b29 --- /dev/null +++ b/src/DXSharp/packages.lock.json @@ -0,0 +1,43 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "Microsoft.Direct3D.D3D12": { + "type": "Direct", + "requested": "[1.620.1, )", + "resolved": "1.620.1", + "contentHash": "oQCFTys3PZ0IHtS3I/u0/1IWgpuG7aQa+84AGiraqc8bMOCM8QpDLwLBshEbJ1J7LmuctZReXhF8c0eCiu2Xcw==" + }, + "Microsoft.Windows.CsWin32": { + "type": "Direct", + "requested": "[0.3.49-beta, )", + "resolved": "0.3.49-beta", + "contentHash": "/iAXplVDKESFyLz/MShuVYVx62YFvFePpq3qrzREl8KScQqG6Z2kV7r9UJTjQS1g+hfy3V+e4m1x9lsu24YNSg==", + "dependencies": { + "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha", + "Microsoft.Windows.SDK.Win32Metadata": "55.0.45-preview", + "Microsoft.Windows.WDK.Win32Metadata": "0.9.9-experimental" + } + }, + "Microsoft.Windows.SDK.Win32Metadata": { + "type": "Direct", + "requested": "[56.0.13-preview, )", + "resolved": "56.0.13-preview", + "contentHash": "FFYoqrwUuxbV94i3JEl3n7H0SuBsh1+8L6dhC4fKGvArIK6PjiCn29sQ1k0odJf88GqvedUvgkditRr8R7h7Uw==" + }, + "Microsoft.Windows.SDK.Win32Docs": { + "type": "Transitive", + "resolved": "0.1.42-alpha", + "contentHash": "Z/9po23gUA9aoukirh2ItMU2ZS9++Js9Gdds9fu5yuMojDrmArvY2y+tq9985tR3cxFxpZO1O35Wjfo0khj5HA==" + }, + "Microsoft.Windows.WDK.Win32Metadata": { + "type": "Transitive", + "resolved": "0.9.9-experimental", + "contentHash": "cncPlxLqR25mFOuvpxZPgXgJqRmXyV5eTULj/9w8AQvO/c1xJDEapohRsWkYaia7hCR/EwEzBHr7RU9u93T03w==", + "dependencies": { + "Microsoft.Windows.SDK.Win32Metadata": "55.0.45-preview" + } + } + } + } +} \ No newline at end of file diff --git a/tests/BasicTests/BasicTests.csproj b/tests/BasicTests/BasicTests.csproj index 721e695..9a8f236 100644 --- a/tests/BasicTests/BasicTests.csproj +++ b/tests/BasicTests/BasicTests.csproj @@ -1,22 +1,21 @@ - + - $(RepoRootPath)bin\Tests\$(MSBuildProjectName)\$(Platform)\ - $(DotNetTargets); + $(DotNetTargets) $(TargetCPUs); false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/BasicTests/DXGITests.cs b/tests/BasicTests/DXGITests.cs index 18c3620..4993cf2 100644 --- a/tests/BasicTests/DXGITests.cs +++ b/tests/BasicTests/DXGITests.cs @@ -31,6 +31,7 @@ namespace BasicTests; +[Category( "BuildBaseline" )] [TestFixture( Author = "Aaron T. Carter", Category = "DXGI Interop", Description = "Testing DXSharp.DXGI interop code", TestName = "DXSharp.DXGI" )] internal class DXGITests @@ -104,4 +105,4 @@ public void Test_DXGI_Rationals() { //{ //} -}; \ No newline at end of file +}; diff --git a/tests/BasicTests/packages.lock.json b/tests/BasicTests/packages.lock.json new file mode 100644 index 0000000..c35e064 --- /dev/null +++ b/tests/BasicTests/packages.lock.json @@ -0,0 +1,92 @@ +{ + "version": 2, + "dependencies": { + "net10.0-windows10.0.26100": { + "coverlet.collector": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.7.2, )", + "resolved": "17.7.2", + "contentHash": "WOSF/GUYcnrLGkdvCbXDRig2rShtBwfQc5l7IxQE6PZI3CeXAqF1SpyzwlGA5vw+MdEAXs3niy+ZkGBBWna6tw==", + "dependencies": { + "Microsoft.CodeCoverage": "17.7.2", + "Microsoft.TestPlatform.TestHost": "17.7.2" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==", + "dependencies": { + "NETStandard.Library": "2.0.0" + } + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "8bGAEljlBnzR+uU8oGQhTVKnbgBw1Mo71qjVkgzHdvtUkiB5XOIDyjAcS4KUo/j+F2Zv/xBUZRkCWXmejx4bfA==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.7.2", + "contentHash": "ntbkwIqwszkfCRjxVZOyEQiHauiYsY9NtYjw9ASsoxDSiG8YtV6AGcOAwrAk3TZv2UOq4MrpX+3MYEeMHSb03w==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "17.7.2", + "contentHash": "aHzQWgDMVBnk39HhQVmn06w+YxzF1h2V5/M4WgrNQAn7q97GR4Si3vLRTDlmJo9nK/Nknce+H4tXx4gqOKyLeg==", + "dependencies": { + "NuGet.Frameworks": "6.5.0" + } + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "17.7.2", + "contentHash": "pv9yVD7IKPLJV28zYjLsWFiM3j506I2ye+6NquG8vsbm/gR7lgyig8IgY6Vo57VMvGaAKwtUECzcj+C5tH271Q==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "17.7.2", + "Newtonsoft.Json": "13.0.1" + } + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "NuGet.Frameworks": { + "type": "Transitive", + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" + }, + "dxsharp": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index ce33bde..98e80f1 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,39 +1,8 @@ - - - - $([System.DateTime]::Now.ToString()) - $([System.DateTime]::UtcNow.ToString()) - $(SolutionDir) - - - true - true - true - ..\tools - ..\build - $(BuildsDirectory)\msbuild - $(SharedPropsDirectory)\DXSharpShared.Build.props - $(SharedPropsDirectory)\DXSharpShared.Build.targets - $(ToolsDirectory)\tasks\DXSharp.Tools.Builds - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + true + true + false + + diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 8e98ecf..8064ac9 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -1,39 +1,3 @@ - - - - - - - - $([System.Guid]::NewGuid()) - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff --git a/tools/DXSharp.Tools.Builds/DXSharp.Tools.Builds.csproj b/tools/DXSharp.Tools.Builds/DXSharp.Tools.Builds.csproj index 6e1c1ad..08a0266 100644 --- a/tools/DXSharp.Tools.Builds/DXSharp.Tools.Builds.csproj +++ b/tools/DXSharp.Tools.Builds/DXSharp.Tools.Builds.csproj @@ -1,55 +1,8 @@ - - - - - - - - - AnyCPU - netstandard2.0 - netstandard2.0 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + netstandard2.0 + + + + + diff --git a/tools/DXSharp.Tools.Builds/packages.lock.json b/tools/DXSharp.Tools.Builds/packages.lock.json new file mode 100644 index 0000000..5219a50 --- /dev/null +++ b/tools/DXSharp.Tools.Builds/packages.lock.json @@ -0,0 +1,153 @@ +{ + "version": 2, + "dependencies": { + ".NETStandard,Version=v2.0": { + "Microsoft.Build.Utilities.Core": { + "type": "Direct", + "requested": "[17.14.28, )", + "resolved": "17.14.28", + "contentHash": "rhSdPo8QfLXXWM+rY0x0z1G4KK4ZhMoIbHROyDj8MUBFab9nvHR0NaMnjzOgXldhmD2zi2ir8d6xCatNzlhF5g==", + "dependencies": { + "Microsoft.Build.Framework": "17.14.28", + "Microsoft.NET.StringTools": "17.14.28", + "Microsoft.Win32.Registry": "5.0.0", + "System.Collections.Immutable": "9.0.0", + "System.Configuration.ConfigurationManager": "9.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0", + "System.Memory": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0", + "System.Security.Cryptography.ProtectedData": "9.0.0", + "System.Security.Principal.Windows": "5.0.0", + "System.Text.Encoding.CodePages": "9.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Microsoft.Build.Framework": { + "type": "Transitive", + "resolved": "17.14.28", + "contentHash": "wRcyTzGV0LRAtFdrddtioh59Ky4/zbvyraP0cQkDzRSRkhgAQb0K88D/JNC6VHLIXanRi3mtV1jU0uQkBwmiVg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0", + "System.Memory": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Microsoft.NET.StringTools": { + "type": "Transitive", + "resolved": "17.14.28", + "contentHash": "DMIeWDlxe0Wz0DIhJZ2FMoGQAN2yrGZOi5jjFhRYHWR5ONd0CS6IpAHlRnA7uA/5BF+BADvgsETxW2XrPiFc1A==", + "dependencies": { + "System.Memory": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "9.0.0", + "contentHash": "PdkuMrwDhXoKFo/JxISIi9E8L+QGn9Iquj2OKDWHB6Y/HnUOuBouF7uS3R4Hw3FoNmwwMo6hWgazQdyHIIs27A==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "9.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "9.0.0", + "contentHash": "ddppcFpnbohLWdYKr/ZeLZHmmI+DXFgZ3Snq+/E7SwcdW4UnvxmaugkwGywvGVWkHPGCSZjCP+MLzu23AL5SDw==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==", + "dependencies": { + "System.Buffers": "4.6.0", + "System.Numerics.Vectors": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "t+SoieZsRuEyiw/J+qXUbolyO219tKQQI0+2/YI+Qv7YdGValA6WiuokrNKqjrTNsy5ABWU11bdKOzUdheteXg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.1.0", + "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "9.0.0", + "contentHash": "CJW+x/F6fmRQ7N6K8paasTw9PDZp4t7G76UjGNlSDgoHPF0h08vTzLYbLZpOLEJSg35d5wy2jCXGo84EN05DpQ==", + "dependencies": { + "System.Memory": "4.5.5" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "9.0.0", + "contentHash": "GxJTSFPQpoVd0vQRgq8hwesicxgZoHTbYMvR/UMM4IzhkHMT+ebZE11c2C1gUyxz55zWtGCWktMTHvmgLzob9g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + } + } + } +} \ No newline at end of file diff --git a/tools/Directory.Build.props b/tools/Directory.Build.props index 35c3dee..f56b985 100644 --- a/tools/Directory.Build.props +++ b/tools/Directory.Build.props @@ -1,238 +1,9 @@ - - - - - true - - - - - - RoslynCodeFactory - - - - - - CodeTaskFactory - - - - - - - %(RootPath)\%(Name).cs;%(RootPath)\%(Name).targets" - %(RootPath) - %(Name) - - RoslynCodeTaskFactory - $(InlineTaskErrorChecks) - - .\ - $(TaskName).cs - $(TaskName).targets - $(RepoRootPath)tools\tasks\$(MSBuildProjectName) - - - - - - true - - false - true - AnyCPU - false - netstandard2.0 - $(DotNetTargets) - $(SolutionDir) - - 0.1.0 - $(RepoRootPath)tools - $(DXSToolsPath)\tasks - $(DXSToolsPath)\bin - $(DXSTasksPath)\bin - - $(DXSToolsPath)\obj\$(MSBuildProjectName)\$(Configuration) - $(DXSToolsPath)\bin\$(MSBuildProjectName)\$(Configuration) - $(DXSToolsPath)\bin\$(MSBuildProjectName)\$(Configuration)\$(TargetFramework) - - $(DXSTasksPath)\obj\$(MSBuildProjectName)\$(Configuration) - $(DXSTasksPath)\bin\$(MSBuildProjectName)\$(Configuration) - $(DXSTasksPath)\bin\$(MSBuildProjectName)\$(Configuration)\$(TargetFramework) - - $(MSBuildProjectDirectory) - $(ToolsSrcFolder)Shaders - $(DXSTasksPath)\$(MSBuildProjectName) - $([MSBuild]::MakeRelative( $(RepoRootPath), $(ToolsSrcFolder) )) - $(DXSToolsLibrariesPath)\packages\$(MSBuildProjectName) - - Debug;Release;InlineTasks;Package - false - true - true - - - - - - false - false - false - true - $(DXSTasksPath)\ - $(InlineTasksOutputFolder)\ - - - - - - true - false - false - $(NuGetPackageOutputFolder)\ - - - tasks - - - NU5100 - true - embedded - dxsharp;msbuild;tasks;tools;shader;dxc;compiler;directx;3d;hlsl - - - - - - - false - Library - true - false - $(DXSToolsDllOutputPath)\ - $(DXSToolsDllObjPath)\ - - - - - - - - - - - - - - Arkaen Solutions - Aaron T. Carter, $(Company) - $(MSBuildProjectName) - $(DXSToolsVersion) - $(AssemblyName) - Custom tooling for the DXSharp build process. - $(MSBuildProjectName) - $(Product) - Copyright © Aaron T. Carter, Arkaen Solutions. All rights reserved. - $(MSBuildProjectName) - - netstandard2.0 - $(MSBuildProjectName) - $(MSBuildProjectName) - false - false - true - - - 10 - true - $(DXSToolsVersion) - AllEnabledByDefault - - + + + + netstandard2.0 + AnyCPU + false + - - - - diff --git a/tools/Directory.Build.targets b/tools/Directory.Build.targets index 59bbb6e..8064ac9 100644 --- a/tools/Directory.Build.targets +++ b/tools/Directory.Build.targets @@ -1,250 +1,3 @@ - - - - - - - - - true - - Tools.targets - $(ToolsSrcFolder)\$(ToolsDefFileName) - - - - - - - - - - - - - - - - - - .\$([MSBuild]::MakeRelative('$(ToolsSrcFolder)', '$(ToolTargetsPath)')) - $(InlineTasksOutputFolder) - $(ToolsDefFileName) - null - tool-define - - - - - <_allTargetsFiles Include="$(ToolsSrcFolder)\**\*.targets" /> - - - <_swappedExtToTargets Include="@( csFiles -> '%(Identity)'->Replace('.cs', '.targets'))" /> - - - - - - - - - - <_allClassFiles Include="$(ToolsSrcFolder)\**\*.cs" Exclude="**\obj\**" /> - <_allTargetsFiles Include="$(ToolsSrcFolder)\**\*.targets" Exclude="**\obj\**" /> - <_swappedCsToTargets Include="@( _allClassFiles -> '%(Identity)'->Replace('.cs', '.targets') )" /> - <_validTaskDefs Include="@( _swappedCsToTargets )" Condition=" Exists( '%(Identity)' ) " /> - <_folderNames Include="@( _validTaskDefs -> '%(Identity)'->Replace( '$(RepoRootPath)', '' ) )" /> - - - - $([MSBuild]::MakeRelative('$(ToolsSrcFolder)', '%(Identity)')) - - $(InlineTasksOutputFolder) - %(RootDir)%(Directory) - %(Filename).targets - %(Filename).cs - %(Filename) - task-inline - Code - - - %( InlineTaskDefinition.Identity ) - %(Filename).targets - %( TaskName ) - %( Identity ) - task-inline - - Code - - - - - - .\$([MSBuild]::MakeRelative('$(ToolsSrcFolder)', '%(Identity)')) - $(InlineTasksOutputFolder) - %(RootDir)%(Directory) - %(Filename).targets - %(Filename).cs - %(Filename) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_inlineTaskDefFiles Include="@( InlineTaskDefinitions )" /> - <_inlineTaskDefFiles Include="@( InlineTaskDefinitions )" /> - - - - - - - - - - - - - - - - false - true - false - - - - - - - - - - - $([System.DateTime]::Now.ToString( 'MM-dd-YY HH:mm' )) - - - - - - - - - - - - - - \ No newline at end of file + + +