Skip to content

Commit d65be2b

Browse files
stanardstanard
committed
Updated NuGet packages for MiniEngine and RT apps
1 parent 7aa2466 commit d65be2b

File tree

9 files changed

+38
-29
lines changed

9 files changed

+38
-29
lines changed

‎MiniEngine/Model/Model.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@
174174
</ItemGroup>
175175
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
176176
<ImportGroup Label="ExtensionTargets">
177-
<Import Project="..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets')" />
178-
<Import Project="..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets')" />
177+
<Import Project="..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" />
178+
<Import Project="..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" />
179179
</ImportGroup>
180180
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
181181
<PropertyGroup>
182182
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
183183
</PropertyGroup>
184-
<Error Condition="!Exists('..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets'))" />
185-
<Error Condition="!Exists('..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets'))" />
184+
<Error Condition="!Exists('..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets'))" />
185+
<Error Condition="!Exists('..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets'))" />
186186
</Target>
187187
</Project>

‎MiniEngine/Model/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="directxmesh_desktop_win10" version="2024.6.5.1" targetFramework="native" />
4-
<package id="directxtex_desktop_win10" version="2024.6.5.1" targetFramework="native" />
3+
<package id="directxmesh_desktop_win10" version="2024.10.29.1" targetFramework="native" />
4+
<package id="directxtex_desktop_win10" version="2024.10.29.1" targetFramework="native" />
55
</packages>

‎MiniEngine/ModelViewer/ModelViewer.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,17 @@
362362
</ItemDefinitionGroup>
363363
<ImportGroup Label="ExtensionTargets">
364364
<Import Project="..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets" Condition="Exists('..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" />
365-
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets')" />
366-
<Import Project="..\..\Packages\directxmesh_desktop_win10.2024.2.22.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\Packages\directxmesh_desktop_win10.2024.2.22.1\build\native\directxmesh_desktop_win10.targets')" />
367-
<Import Project="..\..\Packages\directxtex_desktop_win10.2024.2.22.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\Packages\directxtex_desktop_win10.2024.2.22.1\build\native\directxtex_desktop_win10.targets')" />
365+
<Import Project="..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" />
366+
<Import Project="..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" />
367+
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
368368
</ImportGroup>
369369
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
370370
<PropertyGroup>
371371
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
372372
</PropertyGroup>
373373
<Error Condition="!Exists('..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
374-
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets'))" />
375-
<Error Condition="!Exists('..\..\Packages\directxmesh_desktop_win10.2024.2.22.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxmesh_desktop_win10.2024.2.22.1\build\native\directxmesh_desktop_win10.targets'))" />
376-
<Error Condition="!Exists('..\..\Packages\directxtex_desktop_win10.2024.2.22.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxtex_desktop_win10.2024.2.22.1\build\native\directxtex_desktop_win10.targets'))" />
374+
<Error Condition="!Exists('..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets'))" />
375+
<Error Condition="!Exists('..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets'))" />
376+
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
377377
</Target>
378378
</Project>

