Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sanitize projects #662

Closed
wants to merge 13 commits into from
Closed

Sanitize projects #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
40f198e
fix gitignore
longod Oct 14, 2020
c65af27
unified pix version
longod Oct 14, 2020
d63fdcf
fix sdk and toolset version for d3dx12.h
longod Oct 14, 2020
41f85a6
fix D3D12RaytracingMiniEngineSample compile
longod Oct 14, 2020
a1501c3
fix for vs2017
longod Oct 15, 2020
ed7234f
upgrade sln to vs2019
longod Oct 15, 2020
1e2764e
upgrade memory management to vs2017
longod Oct 15, 2020
d1a8d2d
ignore generated header
longod Oct 15, 2020
1bee052
fix indent
longod Oct 15, 2020
54dd8a1
revert sdk version
longod Oct 15, 2020
e08c5c8
add comment on gitignore
longod Oct 16, 2020
c283e5d
Merge branch 'master' into sanitize_projects
longod Nov 5, 2020
2a7dd75
remove copied model. it fixed e2e1cbcd52a3023944b34b3a360fbb830b6a0042
longod Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MiniEngine/Core/Core_VS15.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
Expand Down
2 changes: 1 addition & 1 deletion MiniEngine/Model/Model_VS15.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
Expand Down
18 changes: 9 additions & 9 deletions MiniEngine/ModelConverter/ModelConverter_VS15.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PlatformToolset>v141</PlatformToolset>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<TargetRuntime>Native</TargetRuntime>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
Expand Down Expand Up @@ -76,23 +76,23 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>..\Packages\zlib-vc140-static-64.1.2.11\lib\native\libs\x64\static\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\Packages\zlib-vc140-static-64.1.2.11\lib\native\libs\x64\static\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>zlibstatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/nodefaultlib:LIBCMT %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ImportGroup Label="ExtensionTargets">
<Import Project="..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets" Condition="Exists('..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets')" />
<Import Project="..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets" Condition="Exists('..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets')" />
<Import Project="..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets" Condition="Exists('..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets')" />
<Import Project="..\..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets" Condition="Exists('..\..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets')" />
<Import Project="..\..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets" Condition="Exists('..\..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets')" />
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets'))" />
<Error Condition="!Exists('..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets'))" />
<Error Condition="!Exists('..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets'))" />
<Error Condition="!Exists('..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('..\..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets'))" />
<Error Condition="!Exists('..\..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets'))" />
<Error Condition="!Exists('..\..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets'))" />
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion MiniEngine/ModelConverter/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="assimp_native" version="4.0.1" targetFramework="native" />
<package id="assimp_native.redist" version="4.0.1" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.170918004" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
<package id="zlib-vc140-static-64" version="1.2.11" targetFramework="native" />
</packages>
7 changes: 5 additions & 2 deletions Samples/Desktop/D3D1211On12/src/D3D1211On12.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D1211On12", "D3D1211On12.vcxproj", "{46B71301-A352-4611-BB90-6987F918B988}"
EndProject
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E6545E63-C6FC-4D18-9ADA-D7D923697255}
EndGlobalSection
EndGlobal
7 changes: 5 additions & 2 deletions Samples/Desktop/D3D12Bundles/src/D3D12Bundles.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12Bundles", "D3D12Bundles.vcxproj", "{6B14BF7F-31E1-4DC9-91F2-9CDDB6E22C2C}"
EndProject
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3547A2F5-D407-4BE8-8043-4C83C3CE9097}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" />
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Samples/Desktop/D3D12Bundles/src/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WinPixEventRuntime" version="1.0.161208001" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
</packages>
17 changes: 10 additions & 7 deletions Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12DepthBoundsTest", "D3D12DepthBoundsTest.vcxproj", "{A6DB1D1C-E2EE-462D-AC61-0E3100C010DF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12DepthBoundsTest", "D3D12DepthBoundsTest.vcxproj", "{EDC25A65-E2D7-427E-8FEA-DB448AFD71AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A6DB1D1C-E2EE-462D-AC61-0E3100C010DF}.Debug|x64.ActiveCfg = Debug|x64
{A6DB1D1C-E2EE-462D-AC61-0E3100C010DF}.Debug|x64.Build.0 = Debug|x64
{A6DB1D1C-E2EE-462D-AC61-0E3100C010DF}.Release|x64.ActiveCfg = Release|x64
{A6DB1D1C-E2EE-462D-AC61-0E3100C010DF}.Release|x64.Build.0 = Release|x64
{EDC25A65-E2D7-427E-8FEA-DB448AFD71AD}.Debug|x64.ActiveCfg = Debug|x64
{EDC25A65-E2D7-427E-8FEA-DB448AFD71AD}.Debug|x64.Build.0 = Debug|x64
{EDC25A65-E2D7-427E-8FEA-DB448AFD71AD}.Release|x64.ActiveCfg = Release|x64
{EDC25A65-E2D7-427E-8FEA-DB448AFD71AD}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB69B4AA-1ADB-409A-AAE0-84FE660B2A77}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" />
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Samples/Desktop/D3D12DepthBoundsTest/src/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WinPixEventRuntime" version="1.0.161208001" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
</packages>
7 changes: 5 additions & 2 deletions Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12DynamicIndexing", "D3D12DynamicIndexing.vcxproj", "{110F6CA7-039D-437F-A624-8D218C14D0EF}"
EndProject
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6F153D84-DE5E-4794-B57F-3030203CD489}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" />
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Samples/Desktop/D3D12DynamicIndexing/src/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WinPixEventRuntime" version="1.0.161208001" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
</packages>
7 changes: 5 additions & 2 deletions Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12ExecuteIndirect", "D3D12ExecuteIndirect.vcxproj", "{9C46643A-4522-46F1-94B9-7207B9A1B4F5}"
EndProject
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {494A62E1-EB51-489F-BB84-E66553759A3E}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" />
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Samples/Desktop/D3D12ExecuteIndirect/src/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WinPixEventRuntime" version="1.0.161208001" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
</packages>
7 changes: 5 additions & 2 deletions Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12Fullscreen", "D3D12Fullscreen.vcxproj", "{296530E7-221E-436A-80FC-B1EF5218C820}"
EndProject
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {02617CFD-EB6D-4E58-98AF-5796FCAC5B1B}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" />
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Samples/Desktop/D3D12Fullscreen/src/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WinPixEventRuntime" version="1.0.161208001" targetFramework="native" />
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
</packages>
Loading