diff --git a/.gitignore b/.gitignore index 732ceba80ea..3ec2ad51396 100644 --- a/.gitignore +++ b/.gitignore @@ -331,6 +331,7 @@ ASALocalRun/ /.dotnet /.packages /.tools/vswhere/2.5.2 +/.tools/vswhere/3.1.7 /.tools/native/iltools ### OSX ### diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index 4bf203e4e53..ed96b146fba 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -17,7 +17,7 @@ preview 10 true - true + true v143 - - 10.0.19041.0 + + 10.0.26100.0 DynamicLibrary diff --git a/global.json b/global.json index b7b37c8681a..d39300442af 100644 --- a/global.json +++ b/global.json @@ -20,7 +20,6 @@ }, "native-tools": { "strawberry-perl": "5.28.1.1-1", - "net-framework-48-ref-assemblies": "0.0.0.1", - "windows-sdk-d3d-redist": "1.0.0" + "net-framework-48-ref-assemblies": "0.0.0.1" } } diff --git a/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj b/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj index d29554ad3c7..fb5904834d7 100644 --- a/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj +++ b/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj @@ -34,9 +34,7 @@ - - $(RepositoryToolsDir)native\bin\windows-sdk-d3d-redist\1.0.0\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll + $(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll 16.0