‎MiniEngine/ModelViewer/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="directxmesh_desktop_win10" version="2024.2.22.1" targetFramework="native" />
4-
<package id="directxtex_desktop_win10" version="2024.2.22.1" targetFramework="native" />
5-
<package id="WinPixEventRuntime" version="1.0.231030001" targetFramework="native" />
3+
<package id="directxmesh_desktop_win10" version="2024.10.29.1" targetFramework="native" />
4+
<package id="directxtex_desktop_win10" version="2024.10.29.1" targetFramework="native" />
5+
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
66
<package id="zlib-msvc-x64" version="1.2.11.8900" targetFramework="native" />
77
</packages>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,16 +229,16 @@
229229
</FxCompile>
230230
</ItemDefinitionGroup>
231231
<ImportGroup Label="ExtensionTargets">
232-
<Import Project="..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets')" />
233-
<Import Project="..\..\..\..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\..\..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets')" />
234232
<Import Project="..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
233+
<Import Project="..\..\..\..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\..\..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" />
234+
<Import Project="..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" />
235235
</ImportGroup>
236236
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
237237
<PropertyGroup>
238238
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
239239
</PropertyGroup>
240-
<Error Condition="!Exists('..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.6.5.1\build\native\directxmesh_desktop_win10.targets'))" />
241-
<Error Condition="!Exists('..\..\..\..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\directxtex_desktop_win10.2024.6.5.1\build\native\directxtex_desktop_win10.targets'))" />
242240
<Error Condition="!Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
241+
<Error Condition="!Exists('..\..\..\..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets'))" />
242+
<Error Condition="!Exists('..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets'))" />
243243
</Target>
244244
</Project>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj.filters

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@
2626
<FxCompile Include="RayGenerationShaderLib.hlsl" />
2727
<FxCompile Include="RayGenerationShaderSSRLib.hlsl" />
2828
<FxCompile Include="RayGenerationShadowsLib.hlsl" />
29-
<FxCompile Include="*Lib.hlsl" />
29+
<FxCompile Include="hitShaderLib.hlsl" />
30+
<FxCompile Include="missShaderLib.hlsl" />
31+
<FxCompile Include="missShadowsLib.hlsl" />
32+
<FxCompile Include="RayGenerationShaderLib.hlsl" />
33+
<FxCompile Include="RayGenerationShaderSSRLib.hlsl" />
34+
<FxCompile Include="RayGenerationShadowsLib.hlsl" />
3035
<FxCompile Include="*Lib.hlsl" />
3136
<FxCompile Include="*Lib.hlsl">
3237
<Filter>Shaders</Filter>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="directxmesh_desktop_win10" version="2024.6.5.1" targetFramework="native" />
4-
<package id="directxtex_desktop_win10" version="2024.6.5.1" targetFramework="native" />
3+
<package id="directxmesh_desktop_win10" version="2024.10.29.1" targetFramework="native" />
4+
<package id="directxtex_desktop_win10" version="2024.10.29.1" targetFramework="native" />
55
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
66
</packages>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@
7575
</PropertyGroup>
7676
<ItemDefinitionGroup>
7777
<FxCompile>
78-
<EntryPointName></EntryPointName>
79-
<ObjectFileOutput></ObjectFileOutput>
78+
<EntryPointName>
79+
</EntryPointName>
80+
<ObjectFileOutput>
81+
</ObjectFileOutput>
8082
<AdditionalIncludeDirectories>$(ProjectDir);RTAO/shaders;SampleCore/shaders;SampleCore/shaders/util</AdditionalIncludeDirectories>
8183
<ShaderType>Compute</ShaderType>
8284
<ShaderModel>6.3</ShaderModel>
@@ -334,7 +336,8 @@
334336
<VariableName Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">g_p%(Filename)</VariableName>
335337
</FxCompile>
336338
<FxCompile Include="SampleCore\Shaders\Pathtracer.hlsl">
337-
<EntryPointName></EntryPointName>
339+
<EntryPointName>
340+
</EntryPointName>
338341
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6.3</ShaderModel>
339342
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/Zpr %(AdditionalOptions)</AdditionalOptions>
340343
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">6.3</ShaderModel>
@@ -409,7 +412,8 @@
409412
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
410413
</FxCompile>
411414
<FxCompile Include="RTAO\Shaders\RTAO.hlsl">
412-
<EntryPointName></EntryPointName>
415+
<EntryPointName>
416+
</EntryPointName>
413417
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Library</ShaderType>
414418
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6.3</ShaderModel>
415419
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Library</ShaderType>
@@ -647,14 +651,14 @@
647651
</ItemGroup>
648652
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
649653
<ImportGroup Label="ExtensionTargets">
650-
<Import Project="..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.6.5.1\build\native\directxtk12_desktop_2019.targets" Condition="Exists('..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.6.5.1\build\native\directxtk12_desktop_2019.targets')" />
651654
<Import Project="..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
655+
<Import Project="..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.10.29.1\build\native\directxtk12_desktop_2019.targets" Condition="Exists('..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.10.29.1\build\native\directxtk12_desktop_2019.targets')" />
652656
</ImportGroup>
653657
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
654658
<PropertyGroup>
655659
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
656660
</PropertyGroup>
657-
<Error Condition="!Exists('..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.6.5.1\build\native\directxtk12_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.6.5.1\build\native\directxtk12_desktop_2019.targets'))" />
658661
<Error Condition="!Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
662+
<Error Condition="!Exists('..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.10.29.1\build\native\directxtk12_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.10.29.1\build\native\directxtk12_desktop_2019.targets'))" />
659663
</Target>
660664
</Project>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="directxtk12_desktop_2019" version="2024.6.5.1" targetFramework="native" />
3+
<package id="directxtk12_desktop_2019" version="2024.10.29.1" targetFramework="native" />
44
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)