diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/.editorconfig | 37 | ||||
-rw-r--r-- | src/ext/DirectX/CSharp.Build.props (renamed from src/CSharp.Build.props) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/Cpp.Build.props (renamed from src/Cpp.Build.props) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/DirectX.wixext.sln | 61 | ||||
-rw-r--r-- | src/ext/DirectX/Directory.Build.props (renamed from src/Directory.Build.props) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/Directory.Build.targets (renamed from src/Directory.Build.targets) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/README.md | 2 | ||||
-rw-r--r-- | src/ext/DirectX/appveyor.cmd | 14 | ||||
-rw-r--r-- | src/ext/DirectX/appveyor.yml | 40 | ||||
-rw-r--r-- | src/ext/DirectX/ca/directx.cpp (renamed from src/ca/directx.cpp) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/ca/directx.def (renamed from src/ca/directx.def) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/ca/directxca.vcxproj (renamed from src/ca/directxca.vcxproj) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/ca/dllmain.cpp (renamed from src/ca/dllmain.cpp) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/ca/packages.config (renamed from src/ca/packages.config) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/ca/precomp.h (renamed from src/ca/precomp.h) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/nuget.config | 17 | ||||
-rw-r--r-- | src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs (renamed from src/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.en-us.wxl (renamed from src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.en-us.wxl) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs (renamed from src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs (renamed from src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/example.txt (renamed from src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/example.txt) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj (renamed from src/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wix.snk (renamed from src/wix.snk) | bin | 596 -> 596 bytes | |||
-rw-r--r-- | src/ext/DirectX/wixext/DirectXDecompiler.cs (renamed from src/wixext/DirectXDecompiler.cs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixext/DirectXExtensionData.cs (renamed from src/wixext/DirectXExtensionData.cs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixext/DirectXExtensionFactory.cs (renamed from src/wixext/DirectXExtensionFactory.cs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj (renamed from src/wixext/WixToolset.DirectX.wixext.csproj) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets (renamed from src/wixext/WixToolset.DirectX.wixext.targets) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixlib/DirectXExtension.wxs (renamed from src/wixlib/DirectXExtension.wxs) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixlib/caerr.wxi (renamed from src/wixlib/caerr.wxi) | 0 | ||||
-rw-r--r-- | src/ext/DirectX/wixlib/directx.wixproj (renamed from src/wixlib/directx.wixproj) | 0 | ||||
-rw-r--r-- | src/ext/global.json | 5 | ||||
-rw-r--r-- | src/version.json | 11 |
33 files changed, 187 insertions, 0 deletions
diff --git a/src/.editorconfig b/src/.editorconfig new file mode 100644 index 00000000..1d72e683 --- /dev/null +++ b/src/.editorconfig | |||
@@ -0,0 +1,37 @@ | |||
1 | # Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
2 | # | ||
3 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig | ||
4 | # then update all of the repos. | ||
5 | |||
6 | root = true | ||
7 | |||
8 | [*] | ||
9 | charset = utf-8 | ||
10 | indent_style = space | ||
11 | indent_size = 4 | ||
12 | trim_trailing_whitespace = true | ||
13 | |||
14 | [*.{cs,vb}] | ||
15 | dotnet_sort_system_directives_first = true | ||
16 | |||
17 | [*.cs] | ||
18 | csharp_indent_case_contents = true : error | ||
19 | csharp_indent_switch_labels = true : error | ||
20 | csharp_new_line_before_open_brace = all | ||
21 | csharp_prefer_braces = true : error | ||
22 | csharp_style_expression_bodied_methods = when_on_single_line : suggestion | ||
23 | csharp_style_expression_bodied_constructors = when_on_single_line : suggestion | ||
24 | csharp_style_expression_bodied_operators = when_on_single_line : suggestion | ||
25 | csharp_style_expression_bodied_properties = when_on_single_line : suggestion | ||
26 | csharp_style_expression_bodied_indexers = when_on_single_line : suggestion | ||
27 | csharp_style_expression_bodied_accessors = when_on_single_line : suggestion | ||
28 | csharp_style_var_elsewhere = true : suggestion | ||
29 | csharp_style_var_for_built_in_types = true : suggestion | ||
30 | csharp_style_var_when_type_is_apparent = true : suggestion | ||
31 | dotnet_style_qualification_for_event = true : error | ||
32 | dotnet_style_qualification_for_field = true : error | ||
33 | dotnet_style_qualification_for_method = true : error | ||
34 | dotnet_style_qualification_for_property = true : error | ||
35 | |||
36 | [*.targets] | ||
37 | indent_size = 2 | ||
diff --git a/src/CSharp.Build.props b/src/ext/DirectX/CSharp.Build.props index b12f4c6e..b12f4c6e 100644 --- a/src/CSharp.Build.props +++ b/src/ext/DirectX/CSharp.Build.props | |||
diff --git a/src/Cpp.Build.props b/src/ext/DirectX/Cpp.Build.props index 9b7a1bb5..9b7a1bb5 100644 --- a/src/Cpp.Build.props +++ b/src/ext/DirectX/Cpp.Build.props | |||
diff --git a/src/ext/DirectX/DirectX.wixext.sln b/src/ext/DirectX/DirectX.wixext.sln new file mode 100644 index 00000000..2ec5721f --- /dev/null +++ b/src/ext/DirectX/DirectX.wixext.sln | |||
@@ -0,0 +1,61 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
3 | # Visual Studio Version 16 | ||
4 | VisualStudioVersion = 16.0.30204.135 | ||
5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "src\ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}" | ||
7 | EndProject | ||
8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "src\wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}" | ||
9 | EndProject | ||
10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "src\wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}" | ||
11 | EndProject | ||
12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "src\test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}" | ||
13 | EndProject | ||
14 | Global | ||
15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
16 | Debug|Any CPU = Debug|Any CPU | ||
17 | Debug|x86 = Debug|x86 | ||
18 | Release|Any CPU = Release|Any CPU | ||
19 | Release|x86 = Release|x86 | ||
20 | EndGlobalSection | ||
21 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
22 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
23 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
24 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|x86.ActiveCfg = Debug|Win32 | ||
25 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|x86.Build.0 = Debug|Win32 | ||
26 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
27 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|Any CPU.Build.0 = Release|Win32 | ||
28 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|x86.ActiveCfg = Release|Win32 | ||
29 | {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|x86.Build.0 = Release|Win32 | ||
30 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|Any CPU.ActiveCfg = Debug|x86 | ||
31 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|Any CPU.Build.0 = Debug|x86 | ||
32 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|x86.ActiveCfg = Debug|x86 | ||
33 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|x86.Build.0 = Debug|x86 | ||
34 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|Any CPU.ActiveCfg = Release|x86 | ||
35 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|Any CPU.Build.0 = Release|x86 | ||
36 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|x86.ActiveCfg = Release|x86 | ||
37 | {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|x86.Build.0 = Release|x86 | ||
38 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
39 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
40 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
41 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|x86.Build.0 = Debug|Any CPU | ||
42 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
43 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|Any CPU.Build.0 = Release|Any CPU | ||
44 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|x86.ActiveCfg = Release|Any CPU | ||
45 | {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|x86.Build.0 = Release|Any CPU | ||
46 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
47 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
48 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
49 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|x86.Build.0 = Debug|Any CPU | ||
50 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
51 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|Any CPU.Build.0 = Release|Any CPU | ||
52 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|x86.ActiveCfg = Release|Any CPU | ||
53 | {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|x86.Build.0 = Release|Any CPU | ||
54 | EndGlobalSection | ||
55 | GlobalSection(SolutionProperties) = preSolution | ||
56 | HideSolutionNode = FALSE | ||
57 | EndGlobalSection | ||
58 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
59 | SolutionGuid = {A32D323A-3843-410E-BB3A-A97ABA6E4107} | ||
60 | EndGlobalSection | ||
61 | EndGlobal | ||
diff --git a/src/Directory.Build.props b/src/ext/DirectX/Directory.Build.props index f83cc154..f83cc154 100644 --- a/src/Directory.Build.props +++ b/src/ext/DirectX/Directory.Build.props | |||
diff --git a/src/Directory.Build.targets b/src/ext/DirectX/Directory.Build.targets index dac7452a..dac7452a 100644 --- a/src/Directory.Build.targets +++ b/src/ext/DirectX/Directory.Build.targets | |||
diff --git a/src/ext/DirectX/README.md b/src/ext/DirectX/README.md new file mode 100644 index 00000000..6131cf35 --- /dev/null +++ b/src/ext/DirectX/README.md | |||
@@ -0,0 +1,2 @@ | |||
1 | # DirectX.wixext | ||
2 | WixToolset.DirectX.wixext - DirectX WiX Toolset Extension | ||
diff --git a/src/ext/DirectX/appveyor.cmd b/src/ext/DirectX/appveyor.cmd new file mode 100644 index 00000000..3a7e2d72 --- /dev/null +++ b/src/ext/DirectX/appveyor.cmd | |||
@@ -0,0 +1,14 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | |||
4 | nuget restore || exit /b | ||
5 | |||
6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
7 | |||
8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b | ||
9 | dotnet test -c Release --no-build src\test\WixToolsetTest.DirectX || exit /b | ||
10 | |||
11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.DirectX.wixext.csproj || exit /b | ||
12 | |||
13 | @popd | ||
14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/DirectX/appveyor.yml b/src/ext/DirectX/appveyor.yml new file mode 100644 index 00000000..7c686b04 --- /dev/null +++ b/src/ext/DirectX/appveyor.yml | |||
@@ -0,0 +1,40 @@ | |||
1 | # Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
2 | # | ||
3 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
4 | # then update all of the repos. | ||
5 | |||
6 | branches: | ||
7 | only: | ||
8 | - master | ||
9 | - develop | ||
10 | |||
11 | image: Visual Studio 2019 | ||
12 | |||
13 | version: 0.0.0.{build} | ||
14 | configuration: Release | ||
15 | |||
16 | environment: | ||
17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
19 | NUGET_XMLDOC_MODE: skip | ||
20 | |||
21 | build_script: | ||
22 | - appveyor.cmd | ||
23 | |||
24 | pull_requests: | ||
25 | do_not_increment_build_number: true | ||
26 | |||
27 | nuget: | ||
28 | disable_publish_on_pr: true | ||
29 | |||
30 | skip_branch_with_pr: true | ||
31 | skip_tags: true | ||
32 | |||
33 | artifacts: | ||
34 | - path: build\Release\**\*.nupkg | ||
35 | name: nuget | ||
36 | |||
37 | notifications: | ||
38 | - provider: Slack | ||
39 | incoming_webhook: | ||
40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ca/directx.cpp b/src/ext/DirectX/ca/directx.cpp index 21838262..21838262 100644 --- a/src/ca/directx.cpp +++ b/src/ext/DirectX/ca/directx.cpp | |||
diff --git a/src/ca/directx.def b/src/ext/DirectX/ca/directx.def index 8f46f9a8..8f46f9a8 100644 --- a/src/ca/directx.def +++ b/src/ext/DirectX/ca/directx.def | |||
diff --git a/src/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index e772009a..e772009a 100644 --- a/src/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj | |||
diff --git a/src/ca/dllmain.cpp b/src/ext/DirectX/ca/dllmain.cpp index df53f872..df53f872 100644 --- a/src/ca/dllmain.cpp +++ b/src/ext/DirectX/ca/dllmain.cpp | |||
diff --git a/src/ca/packages.config b/src/ext/DirectX/ca/packages.config index e3dc0e43..e3dc0e43 100644 --- a/src/ca/packages.config +++ b/src/ext/DirectX/ca/packages.config | |||
diff --git a/src/ca/precomp.h b/src/ext/DirectX/ca/precomp.h index 75a15829..75a15829 100644 --- a/src/ca/precomp.h +++ b/src/ext/DirectX/ca/precomp.h | |||
diff --git a/src/ext/DirectX/nuget.config b/src/ext/DirectX/nuget.config new file mode 100644 index 00000000..db7aba29 --- /dev/null +++ b/src/ext/DirectX/nuget.config | |||
@@ -0,0 +1,17 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <packageSources> | ||
4 | <clear /> | ||
5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
16 | </packageSources> | ||
17 | </configuration> \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs index 81a5fb00..81a5fb00 100644 --- a/src/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs | |||
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.en-us.wxl b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.en-us.wxl index 38c12ac1..38c12ac1 100644 --- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.en-us.wxl +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.en-us.wxl | |||
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs index bd31e81f..bd31e81f 100644 --- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs | |||
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs index f3a2ae92..f3a2ae92 100644 --- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs | |||
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/example.txt b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/example.txt index 1b4ffe8a..1b4ffe8a 100644 --- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/example.txt +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/example.txt | |||
diff --git a/src/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index 1722a613..1722a613 100644 --- a/src/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj | |||
diff --git a/src/wix.snk b/src/ext/DirectX/wix.snk index 3908a66a..3908a66a 100644 --- a/src/wix.snk +++ b/src/ext/DirectX/wix.snk | |||
Binary files differ | |||
diff --git a/src/wixext/DirectXDecompiler.cs b/src/ext/DirectX/wixext/DirectXDecompiler.cs index 03f90163..03f90163 100644 --- a/src/wixext/DirectXDecompiler.cs +++ b/src/ext/DirectX/wixext/DirectXDecompiler.cs | |||
diff --git a/src/wixext/DirectXExtensionData.cs b/src/ext/DirectX/wixext/DirectXExtensionData.cs index d61af23f..d61af23f 100644 --- a/src/wixext/DirectXExtensionData.cs +++ b/src/ext/DirectX/wixext/DirectXExtensionData.cs | |||
diff --git a/src/wixext/DirectXExtensionFactory.cs b/src/ext/DirectX/wixext/DirectXExtensionFactory.cs index fb7f84aa..fb7f84aa 100644 --- a/src/wixext/DirectXExtensionFactory.cs +++ b/src/ext/DirectX/wixext/DirectXExtensionFactory.cs | |||
diff --git a/src/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj index a848ff9a..a848ff9a 100644 --- a/src/wixext/WixToolset.DirectX.wixext.csproj +++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj | |||
diff --git a/src/wixext/WixToolset.DirectX.wixext.targets b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets index 4e27a6da..4e27a6da 100644 --- a/src/wixext/WixToolset.DirectX.wixext.targets +++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets | |||
diff --git a/src/wixlib/DirectXExtension.wxs b/src/ext/DirectX/wixlib/DirectXExtension.wxs index b83dc98d..b83dc98d 100644 --- a/src/wixlib/DirectXExtension.wxs +++ b/src/ext/DirectX/wixlib/DirectXExtension.wxs | |||
diff --git a/src/wixlib/caerr.wxi b/src/ext/DirectX/wixlib/caerr.wxi index ff7ec121..ff7ec121 100644 --- a/src/wixlib/caerr.wxi +++ b/src/ext/DirectX/wixlib/caerr.wxi | |||
diff --git a/src/wixlib/directx.wixproj b/src/ext/DirectX/wixlib/directx.wixproj index bdad24a4..bdad24a4 100644 --- a/src/wixlib/directx.wixproj +++ b/src/ext/DirectX/wixlib/directx.wixproj | |||
diff --git a/src/ext/global.json b/src/ext/global.json new file mode 100644 index 00000000..23dd3fa6 --- /dev/null +++ b/src/ext/global.json | |||
@@ -0,0 +1,5 @@ | |||
1 | { | ||
2 | "msbuild-sdks": { | ||
3 | "WixToolset.Sdk": "4.0.0-build-0211" | ||
4 | } | ||
5 | } | ||
diff --git a/src/version.json b/src/version.json new file mode 100644 index 00000000..5f857771 --- /dev/null +++ b/src/version.json | |||
@@ -0,0 +1,11 @@ | |||
1 | { | ||
2 | "version": "4.0", | ||
3 | "publicReleaseRefSpec": [ | ||
4 | "^refs/heads/master$" | ||
5 | ], | ||
6 | "cloudBuild": { | ||
7 | "buildNumber": { | ||
8 | "enabled": true | ||
9 | } | ||
10 | } | ||
11 | } | ||