diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 0000000..818fdcf --- /dev/null +++ b/.github/workflows/cla.yml @@ -0,0 +1,22 @@ +name: "CLA-Bot" +on: + issue_comment: + types: [created] + pull_request_target: + types: [ opened, closed, synchronize ] + +jobs: + CLAssistant: + runs-on: ubuntu-latest + steps: + - name: "CLA-Bot signature check" + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + uses: cla-assistant/github-action@v2.1.3-beta + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOT_ACCESS_TOKEN }} + with: + remote-repository-name: Home + path-to-signatures: '.github/signatures/cla.json' + path-to-document: 'https://github.com/wixtoolset/Home/blob/master/DNFCLA.md' + allowlist: wixbot diff --git a/LICENSE.TXT b/LICENSE.TXT new file mode 100644 index 0000000..c287297 --- /dev/null +++ b/LICENSE.TXT @@ -0,0 +1,28 @@ +Copyright (c) .NET Foundation and contributors. +This software is released under the Microsoft Reciprocal License (MS-RL) (the "License"); you may not use the software except in compliance with the License. + +The text of the Microsoft Reciprocal License (MS-RL) can be found online at: + http://opensource.org/licenses/ms-rl + + +Microsoft Reciprocal License (MS-RL) + +This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. + +1. Definitions + The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. + A "contribution" is the original software, or any additions or changes to the software. + A "contributor" is any person that distributes its contribution under this license. + "Licensed patents" are a contributor's patent claims that read directly on its contribution. + +2. Grant of Rights + (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. + (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. + +3. Conditions and Limitations + (A) Reciprocal Grants- For any file you distribute that contains code from the software (in source code or binary format), you must provide recipients the source code to that file along with a copy of this license, which license will govern that file. You may license other files that are entirely your own work and do not contain code from the software under any terms you choose. + (B) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. + (C) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. + (D) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. + (E) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. + (F) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. diff --git a/Votive.sln b/Votive.sln index 122ad66..a94fce5 100644 --- a/Votive.sln +++ b/Votive.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31702.278 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "v3schemas", "src\Schemas\v3\v3schemas.csproj", "{D0DD12D1-3455-43A9-9173-E465DA045897}" EndProject @@ -31,7 +31,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt version.json = version.json EndProjectSection EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "votive.shared", "src\votive.shared\votive.shared.shproj", "{72A14880-EC19-43B4-A4F0-DC9DDAE2C763}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Votive2022", "src\Votive2022\Votive2022.csproj", "{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}" +EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + src\votive.shared\votive.shared.projitems*{24a98296-9d58-42c1-95c0-cc36736409e2}*SharedItemsImports = 4 + src\votive.shared\votive.shared.projitems*{29a5bbf6-aedb-4867-92f6-c0f560f3aabf}*SharedItemsImports = 4 + src\votive.shared\votive.shared.projitems*{72a14880-ec19-43b4-a4f0-dc9ddae2c763}*SharedItemsImports = 13 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|arm = Debug|arm @@ -80,6 +89,36 @@ Global {D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x64.Build.0 = Release|x64 {D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x86.ActiveCfg = Release|x86 {D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x86.Build.0 = Release|x86 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.ActiveCfg = Debug|arm + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.Build.0 = Debug|arm + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.ActiveCfg = Debug|Win32 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.Build.0 = Debug|Win32 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.ActiveCfg = Debug|x64 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.Build.0 = Debug|x64 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.ActiveCfg = Debug|x86 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.Build.0 = Debug|x86 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.ActiveCfg = Debug|arm + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.Build.0 = Debug|arm + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.ActiveCfg = Debug|Win32 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.Build.0 = Debug|Win32 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.ActiveCfg = Debug|x64 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.Build.0 = Debug|x64 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.ActiveCfg = Debug|x86 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.Build.0 = Debug|x86 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.Build.0 = Release|Any CPU + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.ActiveCfg = Release|arm + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.Build.0 = Release|arm + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.ActiveCfg = Release|Win32 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.Build.0 = Release|Win32 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.ActiveCfg = Release|x64 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.Build.0 = Release|x64 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.ActiveCfg = Release|x86 + {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.Build.0 = Release|x86 {3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|arm.ActiveCfg = Debug|arm @@ -350,36 +389,36 @@ Global {B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x64.Build.0 = Release|x64 {B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x86.ActiveCfg = Release|x86 {B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x86.Build.0 = Release|x86 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.ActiveCfg = Debug|arm - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.Build.0 = Debug|arm - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.ActiveCfg = Debug|Win32 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.Build.0 = Debug|Win32 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.ActiveCfg = Debug|x64 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.Build.0 = Debug|x64 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.ActiveCfg = Debug|x86 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.Build.0 = Debug|x86 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.ActiveCfg = Debug|arm - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.Build.0 = Debug|arm - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.ActiveCfg = Debug|Win32 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.Build.0 = Debug|Win32 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.ActiveCfg = Debug|x64 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.Build.0 = Debug|x64 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.ActiveCfg = Debug|x86 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.Build.0 = Debug|x86 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.Build.0 = Release|Any CPU - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.ActiveCfg = Release|arm - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.Build.0 = Release|arm - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.ActiveCfg = Release|Win32 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.Build.0 = Release|Win32 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.ActiveCfg = Release|x64 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.Build.0 = Release|x64 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.ActiveCfg = Release|x86 - {587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.Build.0 = Release|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|arm.ActiveCfg = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|arm.Build.0 = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Win32.ActiveCfg = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Win32.Build.0 = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x64.ActiveCfg = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x64.Build.0 = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x86.ActiveCfg = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x86.Build.0 = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|arm.ActiveCfg = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|arm.Build.0 = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Win32.ActiveCfg = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Win32.Build.0 = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x64.ActiveCfg = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x64.Build.0 = Debug|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x86.ActiveCfg = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x86.Build.0 = Debug|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Any CPU.Build.0 = Release|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|arm.ActiveCfg = Release|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|arm.Build.0 = Release|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Win32.ActiveCfg = Release|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Win32.Build.0 = Release|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x64.ActiveCfg = Release|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x64.Build.0 = Release|Any CPU + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x86.ActiveCfg = Release|x86 + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.yml b/appveyor.yml index e062ac3..cf2913e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ branches: - master - develop -image: Visual Studio 2015 +image: Visual Studio 2019 version: 0.0.0.{build} configuration: Release diff --git a/src/Schemas/v3/packages.config b/src/Schemas/v3/packages.config deleted file mode 100644 index cb103bd..0000000 --- a/src/Schemas/v3/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Schemas/v3/v3schemas.csproj b/src/Schemas/v3/v3schemas.csproj index 2f7feca..c009319 100644 --- a/src/Schemas/v3/v3schemas.csproj +++ b/src/Schemas/v3/v3schemas.csproj @@ -1,38 +1,31 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {D0DD12D1-3455-43A9-9173-E465DA045897} Library Schemas3 true - v3 - false false - false false false false false + + - - - - true - true @@ -50,7 +43,6 @@ Microsoft\WiX\v3.x\ - Schemas @@ -148,19 +140,19 @@ true - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Schemas/v4/packages.config b/src/Schemas/v4/packages.config deleted file mode 100644 index cb103bd..0000000 --- a/src/Schemas/v4/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Schemas/v4/v4schemas.csproj b/src/Schemas/v4/v4schemas.csproj index 7ffb02f..c8df8df 100644 --- a/src/Schemas/v4/v4schemas.csproj +++ b/src/Schemas/v4/v4schemas.csproj @@ -1,38 +1,32 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {587D2A86-66CF-46B4-98C8-C01E20F1076D} Library Schemas4 true - v3 - false false - false false false false false + + - - - - true - - + true Schemas @@ -153,19 +147,19 @@ . - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Templates/v3/packages.config b/src/Templates/v3/packages.config deleted file mode 100644 index 62355e3..0000000 --- a/src/Templates/v3/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Templates/v3/v3templates.csproj b/src/Templates/v3/v3templates.csproj index 130ed0f..17c6a91 100644 --- a/src/Templates/v3/v3templates.csproj +++ b/src/Templates/v3/v3templates.csproj @@ -1,16 +1,13 @@  - - {3c09cd7d-ca0f-4bb0-a1be-0622645e93cb} + {3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB} {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library v3templates v3templates - false false - true false false @@ -18,50 +15,40 @@ false false WiX + + - - - - - - v3 - - - - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - 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}. - - - - - - + \ No newline at end of file diff --git a/src/Templates/v4/packages.config b/src/Templates/v4/packages.config deleted file mode 100644 index 62355e3..0000000 --- a/src/Templates/v4/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Templates/v4/v4templates.csproj b/src/Templates/v4/v4templates.csproj index 3f25c5b..e0ad84c 100644 --- a/src/Templates/v4/v4templates.csproj +++ b/src/Templates/v4/v4templates.csproj @@ -1,16 +1,13 @@  - {BD9B8F82-F240-4ED8-BCDC-8C1477C09CA8} {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library v4templates v4templates - false false - true false false @@ -18,49 +15,39 @@ false false WiX + + - - - - - - v4 - - - - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - 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}. - - - - - \ No newline at end of file diff --git a/src/Votive2010/Votive2010.csproj b/src/Votive2010/Votive2010.csproj index 4852410..23eff75 100644 --- a/src/Votive2010/Votive2010.csproj +++ b/src/Votive2010/Votive2010.csproj @@ -1,6 +1,5 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {3FFC5AB2-97CC-48C1-A28B-CC7F1CEEE92A} @@ -11,27 +10,23 @@ false false - false false false false false + + - - - - true - {24A98296-9D58-42C1-95C0-CC36736409E2} @@ -39,11 +34,21 @@ PkgdefProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup - + + + 14.3.25420 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems @@ -52,7 +57,6 @@ <_ProjectTemplates Include="$(OutputPath)ProjectTemplates\**\*.zip" /> <_ItemTemplates Include="$(OutputPath)ItemTemplates\**\*.zip" /> - ProjectTemplates\%(RecursiveDir) @@ -61,15 +65,4 @@ - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Votive2010/packages.config b/src/Votive2010/packages.config deleted file mode 100644 index 738cb43..0000000 --- a/src/Votive2010/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Votive2012/Votive2012.csproj b/src/Votive2012/Votive2012.csproj index 16fc402..4557ea4 100644 --- a/src/Votive2012/Votive2012.csproj +++ b/src/Votive2012/Votive2012.csproj @@ -1,6 +1,5 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {40F7D778-7677-4597-AF84-C956A31A9EE9} @@ -11,27 +10,23 @@ false false - false false false false false + + - - - - true - {24A98296-9D58-42C1-95C0-CC36736409E2} @@ -39,11 +34,21 @@ PkgdefProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup - + + + 14.3.25420 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems @@ -52,7 +57,6 @@ <_ProjectTemplates Include="$(OutputPath)ProjectTemplates\**\*.zip" /> <_ItemTemplates Include="$(OutputPath)ItemTemplates\**\*.zip" /> - ProjectTemplates\%(RecursiveDir) @@ -61,15 +65,4 @@ - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Votive2012/packages.config b/src/Votive2012/packages.config deleted file mode 100644 index 738cb43..0000000 --- a/src/Votive2012/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Votive2013/Votive2013.csproj b/src/Votive2013/Votive2013.csproj index 4881d5b..50fbfcd 100644 --- a/src/Votive2013/Votive2013.csproj +++ b/src/Votive2013/Votive2013.csproj @@ -1,6 +1,5 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {0877C6F6-73D9-46F1-89AB-43B6EC05EB9F} @@ -11,27 +10,23 @@ false false - false false false false false + + - - - - true - {24A98296-9D58-42C1-95C0-CC36736409E2} @@ -39,11 +34,21 @@ PkgdefProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup - + + + 14.3.25420 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems @@ -52,7 +57,6 @@ <_ProjectTemplates Include="$(OutputPath)ProjectTemplates\**\*.zip" /> <_ItemTemplates Include="$(OutputPath)ItemTemplates\**\*.zip" /> - ProjectTemplates\%(RecursiveDir) @@ -61,15 +65,4 @@ - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Votive2013/packages.config b/src/Votive2013/packages.config deleted file mode 100644 index 738cb43..0000000 --- a/src/Votive2013/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Votive2015/Votive2015.csproj b/src/Votive2015/Votive2015.csproj index b7ce4a3..7bf18cc 100644 --- a/src/Votive2015/Votive2015.csproj +++ b/src/Votive2015/Votive2015.csproj @@ -1,36 +1,30 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {C06BEF93-8980-4E98-BBB6-86CCBD3F1578} Library Votive2015 true - false false - false false false false false + + - - - - true - {24A98296-9D58-42C1-95C0-CC36736409E2} @@ -38,11 +32,21 @@ PkgdefProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup - + + + 14.3.25420 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems @@ -51,7 +55,6 @@ <_ProjectTemplates Include="$(OutputPath)ProjectTemplates\**\*.zip" /> <_ItemTemplates Include="$(OutputPath)ItemTemplates\**\*.zip" /> - ProjectTemplates\%(RecursiveDir) @@ -60,15 +63,4 @@ - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Votive2015/packages.config b/src/Votive2015/packages.config deleted file mode 100644 index 738cb43..0000000 --- a/src/Votive2015/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Votive2017/Votive2017.csproj b/src/Votive2017/Votive2017.csproj index 4e89a5b..4165f6f 100644 --- a/src/Votive2017/Votive2017.csproj +++ b/src/Votive2017/Votive2017.csproj @@ -1,38 +1,31 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {08182574-F5E5-4800-BE08-1E5DDB0DB5D7} Library Votive2017 true - v3 - false false - false false false false false + + - - - - true - {24A98296-9D58-42C1-95C0-CC36736409E2} @@ -54,11 +47,21 @@ false - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems @@ -67,7 +70,6 @@ <_ProjectTemplates Include="$(OutputPath)ProjectTemplates\**" /> <_ItemTemplates Include="$(OutputPath)ItemTemplates\**" /> - ProjectTemplates\%(RecursiveDir) @@ -76,15 +78,4 @@ - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Votive2017/packages.config b/src/Votive2017/packages.config deleted file mode 100644 index cb103bd..0000000 --- a/src/Votive2017/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Votive2019/Votive2019.csproj b/src/Votive2019/Votive2019.csproj index e7a76c9..bb03758 100644 --- a/src/Votive2019/Votive2019.csproj +++ b/src/Votive2019/Votive2019.csproj @@ -1,38 +1,31 @@  - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {B97AB81C-BE5B-4757-B2CC-96D92EB84182} Library Votive2019 true - v3 - false false - false false false false false + + - - - - true - {24A98296-9D58-42C1-95C0-CC36736409E2} @@ -54,11 +47,21 @@ false - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems @@ -75,15 +78,4 @@ - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/src/Votive2019/packages.config b/src/Votive2019/packages.config deleted file mode 100644 index cb103bd..0000000 --- a/src/Votive2019/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Votive2022/Votive2022.csproj b/src/Votive2022/Votive2022.csproj new file mode 100644 index 0000000..d123677 --- /dev/null +++ b/src/Votive2022/Votive2022.csproj @@ -0,0 +1,100 @@ + + + + {29A5BBF6-AEDB-4867-92F6-C0F560F3AABF} + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + WixToolset.VisualStudioExtension + Votive2022 + true + true + true + false + false + false + true + WiX + + + v4.7.2 + + Dev17 + VSTHRD001,VSTHRD010,VSSDK006,VSTHRD110,VSTHRD200,VSSDK006,RS0030 + + + + + + + + + + + + + + + + + + + + + + + + + + + + {d0dd12d1-3455-43a9-9173-e465da045897} + v3schemas + GetCopyToOutputDirectoryItems%3bVSIXContainerProjectOutputGroup%3b + Schemas + false + + + {587d2a86-66cf-46b4-98c8-c01e20f1076d} + v4schemas + Schemas + GetCopyToOutputDirectoryItems%3bVSIXContainerProjectOutputGroup%3b + false + + + + + + + + + + + + + + + + true + + + + + + + + + $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems + + + + <_ProjectTemplates Include="$(OutputPath)ProjectTemplates\**" /> + <_ItemTemplates Include="$(OutputPath)ItemTemplates\**" /> + + ProjectTemplates\%(RecursiveDir) + + + ItemTemplates\%(RecursiveDir) + + + + \ No newline at end of file diff --git a/src/Votive2022/WixLogoDev17.png b/src/Votive2022/WixLogoDev17.png new file mode 100644 index 0000000..08a11b3 Binary files /dev/null and b/src/Votive2022/WixLogoDev17.png differ diff --git a/src/Votive2022/source.extension.vsixmanifest b/src/Votive2022/source.extension.vsixmanifest new file mode 100644 index 0000000..051101b --- /dev/null +++ b/src/Votive2022/source.extension.vsixmanifest @@ -0,0 +1,29 @@ + + + + + Wix Toolset Visual Studio 2022 Extension + Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience. + http://wixtoolset.org/ + WixLogoDev17.png + WixLogoDev17.png + + + + + + + + + + + + amd64 + + + + + + + + diff --git a/src/src.proj b/src/src.proj index ebdc302..491d535 100644 --- a/src/src.proj +++ b/src/src.proj @@ -9,6 +9,7 @@ + diff --git a/src/votive/Controls/FolderBrowserTextBox.Designer.cs b/src/votive.shared/Controls/FolderBrowserTextBox.Designer.cs similarity index 100% rename from src/votive/Controls/FolderBrowserTextBox.Designer.cs rename to src/votive.shared/Controls/FolderBrowserTextBox.Designer.cs diff --git a/src/votive/Controls/FolderBrowserTextBox.cs b/src/votive.shared/Controls/FolderBrowserTextBox.cs similarity index 100% rename from src/votive/Controls/FolderBrowserTextBox.cs rename to src/votive.shared/Controls/FolderBrowserTextBox.cs diff --git a/src/votive/Controls/FolderBrowserTextBox.resx b/src/votive.shared/Controls/FolderBrowserTextBox.resx similarity index 100% rename from src/votive/Controls/FolderBrowserTextBox.resx rename to src/votive.shared/Controls/FolderBrowserTextBox.resx diff --git a/src/votive/Controls/WixBuildEventEditor.Designer.cs b/src/votive.shared/Controls/WixBuildEventEditor.Designer.cs similarity index 100% rename from src/votive/Controls/WixBuildEventEditor.Designer.cs rename to src/votive.shared/Controls/WixBuildEventEditor.Designer.cs diff --git a/src/votive/Controls/WixBuildEventEditor.cs b/src/votive.shared/Controls/WixBuildEventEditor.cs similarity index 100% rename from src/votive/Controls/WixBuildEventEditor.cs rename to src/votive.shared/Controls/WixBuildEventEditor.cs diff --git a/src/votive/Controls/WixBuildEventEditor.resx b/src/votive.shared/Controls/WixBuildEventEditor.resx similarity index 100% rename from src/votive/Controls/WixBuildEventEditor.resx rename to src/votive.shared/Controls/WixBuildEventEditor.resx diff --git a/src/votive/Controls/WixBuildEventTextBox.cs b/src/votive.shared/Controls/WixBuildEventTextBox.cs similarity index 100% rename from src/votive/Controls/WixBuildEventTextBox.cs rename to src/votive.shared/Controls/WixBuildEventTextBox.cs diff --git a/src/votive/Controls/WixBuildEventTextBox.resx b/src/votive.shared/Controls/WixBuildEventTextBox.resx similarity index 100% rename from src/votive/Controls/WixBuildEventTextBox.resx rename to src/votive.shared/Controls/WixBuildEventTextBox.resx diff --git a/src/votive/Controls/WixColorUserControl.Designer.cs b/src/votive.shared/Controls/WixColorUserControl.Designer.cs similarity index 100% rename from src/votive/Controls/WixColorUserControl.Designer.cs rename to src/votive.shared/Controls/WixColorUserControl.Designer.cs diff --git a/src/votive/Controls/WixColorUserControl.cs b/src/votive.shared/Controls/WixColorUserControl.cs similarity index 100% rename from src/votive/Controls/WixColorUserControl.cs rename to src/votive.shared/Controls/WixColorUserControl.cs diff --git a/src/votive/Controls/WixColorUserControl.resx b/src/votive.shared/Controls/WixColorUserControl.resx similarity index 100% rename from src/votive/Controls/WixColorUserControl.resx rename to src/votive.shared/Controls/WixColorUserControl.resx diff --git a/src/votive/Controls/WixFoldersSelector.Designer.cs b/src/votive.shared/Controls/WixFoldersSelector.Designer.cs similarity index 100% rename from src/votive/Controls/WixFoldersSelector.Designer.cs rename to src/votive.shared/Controls/WixFoldersSelector.Designer.cs diff --git a/src/votive/Controls/WixFoldersSelector.cs b/src/votive.shared/Controls/WixFoldersSelector.cs similarity index 100% rename from src/votive/Controls/WixFoldersSelector.cs rename to src/votive.shared/Controls/WixFoldersSelector.cs diff --git a/src/votive/Controls/WixFoldersSelector.resx b/src/votive.shared/Controls/WixFoldersSelector.resx similarity index 100% rename from src/votive/Controls/WixFoldersSelector.resx rename to src/votive.shared/Controls/WixFoldersSelector.resx diff --git a/src/votive/Controls/WixGroupBox.cs b/src/votive.shared/Controls/WixGroupBox.cs similarity index 100% rename from src/votive/Controls/WixGroupBox.cs rename to src/votive.shared/Controls/WixGroupBox.cs diff --git a/src/votive/Controls/WixGroupBox.resx b/src/votive.shared/Controls/WixGroupBox.resx similarity index 100% rename from src/votive/Controls/WixGroupBox.resx rename to src/votive.shared/Controls/WixGroupBox.resx diff --git a/src/votive/Controls/WixGroupLabel.cs b/src/votive.shared/Controls/WixGroupLabel.cs similarity index 100% rename from src/votive/Controls/WixGroupLabel.cs rename to src/votive.shared/Controls/WixGroupLabel.cs diff --git a/src/votive/Controls/WixGroupLabel.resx b/src/votive.shared/Controls/WixGroupLabel.resx similarity index 100% rename from src/votive/Controls/WixGroupLabel.resx rename to src/votive.shared/Controls/WixGroupLabel.resx diff --git a/src/votive/CustomDictionary.xml b/src/votive.shared/CustomDictionary.xml similarity index 100% rename from src/votive/CustomDictionary.xml rename to src/votive.shared/CustomDictionary.xml diff --git a/src/votive/DontShowAgainDialog.Designer.cs b/src/votive.shared/DontShowAgainDialog.Designer.cs similarity index 100% rename from src/votive/DontShowAgainDialog.Designer.cs rename to src/votive.shared/DontShowAgainDialog.Designer.cs diff --git a/src/votive/DontShowAgainDialog.cs b/src/votive.shared/DontShowAgainDialog.cs similarity index 100% rename from src/votive/DontShowAgainDialog.cs rename to src/votive.shared/DontShowAgainDialog.cs diff --git a/src/votive/DontShowAgainDialog.resx b/src/votive.shared/DontShowAgainDialog.resx similarity index 100% rename from src/votive/DontShowAgainDialog.resx rename to src/votive.shared/DontShowAgainDialog.resx diff --git a/src/votive/FileOverwriteDialog.Designer.cs b/src/votive.shared/FileOverwriteDialog.Designer.cs similarity index 100% rename from src/votive/FileOverwriteDialog.Designer.cs rename to src/votive.shared/FileOverwriteDialog.Designer.cs diff --git a/src/votive/FileOverwriteDialog.cs b/src/votive.shared/FileOverwriteDialog.cs similarity index 100% rename from src/votive/FileOverwriteDialog.cs rename to src/votive.shared/FileOverwriteDialog.cs diff --git a/src/votive/FileOverwriteDialog.resx b/src/votive.shared/FileOverwriteDialog.resx similarity index 100% rename from src/votive/FileOverwriteDialog.resx rename to src/votive.shared/FileOverwriteDialog.resx diff --git a/src/votive/FileSearchHelperMethods.cs b/src/votive.shared/FileSearchHelperMethods.cs similarity index 100% rename from src/votive/FileSearchHelperMethods.cs rename to src/votive.shared/FileSearchHelperMethods.cs diff --git a/src/votive/Forms/WixBuildEventEditorForm.Designer.cs b/src/votive.shared/Forms/WixBuildEventEditorForm.Designer.cs similarity index 100% rename from src/votive/Forms/WixBuildEventEditorForm.Designer.cs rename to src/votive.shared/Forms/WixBuildEventEditorForm.Designer.cs diff --git a/src/votive/Forms/WixBuildEventEditorForm.cs b/src/votive.shared/Forms/WixBuildEventEditorForm.cs similarity index 100% rename from src/votive/Forms/WixBuildEventEditorForm.cs rename to src/votive.shared/Forms/WixBuildEventEditorForm.cs diff --git a/src/votive/Forms/WixBuildEventEditorForm.resx b/src/votive.shared/Forms/WixBuildEventEditorForm.resx similarity index 100% rename from src/votive/Forms/WixBuildEventEditorForm.resx rename to src/votive.shared/Forms/WixBuildEventEditorForm.resx diff --git a/src/votive/GlobalSuppressions.cs b/src/votive.shared/GlobalSuppressions.cs similarity index 100% rename from src/votive/GlobalSuppressions.cs rename to src/votive.shared/GlobalSuppressions.cs diff --git a/src/votive/IProjectSourceNode.cs b/src/votive.shared/IProjectSourceNode.cs similarity index 100% rename from src/votive/IProjectSourceNode.cs rename to src/votive.shared/IProjectSourceNode.cs diff --git a/src/votive/IsolatedDomain.cs b/src/votive.shared/IsolatedDomain.cs similarity index 100% rename from src/votive/IsolatedDomain.cs rename to src/votive.shared/IsolatedDomain.cs diff --git a/src/votive/Microsoft.VisualStudio.Package.Project.resx b/src/votive.shared/Microsoft.VisualStudio.Package.Project.resx similarity index 100% rename from src/votive/Microsoft.VisualStudio.Package.Project.resx rename to src/votive.shared/Microsoft.VisualStudio.Package.Project.resx diff --git a/src/votive/OAWixProject.cs b/src/votive.shared/OAWixProject.cs similarity index 100% rename from src/votive/OAWixProject.cs rename to src/votive.shared/OAWixProject.cs diff --git a/src/votive/ProjectBase/AssemblyReferenceNode.cs b/src/votive.shared/ProjectBase/AssemblyReferenceNode.cs similarity index 99% rename from src/votive/ProjectBase/AssemblyReferenceNode.cs rename to src/votive.shared/ProjectBase/AssemblyReferenceNode.cs index 534c370..f7977c3 100644 --- a/src/votive/ProjectBase/AssemblyReferenceNode.cs +++ b/src/votive.shared/ProjectBase/AssemblyReferenceNode.cs @@ -14,7 +14,6 @@ using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; -using MSBuild = Microsoft.Build.BuildEngine; using Microsoft.Build.Utilities; using System.Diagnostics.CodeAnalysis; using ShellConstants = Microsoft.VisualStudio.Shell.Interop.Constants; diff --git a/src/votive/ProjectBase/Attributes.cs b/src/votive.shared/ProjectBase/Attributes.cs similarity index 100% rename from src/votive/ProjectBase/Attributes.cs rename to src/votive.shared/ProjectBase/Attributes.cs diff --git a/src/votive/ProjectBase/BuildDependency.cs b/src/votive.shared/ProjectBase/BuildDependency.cs similarity index 100% rename from src/votive/ProjectBase/BuildDependency.cs rename to src/votive.shared/ProjectBase/BuildDependency.cs diff --git a/src/votive/ProjectBase/BuildManagerAdapter.cs b/src/votive.shared/ProjectBase/BuildManagerAdapter.cs similarity index 100% rename from src/votive/ProjectBase/BuildManagerAdapter.cs rename to src/votive.shared/ProjectBase/BuildManagerAdapter.cs diff --git a/src/votive/ProjectBase/BuildPropertyPage.cs b/src/votive.shared/ProjectBase/BuildPropertyPage.cs similarity index 100% rename from src/votive/ProjectBase/BuildPropertyPage.cs rename to src/votive.shared/ProjectBase/BuildPropertyPage.cs diff --git a/src/votive/ProjectBase/ComReferenceNode.cs b/src/votive.shared/ProjectBase/ComReferenceNode.cs similarity index 100% rename from src/votive/ProjectBase/ComReferenceNode.cs rename to src/votive.shared/ProjectBase/ComReferenceNode.cs diff --git a/src/votive/ProjectBase/ConfigProvider.cs b/src/votive.shared/ProjectBase/ConfigProvider.cs similarity index 99% rename from src/votive/ProjectBase/ConfigProvider.cs rename to src/votive.shared/ProjectBase/ConfigProvider.cs index 35f33d4..d9bef81 100644 --- a/src/votive/ProjectBase/ConfigProvider.cs +++ b/src/votive.shared/ProjectBase/ConfigProvider.cs @@ -9,7 +9,6 @@ using System.Globalization; using System.Collections; using System.IO; -using MSBuild = Microsoft.Build.BuildEngine; using Microsoft.Build.Construction; using System.Collections.Generic; using System.Linq; diff --git a/src/votive/ProjectBase/ConfigurationProperties.cs b/src/votive.shared/ProjectBase/ConfigurationProperties.cs similarity index 100% rename from src/votive/ProjectBase/ConfigurationProperties.cs rename to src/votive.shared/ProjectBase/ConfigurationProperties.cs diff --git a/src/votive/ProjectBase/DataObject.cs b/src/votive.shared/ProjectBase/DataObject.cs similarity index 100% rename from src/votive/ProjectBase/DataObject.cs rename to src/votive.shared/ProjectBase/DataObject.cs diff --git a/src/votive/ProjectBase/DependentFileNode.cs b/src/votive.shared/ProjectBase/DependentFileNode.cs similarity index 100% rename from src/votive/ProjectBase/DependentFileNode.cs rename to src/votive.shared/ProjectBase/DependentFileNode.cs diff --git a/src/votive/ProjectBase/DesignPropertyDescriptor.cs b/src/votive.shared/ProjectBase/DesignPropertyDescriptor.cs similarity index 100% rename from src/votive/ProjectBase/DesignPropertyDescriptor.cs rename to src/votive.shared/ProjectBase/DesignPropertyDescriptor.cs diff --git a/src/votive/ProjectBase/DocumentManager.cs b/src/votive.shared/ProjectBase/DocumentManager.cs similarity index 100% rename from src/votive/ProjectBase/DocumentManager.cs rename to src/votive.shared/ProjectBase/DocumentManager.cs diff --git a/src/votive/ProjectBase/EnumDependencies.cs b/src/votive.shared/ProjectBase/EnumDependencies.cs similarity index 100% rename from src/votive/ProjectBase/EnumDependencies.cs rename to src/votive.shared/ProjectBase/EnumDependencies.cs diff --git a/src/votive/ProjectBase/FileChangeManager.cs b/src/votive.shared/ProjectBase/FileChangeManager.cs similarity index 100% rename from src/votive/ProjectBase/FileChangeManager.cs rename to src/votive.shared/ProjectBase/FileChangeManager.cs diff --git a/src/votive/ProjectBase/FileDocumentManager.cs b/src/votive.shared/ProjectBase/FileDocumentManager.cs similarity index 100% rename from src/votive/ProjectBase/FileDocumentManager.cs rename to src/votive.shared/ProjectBase/FileDocumentManager.cs diff --git a/src/votive/ProjectBase/FileNode.cs b/src/votive.shared/ProjectBase/FileNode.cs similarity index 100% rename from src/votive/ProjectBase/FileNode.cs rename to src/votive.shared/ProjectBase/FileNode.cs diff --git a/src/votive/ProjectBase/FolderNode.cs b/src/votive.shared/ProjectBase/FolderNode.cs similarity index 100% rename from src/votive/ProjectBase/FolderNode.cs rename to src/votive.shared/ProjectBase/FolderNode.cs diff --git a/src/votive/ProjectBase/GlobalPropertyHandler.cs b/src/votive.shared/ProjectBase/GlobalPropertyHandler.cs similarity index 100% rename from src/votive/ProjectBase/GlobalPropertyHandler.cs rename to src/votive.shared/ProjectBase/GlobalPropertyHandler.cs diff --git a/src/votive/ProjectBase/GlobalSuppressions.cs b/src/votive.shared/ProjectBase/GlobalSuppressions.cs similarity index 100% rename from src/votive/ProjectBase/GlobalSuppressions.cs rename to src/votive.shared/ProjectBase/GlobalSuppressions.cs diff --git a/src/votive/ProjectBase/HierarchyNode.cs b/src/votive.shared/ProjectBase/HierarchyNode.cs similarity index 100% rename from src/votive/ProjectBase/HierarchyNode.cs rename to src/votive.shared/ProjectBase/HierarchyNode.cs diff --git a/src/votive/ProjectBase/IDEBuildLogger.cs b/src/votive.shared/ProjectBase/IDEBuildLogger.cs similarity index 99% rename from src/votive/ProjectBase/IDEBuildLogger.cs rename to src/votive.shared/ProjectBase/IDEBuildLogger.cs index 37968cc..a355caf 100644 --- a/src/votive/ProjectBase/IDEBuildLogger.cs +++ b/src/votive.shared/ProjectBase/IDEBuildLogger.cs @@ -561,7 +561,11 @@ private void ClearCachedVerbosity() /// private void NavigateTo(object sender, EventArgs arguments) { +#if Dev17 + Microsoft.VisualStudio.Shell.TaskListItem task = sender as Microsoft.VisualStudio.Shell.TaskListItem; +#else Microsoft.VisualStudio.Shell.Task task = sender as Microsoft.VisualStudio.Shell.Task; +#endif if (task == null) { throw new ArgumentException("sender"); diff --git a/src/votive/ProjectBase/ImageHandler.cs b/src/votive.shared/ProjectBase/ImageHandler.cs similarity index 100% rename from src/votive/ProjectBase/ImageHandler.cs rename to src/votive.shared/ProjectBase/ImageHandler.cs diff --git a/src/votive/ProjectBase/Interfaces.cs b/src/votive.shared/ProjectBase/Interfaces.cs similarity index 100% rename from src/votive/ProjectBase/Interfaces.cs rename to src/votive.shared/ProjectBase/Interfaces.cs diff --git a/src/votive/ProjectBase/LangProj/OAAssemblyReference.cs b/src/votive.shared/ProjectBase/LangProj/OAAssemblyReference.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAAssemblyReference.cs rename to src/votive.shared/ProjectBase/LangProj/OAAssemblyReference.cs diff --git a/src/votive/ProjectBase/LangProj/OABuildManager.cs b/src/votive.shared/ProjectBase/LangProj/OABuildManager.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OABuildManager.cs rename to src/votive.shared/ProjectBase/LangProj/OABuildManager.cs diff --git a/src/votive/ProjectBase/LangProj/OAComReference.cs b/src/votive.shared/ProjectBase/LangProj/OAComReference.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAComReference.cs rename to src/votive.shared/ProjectBase/LangProj/OAComReference.cs diff --git a/src/votive/ProjectBase/LangProj/OAProjectReference.cs b/src/votive.shared/ProjectBase/LangProj/OAProjectReference.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAProjectReference.cs rename to src/votive.shared/ProjectBase/LangProj/OAProjectReference.cs diff --git a/src/votive/ProjectBase/LangProj/OAReferenceBase.cs b/src/votive.shared/ProjectBase/LangProj/OAReferenceBase.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAReferenceBase.cs rename to src/votive.shared/ProjectBase/LangProj/OAReferenceBase.cs diff --git a/src/votive/ProjectBase/LangProj/OAReferences.cs b/src/votive.shared/ProjectBase/LangProj/OAReferences.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAReferences.cs rename to src/votive.shared/ProjectBase/LangProj/OAReferences.cs diff --git a/src/votive/ProjectBase/LangProj/OAVSProject.cs b/src/votive.shared/ProjectBase/LangProj/OAVSProject.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAVSProject.cs rename to src/votive.shared/ProjectBase/LangProj/OAVSProject.cs diff --git a/src/votive/ProjectBase/LangProj/OAVSProjectItem.cs b/src/votive.shared/ProjectBase/LangProj/OAVSProjectItem.cs similarity index 100% rename from src/votive/ProjectBase/LangProj/OAVSProjectItem.cs rename to src/votive.shared/ProjectBase/LangProj/OAVSProjectItem.cs diff --git a/src/votive/ProjectBase/LocalizableProperties.cs b/src/votive.shared/ProjectBase/LocalizableProperties.cs similarity index 100% rename from src/votive/ProjectBase/LocalizableProperties.cs rename to src/votive.shared/ProjectBase/LocalizableProperties.cs diff --git a/src/votive/ProjectBase/Microsoft.VisualStudio.Package.Project.cs b/src/votive.shared/ProjectBase/Microsoft.VisualStudio.Package.Project.cs similarity index 100% rename from src/votive/ProjectBase/Microsoft.VisualStudio.Package.Project.cs rename to src/votive.shared/ProjectBase/Microsoft.VisualStudio.Package.Project.cs diff --git a/src/votive/ProjectBase/Misc/ConnectionPointContainer.cs b/src/votive.shared/ProjectBase/Misc/ConnectionPointContainer.cs similarity index 100% rename from src/votive/ProjectBase/Misc/ConnectionPointContainer.cs rename to src/votive.shared/ProjectBase/Misc/ConnectionPointContainer.cs diff --git a/src/votive/ProjectBase/Misc/ExternDll.cs b/src/votive.shared/ProjectBase/Misc/ExternDll.cs similarity index 100% rename from src/votive/ProjectBase/Misc/ExternDll.cs rename to src/votive.shared/ProjectBase/Misc/ExternDll.cs diff --git a/src/votive/ProjectBase/Misc/NativeMethods.cs b/src/votive.shared/ProjectBase/Misc/NativeMethods.cs similarity index 100% rename from src/votive/ProjectBase/Misc/NativeMethods.cs rename to src/votive.shared/ProjectBase/Misc/NativeMethods.cs diff --git a/src/votive/ProjectBase/Misc/UnsafeNativeMethods.cs b/src/votive.shared/ProjectBase/Misc/UnsafeNativeMethods.cs similarity index 100% rename from src/votive/ProjectBase/Misc/UnsafeNativeMethods.cs rename to src/votive.shared/ProjectBase/Misc/UnsafeNativeMethods.cs diff --git a/src/votive/ProjectBase/NestedProjectBuildDependency.cs b/src/votive.shared/ProjectBase/NestedProjectBuildDependency.cs similarity index 100% rename from src/votive/ProjectBase/NestedProjectBuildDependency.cs rename to src/votive.shared/ProjectBase/NestedProjectBuildDependency.cs diff --git a/src/votive/ProjectBase/NestedProjectNode.cs b/src/votive.shared/ProjectBase/NestedProjectNode.cs similarity index 100% rename from src/votive/ProjectBase/NestedProjectNode.cs rename to src/votive.shared/ProjectBase/NestedProjectNode.cs diff --git a/src/votive/ProjectBase/NodeProperties.cs b/src/votive.shared/ProjectBase/NodeProperties.cs similarity index 100% rename from src/votive/ProjectBase/NodeProperties.cs rename to src/votive.shared/ProjectBase/NodeProperties.cs diff --git a/src/votive/ProjectBase/OAFileItem.cs b/src/votive.shared/ProjectBase/OAFileItem.cs similarity index 100% rename from src/votive/ProjectBase/OAFileItem.cs rename to src/votive.shared/ProjectBase/OAFileItem.cs diff --git a/src/votive/ProjectBase/OAFolderItem.cs b/src/votive.shared/ProjectBase/OAFolderItem.cs similarity index 100% rename from src/votive/ProjectBase/OAFolderItem.cs rename to src/votive.shared/ProjectBase/OAFolderItem.cs diff --git a/src/votive/ProjectBase/OANavigableProjectItems.cs b/src/votive.shared/ProjectBase/OANavigableProjectItems.cs similarity index 100% rename from src/votive/ProjectBase/OANavigableProjectItems.cs rename to src/votive.shared/ProjectBase/OANavigableProjectItems.cs diff --git a/src/votive/ProjectBase/OANestedProjectItem.cs b/src/votive.shared/ProjectBase/OANestedProjectItem.cs similarity index 100% rename from src/votive/ProjectBase/OANestedProjectItem.cs rename to src/votive.shared/ProjectBase/OANestedProjectItem.cs diff --git a/src/votive/ProjectBase/OANullProperty.cs b/src/votive.shared/ProjectBase/OANullProperty.cs similarity index 100% rename from src/votive/ProjectBase/OANullProperty.cs rename to src/votive.shared/ProjectBase/OANullProperty.cs diff --git a/src/votive/ProjectBase/OAProject.cs b/src/votive.shared/ProjectBase/OAProject.cs similarity index 100% rename from src/votive/ProjectBase/OAProject.cs rename to src/votive.shared/ProjectBase/OAProject.cs diff --git a/src/votive/ProjectBase/OAProjectItem.cs b/src/votive.shared/ProjectBase/OAProjectItem.cs similarity index 100% rename from src/votive/ProjectBase/OAProjectItem.cs rename to src/votive.shared/ProjectBase/OAProjectItem.cs diff --git a/src/votive/ProjectBase/OAProjectItems.cs b/src/votive.shared/ProjectBase/OAProjectItems.cs similarity index 100% rename from src/votive/ProjectBase/OAProjectItems.cs rename to src/votive.shared/ProjectBase/OAProjectItems.cs diff --git a/src/votive/ProjectBase/OAProperties.cs b/src/votive.shared/ProjectBase/OAProperties.cs similarity index 100% rename from src/votive/ProjectBase/OAProperties.cs rename to src/votive.shared/ProjectBase/OAProperties.cs diff --git a/src/votive/ProjectBase/OAProperty.cs b/src/votive.shared/ProjectBase/OAProperty.cs similarity index 100% rename from src/votive/ProjectBase/OAProperty.cs rename to src/votive.shared/ProjectBase/OAProperty.cs diff --git a/src/votive/ProjectBase/OAReferenceFolderItem.cs b/src/votive.shared/ProjectBase/OAReferenceFolderItem.cs similarity index 100% rename from src/votive/ProjectBase/OAReferenceFolderItem.cs rename to src/votive.shared/ProjectBase/OAReferenceFolderItem.cs diff --git a/src/votive/ProjectBase/OAReferenceItem.cs b/src/votive.shared/ProjectBase/OAReferenceItem.cs similarity index 100% rename from src/votive/ProjectBase/OAReferenceItem.cs rename to src/votive.shared/ProjectBase/OAReferenceItem.cs diff --git a/src/votive/ProjectBase/OASolutionFolder.cs b/src/votive.shared/ProjectBase/OASolutionFolder.cs similarity index 100% rename from src/votive/ProjectBase/OASolutionFolder.cs rename to src/votive.shared/ProjectBase/OASolutionFolder.cs diff --git a/src/votive/ProjectBase/OleServiceProvider.cs b/src/votive.shared/ProjectBase/OleServiceProvider.cs similarity index 100% rename from src/votive/ProjectBase/OleServiceProvider.cs rename to src/votive.shared/ProjectBase/OleServiceProvider.cs diff --git a/src/votive/ProjectBase/Output.cs b/src/votive.shared/ProjectBase/Output.cs similarity index 100% rename from src/votive/ProjectBase/Output.cs rename to src/votive.shared/ProjectBase/Output.cs diff --git a/src/votive/ProjectBase/OutputGroup.cs b/src/votive.shared/ProjectBase/OutputGroup.cs similarity index 100% rename from src/votive/ProjectBase/OutputGroup.cs rename to src/votive.shared/ProjectBase/OutputGroup.cs diff --git a/src/votive/ProjectBase/ProjectConfig.cs b/src/votive.shared/ProjectBase/ProjectConfig.cs similarity index 99% rename from src/votive/ProjectBase/ProjectConfig.cs rename to src/votive.shared/ProjectBase/ProjectConfig.cs index fd645b5..7021172 100644 --- a/src/votive/ProjectBase/ProjectConfig.cs +++ b/src/votive.shared/ProjectBase/ProjectConfig.cs @@ -1113,7 +1113,11 @@ public virtual int QueryDebugTargets(uint grfLaunch, uint cTargets, VsDebugTarge bstrExe = targetInfo.bstrExe, bstrPortName = targetInfo.bstrPortName, bstrRemoteMachine = targetInfo.bstrRemoteMachine, +#if Dev17 + fSendToOutputWindow = targetInfo.fSendStdoutToOutputWindow != 0, +#else fSendToOutputWindow = targetInfo.fSendStdoutToOutputWindow, +#endif guidLaunchDebugEngine = targetInfo.clsidCustom, LaunchFlags = targetInfo.grfLaunch, dlo = (uint)targetInfo.dlo, diff --git a/src/votive/ProjectBase/ProjectContainerNode.cs b/src/votive.shared/ProjectBase/ProjectContainerNode.cs similarity index 99% rename from src/votive/ProjectBase/ProjectContainerNode.cs rename to src/votive.shared/ProjectBase/ProjectContainerNode.cs index 86df248..875d946 100644 --- a/src/votive/ProjectBase/ProjectContainerNode.cs +++ b/src/votive.shared/ProjectBase/ProjectContainerNode.cs @@ -491,7 +491,11 @@ protected internal void RunVsTemplateWizard(ProjectElement element, bool silent) // Make the call to execute the wizard. This should cause AddNestedProjectFromTemplate to be // called back with the correct set of parameters. EnvDTE.IVsExtensibility extensibilityService = (EnvDTE.IVsExtensibility)GetService(typeof(EnvDTE.IVsExtensibility)); +#if Dev17 + EnvDTE.wizardResult result = extensibilityService.RunWizardFile(template, (IntPtr)0, ref wizParams); +#else EnvDTE.wizardResult result = extensibilityService.RunWizardFile(template, 0, ref wizParams); +#endif if (result == EnvDTE.wizardResult.wizardResultFailure) throw new COMException(); } diff --git a/src/votive/ProjectBase/ProjectDesignerDocumentManager.cs b/src/votive.shared/ProjectBase/ProjectDesignerDocumentManager.cs similarity index 100% rename from src/votive/ProjectBase/ProjectDesignerDocumentManager.cs rename to src/votive.shared/ProjectBase/ProjectDesignerDocumentManager.cs diff --git a/src/votive/ProjectBase/ProjectDocumentsListener.cs b/src/votive.shared/ProjectBase/ProjectDocumentsListener.cs similarity index 100% rename from src/votive/ProjectBase/ProjectDocumentsListener.cs rename to src/votive.shared/ProjectBase/ProjectDocumentsListener.cs diff --git a/src/votive/ProjectBase/ProjectElement.cs b/src/votive.shared/ProjectBase/ProjectElement.cs similarity index 99% rename from src/votive/ProjectBase/ProjectElement.cs rename to src/votive.shared/ProjectBase/ProjectElement.cs index e09aeb1..8dbb6f2 100644 --- a/src/votive/ProjectBase/ProjectElement.cs +++ b/src/votive.shared/ProjectBase/ProjectElement.cs @@ -141,7 +141,7 @@ internal ProjectElement(ProjectNode project, string itemPath, string itemType) private void DoAdd(string itemType, string itemPath) { - var added = this.itemProject.BuildProject.AddItem(itemType, Microsoft.Build.BuildEngine.Utilities.Escape(itemPath)); + var added = this.itemProject.BuildProject.AddItem(itemType, MSBuild.ProjectCollection.Escape(itemPath)); Debug.Assert(added.Count == 1, "adding a file created more than 1 new item, should not be possible since we escape wildcard characters"); this.item = added[0]; } @@ -335,7 +335,7 @@ public string GetMetadataAndThrow(string attributeName, Exception exception) public void Rename(string newPath) { - string escapedPath = Microsoft.Build.BuildEngine.Utilities.Escape(newPath); + string escapedPath = MSBuild.ProjectCollection.Escape(newPath); if (this.IsVirtual) { virtualProperties[ProjectFileConstants.Include] = newPath; diff --git a/src/votive/ProjectBase/ProjectFactory.cs b/src/votive.shared/ProjectBase/ProjectFactory.cs similarity index 51% rename from src/votive/ProjectBase/ProjectFactory.cs rename to src/votive.shared/ProjectBase/ProjectFactory.cs index 5ec020e..2a56a12 100644 --- a/src/votive/ProjectBase/ProjectFactory.cs +++ b/src/votive.shared/ProjectBase/ProjectFactory.cs @@ -21,7 +21,7 @@ namespace Microsoft.VisualStudio.Package /// Creates projects within the solution /// [CLSCompliant(false)] - public abstract class ProjectFactory : Microsoft.VisualStudio.Shell.Flavor.FlavoredProjectFactoryBase, IVsProjectUpgradeViaFactory + public abstract class ProjectFactory : Microsoft.VisualStudio.Shell.Flavor.FlavoredProjectFactoryBase { #region fields private Microsoft.VisualStudio.Shell.Package package; @@ -194,173 +194,5 @@ private IProjectEvents GetProjectEventsProvider() } #endregion - - #region IVsProjectUpgradeViaFactory - private string m_lastUpgradedProjectFile; - private const string SCC_PROJECT_NAME = "SccProjectName"; - private string m_sccProjectName; - private const string SCC_AUX_PATH = "SccAuxPath"; - private string m_sccAuxPath; - private const string SCC_LOCAL_PATH = "SccLocalPath"; - private string m_sccLocalPath; - private const string SCC_PROVIDER = "SccProvider"; - private string m_sccProvider; - public virtual int GetSccInfo(string projectFileName, out string sccProjectName, out string sccAuxPath, out string sccLocalPath, out string provider) - { - // we should only be asked for SCC info on a project that we have just upgraded. - if (!String.Equals(this.m_lastUpgradedProjectFile, projectFileName, StringComparison.OrdinalIgnoreCase)) - { - sccProjectName = ""; - sccAuxPath = ""; - sccLocalPath = ""; - provider = ""; - return VSConstants.E_FAIL; - } - sccProjectName = this.m_sccProjectName; - sccAuxPath = this.m_sccAuxPath; - sccLocalPath = this.m_sccLocalPath; - provider = this.m_sccProvider; - return VSConstants.S_OK; - } - - public virtual int UpgradeProject_CheckOnly(string projectFileName, IVsUpgradeLogger upgradeLogger, out int upgradeRequired, out Guid newProjectFactory, out uint upgradeCapabilityFlags) - { - newProjectFactory = GetType().GUID; - upgradeCapabilityFlags = 0; // VSPPROJECTUPGRADEVIAFACTORYFLAGS: we only support in-place upgrade with no back-up - - ProjectRootElement project = ProjectRootElement.Open(projectFileName); - - // only upgrade known tool versions. - if (string.Equals("3.5", project.ToolsVersion, StringComparison.Ordinal) || string.Equals("2.0", project.ToolsVersion, StringComparison.Ordinal)) - { - upgradeRequired = 1; - return VSConstants.S_OK; - } - - upgradeRequired = 0; - return VSConstants.S_OK; - } - public virtual int UpgradeProject(string projectFileName, uint upgradeFlag, string copyLocation, out string upgradeFullyQualifiedFileName, IVsUpgradeLogger logger, out int upgradeRequired, - out Guid newProjectFactory) - { - uint ignore; - - this.UpgradeProject_CheckOnly(projectFileName, logger, out upgradeRequired, out newProjectFactory, out ignore); - if (upgradeRequired == 0) - { - upgradeFullyQualifiedFileName = projectFileName; - return VSConstants.S_OK; - } - - string projectName = Path.GetFileNameWithoutExtension(projectFileName); - upgradeFullyQualifiedFileName = projectFileName; - - // Query for edit - IVsQueryEditQuerySave2 queryEdit = site.GetService(typeof(SVsQueryEditQuerySave)) as IVsQueryEditQuerySave2; - - if (queryEdit != null) - { - uint editVerdict; - uint queryEditMoreInfo; - const tagVSQueryEditFlags tagVSQueryEditFlags_QEF_AllowUnopenedProjects = (tagVSQueryEditFlags)0x80; - - int hr = queryEdit.QueryEditFiles( - (uint)(tagVSQueryEditFlags.QEF_ForceEdit_NoPrompting | tagVSQueryEditFlags.QEF_DisallowInMemoryEdits | tagVSQueryEditFlags_QEF_AllowUnopenedProjects), - 1, new[] { projectFileName }, null, null, out editVerdict, out queryEditMoreInfo); - if (ErrorHandler.Failed(hr)) - { - return VSConstants.E_FAIL; - } - - if (editVerdict != (uint)tagVSQueryEditResult.QER_EditOK) - { - if (logger != null) - { - logger.LogMessage((uint)__VSUL_ERRORLEVEL.VSUL_ERROR, projectName, projectFileName, - SR.GetString(SR.UpgradeCannotOpenProjectFileForEdit)); - } - return VSConstants.E_FAIL; - } - - // If file was modified during the checkout, maybe upgrade is not needed - if ((queryEditMoreInfo & (uint)tagVSQueryEditResultFlags.QER_MaybeChanged) != 0) - { - this.UpgradeProject_CheckOnly(projectFileName, logger, out upgradeRequired, out newProjectFactory, out ignore); - if (upgradeRequired == 0) - { - if (logger != null) - { - logger.LogMessage((uint)__VSUL_ERRORLEVEL.VSUL_INFORMATIONAL, projectName, projectFileName, - SR.GetString(SR.UpgradeNoNeedToUpgradeAfterCheckout)); - } - - return VSConstants.S_OK; - } - } - } - - // Convert the project - Microsoft.Build.Conversion.ProjectFileConverter projectConverter = new Microsoft.Build.Conversion.ProjectFileConverter(); - projectConverter.OldProjectFile = projectFileName; - projectConverter.NewProjectFile = projectFileName; - ProjectRootElement convertedProject = null; - try - { - convertedProject = projectConverter.ConvertInMemory(); - } - catch (Exception ex) - { - if (logger != null) - logger.LogMessage((uint)__VSUL_ERRORLEVEL.VSUL_ERROR, projectName, projectFileName, ex.Message); - } - - if (convertedProject != null) - { - this.m_lastUpgradedProjectFile = projectFileName; - foreach (ProjectPropertyElement property in convertedProject.Properties) - { - switch (property.Name) - { - case SCC_LOCAL_PATH: - this.m_sccLocalPath = property.Value; - break; - case SCC_AUX_PATH: - this.m_sccAuxPath = property.Value; - break; - case SCC_PROVIDER: - this.m_sccProvider = property.Value; - break; - case SCC_PROJECT_NAME: - this.m_sccProjectName = property.Value; - break; - default: - break; - } - } - try - { - convertedProject.Save(projectFileName); - } - catch (Exception ex) - { - if (logger != null) - logger.LogMessage((uint)__VSUL_ERRORLEVEL.VSUL_ERROR, projectName, projectFileName, ex.Message); - return VSConstants.E_FAIL; - } - if (logger != null) - { - logger.LogMessage((uint)__VSUL_ERRORLEVEL.VSUL_STATUSMSG, projectName, projectFileName, - SR.GetString(SR.UpgradeSuccessful)); - } - return VSConstants.S_OK; - - } - - this.m_lastUpgradedProjectFile = null; - upgradeFullyQualifiedFileName = ""; - return VSConstants.E_FAIL; - } - - #endregion } } diff --git a/src/votive/ProjectBase/ProjectFileConstants.cs b/src/votive.shared/ProjectBase/ProjectFileConstants.cs similarity index 100% rename from src/votive/ProjectBase/ProjectFileConstants.cs rename to src/votive.shared/ProjectBase/ProjectFileConstants.cs diff --git a/src/votive/ProjectBase/ProjectNode.CopyPaste.cs b/src/votive.shared/ProjectBase/ProjectNode.CopyPaste.cs similarity index 100% rename from src/votive/ProjectBase/ProjectNode.CopyPaste.cs rename to src/votive.shared/ProjectBase/ProjectNode.CopyPaste.cs diff --git a/src/votive/ProjectBase/ProjectNode.Events.cs b/src/votive.shared/ProjectBase/ProjectNode.Events.cs similarity index 100% rename from src/votive/ProjectBase/ProjectNode.Events.cs rename to src/votive.shared/ProjectBase/ProjectNode.Events.cs diff --git a/src/votive/ProjectBase/ProjectNode.cs b/src/votive.shared/ProjectBase/ProjectNode.cs similarity index 99% rename from src/votive/ProjectBase/ProjectNode.cs rename to src/votive.shared/ProjectBase/ProjectNode.cs index 651af12..a5a51d6 100644 --- a/src/votive/ProjectBase/ProjectNode.cs +++ b/src/votive.shared/ProjectBase/ProjectNode.cs @@ -20,7 +20,6 @@ using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Shell; using System.Net; -using MSBuild = Microsoft.Build.BuildEngine; using MSBuildExecution = Microsoft.Build.Execution; using MSBuildConstruction = Microsoft.Build.Construction; using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider; @@ -1931,7 +1930,11 @@ public virtual VSADDRESULT RunWizard(HierarchyNode parentNode, string itemName, { Array contextParamsAsArray = contextParams; +#if Dev17 + int result = ivsExtensibility.RunWizardFile(wizardToRun, dlgOwner, ref contextParamsAsArray, out wizResultAsInt); +#else int result = ivsExtensibility.RunWizardFile(wizardToRun, (int)dlgOwner, ref contextParamsAsArray, out wizResultAsInt); +#endif if (!ErrorHandler.Succeeded(result) && result != VSConstants.OLE_E_PROMPTSAVECANCELLED) { diff --git a/src/votive/ProjectBase/ProjectOptions.cs b/src/votive.shared/ProjectBase/ProjectOptions.cs similarity index 100% rename from src/votive/ProjectBase/ProjectOptions.cs rename to src/votive.shared/ProjectBase/ProjectOptions.cs diff --git a/src/votive/ProjectBase/ProjectPackage.cs b/src/votive.shared/ProjectBase/ProjectPackage.cs similarity index 100% rename from src/votive/ProjectBase/ProjectPackage.cs rename to src/votive.shared/ProjectBase/ProjectPackage.cs diff --git a/src/votive/ProjectBase/ProjectReferenceNode.cs b/src/votive.shared/ProjectBase/ProjectReferenceNode.cs similarity index 99% rename from src/votive/ProjectBase/ProjectReferenceNode.cs rename to src/votive.shared/ProjectBase/ProjectReferenceNode.cs index b3ffbf2..32049bb 100644 --- a/src/votive/ProjectBase/ProjectReferenceNode.cs +++ b/src/votive.shared/ProjectBase/ProjectReferenceNode.cs @@ -13,7 +13,6 @@ using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; -using MSBuild = Microsoft.Build.BuildEngine; using Microsoft.Build.Utilities; using VsCommands = Microsoft.VisualStudio.VSConstants.VSStd97CmdID; using VSConstants = Microsoft.VisualStudio.VSConstants; diff --git a/src/votive/ProjectBase/PropertiesEditorLauncher.cs b/src/votive.shared/ProjectBase/PropertiesEditorLauncher.cs similarity index 100% rename from src/votive/ProjectBase/PropertiesEditorLauncher.cs rename to src/votive.shared/ProjectBase/PropertiesEditorLauncher.cs diff --git a/src/votive/ProjectBase/ReferenceContainerNode.cs b/src/votive.shared/ProjectBase/ReferenceContainerNode.cs similarity index 100% rename from src/votive/ProjectBase/ReferenceContainerNode.cs rename to src/votive.shared/ProjectBase/ReferenceContainerNode.cs diff --git a/src/votive/ProjectBase/ReferenceNode.cs b/src/votive.shared/ProjectBase/ReferenceNode.cs similarity index 100% rename from src/votive/ProjectBase/ReferenceNode.cs rename to src/votive.shared/ProjectBase/ReferenceNode.cs diff --git a/src/votive/ProjectBase/RegisteredProjectType.cs b/src/votive.shared/ProjectBase/RegisteredProjectType.cs similarity index 100% rename from src/votive/ProjectBase/RegisteredProjectType.cs rename to src/votive.shared/ProjectBase/RegisteredProjectType.cs diff --git a/src/votive/ProjectBase/SelectionListener.cs b/src/votive.shared/ProjectBase/SelectionListener.cs similarity index 100% rename from src/votive/ProjectBase/SelectionListener.cs rename to src/votive.shared/ProjectBase/SelectionListener.cs diff --git a/src/votive/ProjectBase/SettingsPage.cs b/src/votive.shared/ProjectBase/SettingsPage.cs similarity index 97% rename from src/votive/ProjectBase/SettingsPage.cs rename to src/votive.shared/ProjectBase/SettingsPage.cs index 53fe0bd..7fa9295 100644 --- a/src/votive/ProjectBase/SettingsPage.cs +++ b/src/votive.shared/ProjectBase/SettingsPage.cs @@ -230,7 +230,11 @@ public virtual void Activate(IntPtr parent, RECT[] pRect, int bModal) this.active = true; +#if Dev17 + Control cGrid = Control.FromHandle(this.grid.Handle); +#else Control cGrid = Control.FromHandle(new IntPtr(this.grid.Handle)); +#endif cGrid.Parent = Control.FromHandle(parent);//this.panel; cGrid.Size = new Size(544, 294); @@ -238,7 +242,11 @@ public virtual void Activate(IntPtr parent, RECT[] pRect, int bModal) cGrid.Visible = true; this.grid.SetOption(_PROPERTYGRIDOPTION.PGOPT_TOOLBAR, false); this.grid.GridSort = _PROPERTYGRIDSORT.PGSORT_CATEGORIZED | _PROPERTYGRIDSORT.PGSORT_ALPHABETICAL; +#if Dev17 + NativeMethods.SetParent(this.grid.Handle, this.panel.Handle); +#else NativeMethods.SetParent(new IntPtr(this.grid.Handle), this.panel.Handle); +#endif UpdateObjects(); } } @@ -413,8 +421,12 @@ protected void UpdateObjects() { Marshal.WriteIntPtr(ppUnk, p); this.BindProperties(); +#if Dev17 + this.grid.SetSelectedObjects(1, new[] { ppUnk }); +#else // BUGBUG -- this is really bad casting a pointer to "int"... this.grid.SetSelectedObjects(1, ppUnk.ToInt32()); +#endif this.grid.Refresh(); } finally diff --git a/src/votive/ProjectBase/SingleFileGenerator.cs b/src/votive.shared/ProjectBase/SingleFileGenerator.cs similarity index 100% rename from src/votive/ProjectBase/SingleFileGenerator.cs rename to src/votive.shared/ProjectBase/SingleFileGenerator.cs diff --git a/src/votive/ProjectBase/SingleFileGeneratorFactory.cs b/src/votive.shared/ProjectBase/SingleFileGeneratorFactory.cs similarity index 100% rename from src/votive/ProjectBase/SingleFileGeneratorFactory.cs rename to src/votive.shared/ProjectBase/SingleFileGeneratorFactory.cs diff --git a/src/votive/ProjectBase/SolutionListener.cs b/src/votive.shared/ProjectBase/SolutionListener.cs similarity index 100% rename from src/votive/ProjectBase/SolutionListener.cs rename to src/votive.shared/ProjectBase/SolutionListener.cs diff --git a/src/votive/ProjectBase/SolutionListenerForBuildDependencyUpdate.cs b/src/votive.shared/ProjectBase/SolutionListenerForBuildDependencyUpdate.cs similarity index 100% rename from src/votive/ProjectBase/SolutionListenerForBuildDependencyUpdate.cs rename to src/votive.shared/ProjectBase/SolutionListenerForBuildDependencyUpdate.cs diff --git a/src/votive/ProjectBase/SolutionListenerForProjectEvents.cs b/src/votive.shared/ProjectBase/SolutionListenerForProjectEvents.cs similarity index 100% rename from src/votive/ProjectBase/SolutionListenerForProjectEvents.cs rename to src/votive.shared/ProjectBase/SolutionListenerForProjectEvents.cs diff --git a/src/votive/ProjectBase/SolutionListenerForProjectOpen.cs b/src/votive.shared/ProjectBase/SolutionListenerForProjectOpen.cs similarity index 100% rename from src/votive/ProjectBase/SolutionListenerForProjectOpen.cs rename to src/votive.shared/ProjectBase/SolutionListenerForProjectOpen.cs diff --git a/src/votive/ProjectBase/SolutionListenerForProjectReferenceUpdate.cs b/src/votive.shared/ProjectBase/SolutionListenerForProjectReferenceUpdate.cs similarity index 100% rename from src/votive/ProjectBase/SolutionListenerForProjectReferenceUpdate.cs rename to src/votive.shared/ProjectBase/SolutionListenerForProjectReferenceUpdate.cs diff --git a/src/votive/ProjectBase/StructuresEnums.cs b/src/votive.shared/ProjectBase/StructuresEnums.cs similarity index 100% rename from src/votive/ProjectBase/StructuresEnums.cs rename to src/votive.shared/ProjectBase/StructuresEnums.cs diff --git a/src/votive/ProjectBase/SuspendFileChanges.cs b/src/votive.shared/ProjectBase/SuspendFileChanges.cs similarity index 100% rename from src/votive/ProjectBase/SuspendFileChanges.cs rename to src/votive.shared/ProjectBase/SuspendFileChanges.cs diff --git a/src/votive/ProjectBase/TokenProcessor.cs b/src/votive.shared/ProjectBase/TokenProcessor.cs similarity index 100% rename from src/votive/ProjectBase/TokenProcessor.cs rename to src/votive.shared/ProjectBase/TokenProcessor.cs diff --git a/src/votive/ProjectBase/Tracing.cs b/src/votive.shared/ProjectBase/Tracing.cs similarity index 100% rename from src/votive/ProjectBase/Tracing.cs rename to src/votive.shared/ProjectBase/Tracing.cs diff --git a/src/votive/ProjectBase/TrackDocumentsHelper.cs b/src/votive.shared/ProjectBase/TrackDocumentsHelper.cs similarity index 100% rename from src/votive/ProjectBase/TrackDocumentsHelper.cs rename to src/votive.shared/ProjectBase/TrackDocumentsHelper.cs diff --git a/src/votive/ProjectBase/TypeConverters.cs b/src/votive.shared/ProjectBase/TypeConverters.cs similarity index 100% rename from src/votive/ProjectBase/TypeConverters.cs rename to src/votive.shared/ProjectBase/TypeConverters.cs diff --git a/src/votive/ProjectBase/UpdateSolutionEventsListener.cs b/src/votive.shared/ProjectBase/UpdateSolutionEventsListener.cs similarity index 100% rename from src/votive/ProjectBase/UpdateSolutionEventsListener.cs rename to src/votive.shared/ProjectBase/UpdateSolutionEventsListener.cs diff --git a/src/votive/ProjectBase/Url.cs b/src/votive.shared/ProjectBase/Url.cs similarity index 100% rename from src/votive/ProjectBase/Url.cs rename to src/votive.shared/ProjectBase/Url.cs diff --git a/src/votive/ProjectBase/Utilities.cs b/src/votive.shared/ProjectBase/Utilities.cs similarity index 99% rename from src/votive/ProjectBase/Utilities.cs rename to src/votive.shared/ProjectBase/Utilities.cs index 4b22cbe..470d702 100644 --- a/src/votive/ProjectBase/Utilities.cs +++ b/src/votive.shared/ProjectBase/Utilities.cs @@ -127,6 +127,11 @@ public static string GetMsBuildPath(IServiceProvider serviceProvider, string ver public static bool IsVisualStudioInDesignMode(IServiceProvider site) { IVsMonitorSelection selectionMonitor = site.GetService(typeof(IVsMonitorSelection)) as IVsMonitorSelection; + if (selectionMonitor == null) + { + return false; + } + uint cookie = 0; int active = 0; Guid designContext = VSConstants.UICONTEXT_DesignMode; diff --git a/src/votive/ProjectBase/VSCommands.cs b/src/votive.shared/ProjectBase/VSCommands.cs similarity index 100% rename from src/votive/ProjectBase/VSCommands.cs rename to src/votive.shared/ProjectBase/VSCommands.cs diff --git a/src/votive/ProjectBase/VSMDCodeDomProvider.cs b/src/votive.shared/ProjectBase/VSMDCodeDomProvider.cs similarity index 100% rename from src/votive/ProjectBase/VSMDCodeDomProvider.cs rename to src/votive.shared/ProjectBase/VSMDCodeDomProvider.cs diff --git a/src/votive/ProjectBase/VSShellUtilities.cs b/src/votive.shared/ProjectBase/VSShellUtilities.cs similarity index 100% rename from src/votive/ProjectBase/VSShellUtilities.cs rename to src/votive.shared/ProjectBase/VSShellUtilities.cs diff --git a/src/votive/ProjectProperty.cs b/src/votive.shared/ProjectProperty.cs similarity index 100% rename from src/votive/ProjectProperty.cs rename to src/votive.shared/ProjectProperty.cs diff --git a/src/votive/ProjectPropertyArgumentException.cs b/src/votive.shared/ProjectPropertyArgumentException.cs similarity index 100% rename from src/votive/ProjectPropertyArgumentException.cs rename to src/votive.shared/ProjectPropertyArgumentException.cs diff --git a/src/votive/Properties/AssemblyInfo.cs b/src/votive.shared/Properties/AssemblyInfo.cs similarity index 100% rename from src/votive/Properties/AssemblyInfo.cs rename to src/votive.shared/Properties/AssemblyInfo.cs diff --git a/src/votive/PropertyPages/WixBuildEventsPropertyPage.cs b/src/votive.shared/PropertyPages/WixBuildEventsPropertyPage.cs similarity index 98% rename from src/votive/PropertyPages/WixBuildEventsPropertyPage.cs rename to src/votive.shared/PropertyPages/WixBuildEventsPropertyPage.cs index 9eec505..dcf6772 100644 --- a/src/votive/PropertyPages/WixBuildEventsPropertyPage.cs +++ b/src/votive.shared/PropertyPages/WixBuildEventsPropertyPage.cs @@ -6,7 +6,6 @@ namespace WixToolset.VisualStudioExtension.PropertyPages using System.Globalization; using System.Runtime.InteropServices; using System.Windows.Forms; - using Microsoft.Build.BuildEngine; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Package; diff --git a/src/votive/PropertyPages/WixBuildEventsPropertyPagePanel.Designer.cs b/src/votive.shared/PropertyPages/WixBuildEventsPropertyPagePanel.Designer.cs similarity index 100% rename from src/votive/PropertyPages/WixBuildEventsPropertyPagePanel.Designer.cs rename to src/votive.shared/PropertyPages/WixBuildEventsPropertyPagePanel.Designer.cs diff --git a/src/votive/PropertyPages/WixBuildEventsPropertyPagePanel.cs b/src/votive.shared/PropertyPages/WixBuildEventsPropertyPagePanel.cs similarity index 100% rename from src/votive/PropertyPages/WixBuildEventsPropertyPagePanel.cs rename to src/votive.shared/PropertyPages/WixBuildEventsPropertyPagePanel.cs diff --git a/src/votive/PropertyPages/WixBuildEventsPropertyPagePanel.resx b/src/votive.shared/PropertyPages/WixBuildEventsPropertyPagePanel.resx similarity index 100% rename from src/votive/PropertyPages/WixBuildEventsPropertyPagePanel.resx rename to src/votive.shared/PropertyPages/WixBuildEventsPropertyPagePanel.resx diff --git a/src/votive/PropertyPages/WixBuildPropertyPage.cs b/src/votive.shared/PropertyPages/WixBuildPropertyPage.cs similarity index 99% rename from src/votive/PropertyPages/WixBuildPropertyPage.cs rename to src/votive.shared/PropertyPages/WixBuildPropertyPage.cs index 45a4e89..1134501 100644 --- a/src/votive/PropertyPages/WixBuildPropertyPage.cs +++ b/src/votive.shared/PropertyPages/WixBuildPropertyPage.cs @@ -8,7 +8,6 @@ namespace WixToolset.VisualStudioExtension.PropertyPages using System.Globalization; using System.Runtime.InteropServices; using System.Windows.Forms; - using Microsoft.Build.BuildEngine; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Package; diff --git a/src/votive/PropertyPages/WixBuildPropertyPagePanel.Designer.cs b/src/votive.shared/PropertyPages/WixBuildPropertyPagePanel.Designer.cs similarity index 100% rename from src/votive/PropertyPages/WixBuildPropertyPagePanel.Designer.cs rename to src/votive.shared/PropertyPages/WixBuildPropertyPagePanel.Designer.cs diff --git a/src/votive/PropertyPages/WixBuildPropertyPagePanel.cs b/src/votive.shared/PropertyPages/WixBuildPropertyPagePanel.cs similarity index 100% rename from src/votive/PropertyPages/WixBuildPropertyPagePanel.cs rename to src/votive.shared/PropertyPages/WixBuildPropertyPagePanel.cs diff --git a/src/votive/PropertyPages/WixBuildPropertyPagePanel.resx b/src/votive.shared/PropertyPages/WixBuildPropertyPagePanel.resx similarity index 100% rename from src/votive/PropertyPages/WixBuildPropertyPagePanel.resx rename to src/votive.shared/PropertyPages/WixBuildPropertyPagePanel.resx diff --git a/src/votive/PropertyPages/WixInstallerPropertyPage.cs b/src/votive.shared/PropertyPages/WixInstallerPropertyPage.cs similarity index 100% rename from src/votive/PropertyPages/WixInstallerPropertyPage.cs rename to src/votive.shared/PropertyPages/WixInstallerPropertyPage.cs diff --git a/src/votive/PropertyPages/WixInstallerPropertyPagePanel.Designer.cs b/src/votive.shared/PropertyPages/WixInstallerPropertyPagePanel.Designer.cs similarity index 100% rename from src/votive/PropertyPages/WixInstallerPropertyPagePanel.Designer.cs rename to src/votive.shared/PropertyPages/WixInstallerPropertyPagePanel.Designer.cs diff --git a/src/votive/PropertyPages/WixInstallerPropertyPagePanel.cs b/src/votive.shared/PropertyPages/WixInstallerPropertyPagePanel.cs similarity index 100% rename from src/votive/PropertyPages/WixInstallerPropertyPagePanel.cs rename to src/votive.shared/PropertyPages/WixInstallerPropertyPagePanel.cs diff --git a/src/votive/PropertyPages/WixInstallerPropertyPagePanel.resx b/src/votive.shared/PropertyPages/WixInstallerPropertyPagePanel.resx similarity index 100% rename from src/votive/PropertyPages/WixInstallerPropertyPagePanel.resx rename to src/votive.shared/PropertyPages/WixInstallerPropertyPagePanel.resx diff --git a/src/votive/PropertyPages/WixPathsPropertyPage.cs b/src/votive.shared/PropertyPages/WixPathsPropertyPage.cs similarity index 100% rename from src/votive/PropertyPages/WixPathsPropertyPage.cs rename to src/votive.shared/PropertyPages/WixPathsPropertyPage.cs diff --git a/src/votive/PropertyPages/WixPathsPropertyPagePanel.Designer.cs b/src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.Designer.cs similarity index 98% rename from src/votive/PropertyPages/WixPathsPropertyPagePanel.Designer.cs rename to src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.Designer.cs index ed9b7df..b55a9ad 100644 --- a/src/votive/PropertyPages/WixPathsPropertyPagePanel.Designer.cs +++ b/src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.Designer.cs @@ -80,7 +80,6 @@ private void InitializeComponent() // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; this.Controls.Add(this.mainTableLayoutPanel); this.MinimumSize = new System.Drawing.Size(344, 447); this.Name = "WixPathsPropertyPagePanel"; diff --git a/src/votive/PropertyPages/WixPathsPropertyPagePanel.cs b/src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.cs similarity index 100% rename from src/votive/PropertyPages/WixPathsPropertyPagePanel.cs rename to src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.cs diff --git a/src/votive/PropertyPages/WixPathsPropertyPagePanel.resx b/src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.resx similarity index 100% rename from src/votive/PropertyPages/WixPathsPropertyPagePanel.resx rename to src/votive.shared/PropertyPages/WixPathsPropertyPagePanel.resx diff --git a/src/votive/PropertyPages/WixPropertyPage.cs b/src/votive.shared/PropertyPages/WixPropertyPage.cs similarity index 99% rename from src/votive/PropertyPages/WixPropertyPage.cs rename to src/votive.shared/PropertyPages/WixPropertyPage.cs index 4d964fd..d565a64 100644 --- a/src/votive/PropertyPages/WixPropertyPage.cs +++ b/src/votive.shared/PropertyPages/WixPropertyPage.cs @@ -13,7 +13,6 @@ namespace WixToolset.VisualStudioExtension.PropertyPages using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; - using Microsoft.Build.BuildEngine; using Microsoft.VisualStudio; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.Package; diff --git a/src/votive/PropertyPages/WixPropertyPagePanel.Designer.cs b/src/votive.shared/PropertyPages/WixPropertyPagePanel.Designer.cs similarity index 100% rename from src/votive/PropertyPages/WixPropertyPagePanel.Designer.cs rename to src/votive.shared/PropertyPages/WixPropertyPagePanel.Designer.cs diff --git a/src/votive/PropertyPages/WixPropertyPagePanel.cs b/src/votive.shared/PropertyPages/WixPropertyPagePanel.cs similarity index 99% rename from src/votive/PropertyPages/WixPropertyPagePanel.cs rename to src/votive.shared/PropertyPages/WixPropertyPagePanel.cs index a4f1604..f72abf5 100644 --- a/src/votive/PropertyPages/WixPropertyPagePanel.cs +++ b/src/votive.shared/PropertyPages/WixPropertyPagePanel.cs @@ -43,7 +43,12 @@ public WixPropertyPagePanel(WixPropertyPage parentPropertyPage) this.InitializeComponent(); this.Font = WixHelperMethods.GetDialogFont(); +#if Dev17 + // VS2022 doesn't use theming on property pages + this.BackColor = SystemColors.Control; +#else this.BackColor = WixHelperMethods.GetVsColor(WixHelperMethods.Vs2010Color.VSCOLOR_BUTTONFACE); +#endif this.ForeColor = WixHelperMethods.GetVsColor(WixHelperMethods.Vs2010Color.VSCOLOR_BUTTONTEXT); } diff --git a/src/votive/PropertyPages/WixPropertyPagePanel.resx b/src/votive.shared/PropertyPages/WixPropertyPagePanel.resx similarity index 100% rename from src/votive/PropertyPages/WixPropertyPagePanel.resx rename to src/votive.shared/PropertyPages/WixPropertyPagePanel.resx diff --git a/src/votive/PropertyPages/WixToolsSettingsPropertyPage.cs b/src/votive.shared/PropertyPages/WixToolsSettingsPropertyPage.cs similarity index 100% rename from src/votive/PropertyPages/WixToolsSettingsPropertyPage.cs rename to src/votive.shared/PropertyPages/WixToolsSettingsPropertyPage.cs diff --git a/src/votive/PropertyPages/WixToolsSettingsPropertyPagePanel.Designer.cs b/src/votive.shared/PropertyPages/WixToolsSettingsPropertyPagePanel.Designer.cs similarity index 100% rename from src/votive/PropertyPages/WixToolsSettingsPropertyPagePanel.Designer.cs rename to src/votive.shared/PropertyPages/WixToolsSettingsPropertyPagePanel.Designer.cs diff --git a/src/votive/PropertyPages/WixToolsSettingsPropertyPagePanel.cs b/src/votive.shared/PropertyPages/WixToolsSettingsPropertyPagePanel.cs similarity index 100% rename from src/votive/PropertyPages/WixToolsSettingsPropertyPagePanel.cs rename to src/votive.shared/PropertyPages/WixToolsSettingsPropertyPagePanel.cs diff --git a/src/votive/PropertyPages/WixToolsSettingsPropertyPagePanel.resx b/src/votive.shared/PropertyPages/WixToolsSettingsPropertyPagePanel.resx similarity index 100% rename from src/votive/PropertyPages/WixToolsSettingsPropertyPagePanel.resx rename to src/votive.shared/PropertyPages/WixToolsSettingsPropertyPagePanel.resx diff --git a/src/votive/PropertyValidator.cs b/src/votive.shared/PropertyValidator.cs similarity index 100% rename from src/votive/PropertyValidator.cs rename to src/votive.shared/PropertyValidator.cs diff --git a/src/votive/Resources/Delete.png b/src/votive.shared/Resources/Delete.png similarity index 100% rename from src/votive/Resources/Delete.png rename to src/votive.shared/Resources/Delete.png diff --git a/src/votive/Resources/DownArrow.png b/src/votive.shared/Resources/DownArrow.png similarity index 100% rename from src/votive/Resources/DownArrow.png rename to src/votive.shared/Resources/DownArrow.png diff --git a/src/votive/Resources/IncludeFile.ico b/src/votive.shared/Resources/IncludeFile.ico similarity index 100% rename from src/votive/Resources/IncludeFile.ico rename to src/votive.shared/Resources/IncludeFile.ico diff --git a/src/votive/Resources/LocalizationFile.ico b/src/votive.shared/Resources/LocalizationFile.ico similarity index 100% rename from src/votive/Resources/LocalizationFile.ico rename to src/votive.shared/Resources/LocalizationFile.ico diff --git a/src/votive/Resources/Package.ico b/src/votive.shared/Resources/Package.ico similarity index 100% rename from src/votive/Resources/Package.ico rename to src/votive.shared/Resources/Package.ico diff --git a/src/votive/Resources/ProductFile.ico b/src/votive.shared/Resources/ProductFile.ico similarity index 100% rename from src/votive/Resources/ProductFile.ico rename to src/votive.shared/Resources/ProductFile.ico diff --git a/src/votive/Resources/ProjectFile.ico b/src/votive.shared/Resources/ProjectFile.ico similarity index 100% rename from src/votive/Resources/ProjectFile.ico rename to src/votive.shared/Resources/ProjectFile.ico diff --git a/src/votive/Resources/Splash.bmp b/src/votive.shared/Resources/Splash.bmp similarity index 100% rename from src/votive/Resources/Splash.bmp rename to src/votive.shared/Resources/Splash.bmp diff --git a/src/votive/Resources/UpArrow.png b/src/votive.shared/Resources/UpArrow.png similarity index 100% rename from src/votive/Resources/UpArrow.png rename to src/votive.shared/Resources/UpArrow.png diff --git a/src/votive/Resources/WixLibraryFile.ico b/src/votive.shared/Resources/WixLibraryFile.ico similarity index 100% rename from src/votive/Resources/WixLibraryFile.ico rename to src/votive.shared/Resources/WixLibraryFile.ico diff --git a/src/votive/Resources/imagelis.bmp b/src/votive.shared/Resources/imagelis.bmp similarity index 100% rename from src/votive/Resources/imagelis.bmp rename to src/votive.shared/Resources/imagelis.bmp diff --git a/src/votive/RunPostBuildEvent.cs b/src/votive.shared/RunPostBuildEvent.cs similarity index 100% rename from src/votive/RunPostBuildEvent.cs rename to src/votive.shared/RunPostBuildEvent.cs diff --git a/src/votive/Templates/v3/Items/BlankFile/BlankFile.ico b/src/votive.shared/Templates/v3/Items/BlankFile/BlankFile.ico similarity index 100% rename from src/votive/Templates/v3/Items/BlankFile/BlankFile.ico rename to src/votive.shared/Templates/v3/Items/BlankFile/BlankFile.ico diff --git a/src/votive/Templates/v3/Items/BlankFile/BlankFile.vstemplate b/src/votive.shared/Templates/v3/Items/BlankFile/BlankFile.vstemplate similarity index 100% rename from src/votive/Templates/v3/Items/BlankFile/BlankFile.vstemplate rename to src/votive.shared/Templates/v3/Items/BlankFile/BlankFile.vstemplate diff --git a/src/votive/Templates/v3/Items/BlankFile/BlankFile.wxs b/src/votive.shared/Templates/v3/Items/BlankFile/BlankFile.wxs similarity index 100% rename from src/votive/Templates/v3/Items/BlankFile/BlankFile.wxs rename to src/votive.shared/Templates/v3/Items/BlankFile/BlankFile.wxs diff --git a/src/votive/Templates/v3/Items/IncludeFile/IncludeFile.ico b/src/votive.shared/Templates/v3/Items/IncludeFile/IncludeFile.ico similarity index 100% rename from src/votive/Templates/v3/Items/IncludeFile/IncludeFile.ico rename to src/votive.shared/Templates/v3/Items/IncludeFile/IncludeFile.ico diff --git a/src/votive/Templates/v3/Items/IncludeFile/IncludeFile.vstemplate b/src/votive.shared/Templates/v3/Items/IncludeFile/IncludeFile.vstemplate similarity index 100% rename from src/votive/Templates/v3/Items/IncludeFile/IncludeFile.vstemplate rename to src/votive.shared/Templates/v3/Items/IncludeFile/IncludeFile.vstemplate diff --git a/src/votive/Templates/v3/Items/IncludeFile/IncludeFile.wxi b/src/votive.shared/Templates/v3/Items/IncludeFile/IncludeFile.wxi similarity index 100% rename from src/votive/Templates/v3/Items/IncludeFile/IncludeFile.wxi rename to src/votive.shared/Templates/v3/Items/IncludeFile/IncludeFile.wxi diff --git a/src/votive/Templates/v3/Items/LocalizationFile/LocalizationFile.ico b/src/votive.shared/Templates/v3/Items/LocalizationFile/LocalizationFile.ico similarity index 100% rename from src/votive/Templates/v3/Items/LocalizationFile/LocalizationFile.ico rename to src/votive.shared/Templates/v3/Items/LocalizationFile/LocalizationFile.ico diff --git a/src/votive/Templates/v3/Items/LocalizationFile/LocalizationFile.vstemplate b/src/votive.shared/Templates/v3/Items/LocalizationFile/LocalizationFile.vstemplate similarity index 100% rename from src/votive/Templates/v3/Items/LocalizationFile/LocalizationFile.vstemplate rename to src/votive.shared/Templates/v3/Items/LocalizationFile/LocalizationFile.vstemplate diff --git a/src/votive/Templates/v3/Items/LocalizationFile/LocalizationFile.wxl b/src/votive.shared/Templates/v3/Items/LocalizationFile/LocalizationFile.wxl similarity index 100% rename from src/votive/Templates/v3/Items/LocalizationFile/LocalizationFile.wxl rename to src/votive.shared/Templates/v3/Items/LocalizationFile/LocalizationFile.wxl diff --git a/src/votive/Templates/v3/Items/TextFile/TextFile.ico b/src/votive.shared/Templates/v3/Items/TextFile/TextFile.ico similarity index 100% rename from src/votive/Templates/v3/Items/TextFile/TextFile.ico rename to src/votive.shared/Templates/v3/Items/TextFile/TextFile.ico diff --git a/src/votive/Templates/v3/Items/TextFile/TextFile.txt b/src/votive.shared/Templates/v3/Items/TextFile/TextFile.txt similarity index 100% rename from src/votive/Templates/v3/Items/TextFile/TextFile.txt rename to src/votive.shared/Templates/v3/Items/TextFile/TextFile.txt diff --git a/src/votive/Templates/v3/Items/TextFile/TextFile.vstemplate b/src/votive.shared/Templates/v3/Items/TextFile/TextFile.vstemplate similarity index 100% rename from src/votive/Templates/v3/Items/TextFile/TextFile.vstemplate rename to src/votive.shared/Templates/v3/Items/TextFile/TextFile.vstemplate diff --git a/src/votive/Templates/v3/Projects/CustomActionCS/AssemblyInfo.cs b/src/votive.shared/Templates/v3/Projects/CustomActionCS/AssemblyInfo.cs similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionCS/AssemblyInfo.cs rename to src/votive.shared/Templates/v3/Projects/CustomActionCS/AssemblyInfo.cs diff --git a/src/votive/Templates/v3/Projects/CustomActionCS/CustomAction.config b/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.config similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionCS/CustomAction.config rename to src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.config diff --git a/src/votive/Templates/v3/Projects/CustomActionCS/CustomAction.cs b/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.cs similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionCS/CustomAction.cs rename to src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.cs diff --git a/src/votive/Templates/v3/Projects/CustomActionCS/CustomAction.csproj b/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.csproj similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionCS/CustomAction.csproj rename to src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.csproj diff --git a/src/votive/Templates/v3/Projects/CustomActionCS/CustomActionCS.vstemplate b/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomActionCS.vstemplate similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionCS/CustomActionCS.vstemplate rename to src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomActionCS.vstemplate diff --git a/src/votive/Templates/v3/Projects/CustomActionVB/AssemblyInfo.vb b/src/votive.shared/Templates/v3/Projects/CustomActionVB/AssemblyInfo.vb similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionVB/AssemblyInfo.vb rename to src/votive.shared/Templates/v3/Projects/CustomActionVB/AssemblyInfo.vb diff --git a/src/votive/Templates/v3/Projects/CustomActionVB/CustomAction.config b/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.config similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionVB/CustomAction.config rename to src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.config diff --git a/src/votive/Templates/v3/Projects/CustomActionVB/CustomAction.vb b/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vb similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionVB/CustomAction.vb rename to src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vb diff --git a/src/votive/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj b/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj rename to src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj diff --git a/src/votive/Templates/v3/Projects/CustomActionVB/CustomActionVB.vstemplate b/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomActionVB.vstemplate similarity index 100% rename from src/votive/Templates/v3/Projects/CustomActionVB/CustomActionVB.vstemplate rename to src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomActionVB.vstemplate diff --git a/src/votive/Templates/v3/Projects/WixBundleProject/Bundle.Generated.wxs b/src/votive.shared/Templates/v3/Projects/WixBundleProject/Bundle.Generated.wxs similarity index 100% rename from src/votive/Templates/v3/Projects/WixBundleProject/Bundle.Generated.wxs rename to src/votive.shared/Templates/v3/Projects/WixBundleProject/Bundle.Generated.wxs diff --git a/src/votive/Templates/v3/Projects/WixBundleProject/Bundle.wxs b/src/votive.shared/Templates/v3/Projects/WixBundleProject/Bundle.wxs similarity index 100% rename from src/votive/Templates/v3/Projects/WixBundleProject/Bundle.wxs rename to src/votive.shared/Templates/v3/Projects/WixBundleProject/Bundle.wxs diff --git a/src/votive/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj b/src/votive.shared/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj similarity index 100% rename from src/votive/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj rename to src/votive.shared/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj diff --git a/src/votive/Templates/v3/Projects/WixBundleProject/WixBundle.ico b/src/votive.shared/Templates/v3/Projects/WixBundleProject/WixBundle.ico similarity index 100% rename from src/votive/Templates/v3/Projects/WixBundleProject/WixBundle.ico rename to src/votive.shared/Templates/v3/Projects/WixBundleProject/WixBundle.ico diff --git a/src/votive/Templates/v3/Projects/WixBundleProject/WixBundle.vstemplate b/src/votive.shared/Templates/v3/Projects/WixBundleProject/WixBundle.vstemplate similarity index 100% rename from src/votive/Templates/v3/Projects/WixBundleProject/WixBundle.vstemplate rename to src/votive.shared/Templates/v3/Projects/WixBundleProject/WixBundle.vstemplate diff --git a/src/votive/Templates/v3/Projects/WixLibrary/Library.wxs b/src/votive.shared/Templates/v3/Projects/WixLibrary/Library.wxs similarity index 100% rename from src/votive/Templates/v3/Projects/WixLibrary/Library.wxs rename to src/votive.shared/Templates/v3/Projects/WixLibrary/Library.wxs diff --git a/src/votive/Templates/v3/Projects/WixLibrary/WixLibrary.ico b/src/votive.shared/Templates/v3/Projects/WixLibrary/WixLibrary.ico similarity index 100% rename from src/votive/Templates/v3/Projects/WixLibrary/WixLibrary.ico rename to src/votive.shared/Templates/v3/Projects/WixLibrary/WixLibrary.ico diff --git a/src/votive/Templates/v3/Projects/WixLibrary/WixLibrary.vstemplate b/src/votive.shared/Templates/v3/Projects/WixLibrary/WixLibrary.vstemplate similarity index 100% rename from src/votive/Templates/v3/Projects/WixLibrary/WixLibrary.vstemplate rename to src/votive.shared/Templates/v3/Projects/WixLibrary/WixLibrary.vstemplate diff --git a/src/votive/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj b/src/votive.shared/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj similarity index 100% rename from src/votive/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj rename to src/votive.shared/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj diff --git a/src/votive/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj b/src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj similarity index 100% rename from src/votive/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj rename to src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj diff --git a/src/votive/Templates/v3/Projects/WixMergeModule/MergeModule.wxs b/src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wxs similarity index 100% rename from src/votive/Templates/v3/Projects/WixMergeModule/MergeModule.wxs rename to src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wxs diff --git a/src/votive/Templates/v3/Projects/WixMergeModule/WixMergeModule.ico b/src/votive.shared/Templates/v3/Projects/WixMergeModule/WixMergeModule.ico similarity index 100% rename from src/votive/Templates/v3/Projects/WixMergeModule/WixMergeModule.ico rename to src/votive.shared/Templates/v3/Projects/WixMergeModule/WixMergeModule.ico diff --git a/src/votive/Templates/v3/Projects/WixMergeModule/WixMergeModule.vstemplate b/src/votive.shared/Templates/v3/Projects/WixMergeModule/WixMergeModule.vstemplate similarity index 100% rename from src/votive/Templates/v3/Projects/WixMergeModule/WixMergeModule.vstemplate rename to src/votive.shared/Templates/v3/Projects/WixMergeModule/WixMergeModule.vstemplate diff --git a/src/votive/Templates/v3/Projects/WixProject/Product.wxs b/src/votive.shared/Templates/v3/Projects/WixProject/Product.wxs similarity index 100% rename from src/votive/Templates/v3/Projects/WixProject/Product.wxs rename to src/votive.shared/Templates/v3/Projects/WixProject/Product.wxs diff --git a/src/votive/Templates/v3/Projects/WixProject/SetupProject.wixproj b/src/votive.shared/Templates/v3/Projects/WixProject/SetupProject.wixproj similarity index 100% rename from src/votive/Templates/v3/Projects/WixProject/SetupProject.wixproj rename to src/votive.shared/Templates/v3/Projects/WixProject/SetupProject.wixproj diff --git a/src/votive/Templates/v3/Projects/WixProject/WixProject.ico b/src/votive.shared/Templates/v3/Projects/WixProject/WixProject.ico similarity index 100% rename from src/votive/Templates/v3/Projects/WixProject/WixProject.ico rename to src/votive.shared/Templates/v3/Projects/WixProject/WixProject.ico diff --git a/src/votive/Templates/v3/Projects/WixProject/WixProject.vstemplate b/src/votive.shared/Templates/v3/Projects/WixProject/WixProject.vstemplate similarity index 100% rename from src/votive/Templates/v3/Projects/WixProject/WixProject.vstemplate rename to src/votive.shared/Templates/v3/Projects/WixProject/WixProject.vstemplate diff --git a/src/votive/Templates/v3/Projects/customaction.config b/src/votive.shared/Templates/v3/Projects/customaction.config similarity index 100% rename from src/votive/Templates/v3/Projects/customaction.config rename to src/votive.shared/Templates/v3/Projects/customaction.config diff --git a/src/votive/WixBuildMacroCollection.cs b/src/votive.shared/WixBuildMacroCollection.cs similarity index 99% rename from src/votive/WixBuildMacroCollection.cs rename to src/votive.shared/WixBuildMacroCollection.cs index 47756c5..60080f5 100644 --- a/src/votive/WixBuildMacroCollection.cs +++ b/src/votive.shared/WixBuildMacroCollection.cs @@ -10,7 +10,6 @@ namespace WixToolset.VisualStudioExtension using System.Text; using EnvDTE; - using Microsoft.Build.BuildEngine; using Microsoft.Build.Execution; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Package; diff --git a/src/votive/WixConfigProvider.cs b/src/votive.shared/WixConfigProvider.cs similarity index 99% rename from src/votive/WixConfigProvider.cs rename to src/votive.shared/WixConfigProvider.cs index 561750b..46d1932 100644 --- a/src/votive/WixConfigProvider.cs +++ b/src/votive.shared/WixConfigProvider.cs @@ -9,8 +9,7 @@ namespace WixToolset.VisualStudioExtension using System.IO; using System.Runtime.InteropServices; using System.Text; - using Microsoft.Build.BuildEngine; - using MSBuild = Microsoft.Build.Evaluation; + using MSBuild = Microsoft.Build.Evaluation; using MSBuildConstruction = Microsoft.Build.Construction; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Package; diff --git a/src/votive/WixDesignPropertyDescriptor.cs b/src/votive.shared/WixDesignPropertyDescriptor.cs similarity index 100% rename from src/votive/WixDesignPropertyDescriptor.cs rename to src/votive.shared/WixDesignPropertyDescriptor.cs diff --git a/src/votive/WixExtensionReferenceNode.cs b/src/votive.shared/WixExtensionReferenceNode.cs similarity index 100% rename from src/votive/WixExtensionReferenceNode.cs rename to src/votive.shared/WixExtensionReferenceNode.cs diff --git a/src/votive/WixExtensionReferenceNodeProperties.cs b/src/votive.shared/WixExtensionReferenceNodeProperties.cs similarity index 100% rename from src/votive/WixExtensionReferenceNodeProperties.cs rename to src/votive.shared/WixExtensionReferenceNodeProperties.cs diff --git a/src/votive/WixFileNode.cs b/src/votive.shared/WixFileNode.cs similarity index 100% rename from src/votive/WixFileNode.cs rename to src/votive.shared/WixFileNode.cs diff --git a/src/votive/WixFileNodeNonMemberProperties.cs b/src/votive.shared/WixFileNodeNonMemberProperties.cs similarity index 100% rename from src/votive/WixFileNodeNonMemberProperties.cs rename to src/votive.shared/WixFileNodeNonMemberProperties.cs diff --git a/src/votive/WixFileNodeProperties.cs b/src/votive.shared/WixFileNodeProperties.cs similarity index 100% rename from src/votive/WixFileNodeProperties.cs rename to src/votive.shared/WixFileNodeProperties.cs diff --git a/src/votive/WixFolderNode.cs b/src/votive.shared/WixFolderNode.cs similarity index 100% rename from src/votive/WixFolderNode.cs rename to src/votive.shared/WixFolderNode.cs diff --git a/src/votive/WixFolderNodeNonMemberProperties.cs b/src/votive.shared/WixFolderNodeNonMemberProperties.cs similarity index 100% rename from src/votive/WixFolderNodeNonMemberProperties.cs rename to src/votive.shared/WixFolderNodeNonMemberProperties.cs diff --git a/src/votive/WixFolderNodeProperties.cs b/src/votive.shared/WixFolderNodeProperties.cs similarity index 100% rename from src/votive/WixFolderNodeProperties.cs rename to src/votive.shared/WixFolderNodeProperties.cs diff --git a/src/votive/WixHelperMethods.cs b/src/votive.shared/WixHelperMethods.cs similarity index 99% rename from src/votive/WixHelperMethods.cs rename to src/votive.shared/WixHelperMethods.cs index 3c520a2..b26623f 100644 --- a/src/votive/WixHelperMethods.cs +++ b/src/votive.shared/WixHelperMethods.cs @@ -17,7 +17,6 @@ namespace WixToolset.VisualStudioExtension using System.Windows.Forms; using System.Xml; using System.Xml.Schema; - using Microsoft.Build.BuildEngine; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Package; using Microsoft.VisualStudio.Shell; diff --git a/src/votive/WixLibraryReferenceNode.cs b/src/votive.shared/WixLibraryReferenceNode.cs similarity index 100% rename from src/votive/WixLibraryReferenceNode.cs rename to src/votive.shared/WixLibraryReferenceNode.cs diff --git a/src/votive/WixLibraryReferenceNodeProperties.cs b/src/votive.shared/WixLibraryReferenceNodeProperties.cs similarity index 100% rename from src/votive/WixLibraryReferenceNodeProperties.cs rename to src/votive.shared/WixLibraryReferenceNodeProperties.cs diff --git a/src/votive/WixLinkedFileNodeProperties.cs b/src/votive.shared/WixLinkedFileNodeProperties.cs similarity index 100% rename from src/votive/WixLinkedFileNodeProperties.cs rename to src/votive.shared/WixLinkedFileNodeProperties.cs diff --git a/src/votive/WixLocalizedCategoryAttribute.cs b/src/votive.shared/WixLocalizedCategoryAttribute.cs similarity index 100% rename from src/votive/WixLocalizedCategoryAttribute.cs rename to src/votive.shared/WixLocalizedCategoryAttribute.cs diff --git a/src/votive/WixLocalizedControlTextAttribute.cs b/src/votive.shared/WixLocalizedControlTextAttribute.cs similarity index 100% rename from src/votive/WixLocalizedControlTextAttribute.cs rename to src/votive.shared/WixLocalizedControlTextAttribute.cs diff --git a/src/votive/WixLocalizedDescriptionAttribute.cs b/src/votive.shared/WixLocalizedDescriptionAttribute.cs similarity index 100% rename from src/votive/WixLocalizedDescriptionAttribute.cs rename to src/votive.shared/WixLocalizedDescriptionAttribute.cs diff --git a/src/votive/WixLocalizedDisplayNameAttribute.cs b/src/votive.shared/WixLocalizedDisplayNameAttribute.cs similarity index 100% rename from src/votive/WixLocalizedDisplayNameAttribute.cs rename to src/votive.shared/WixLocalizedDisplayNameAttribute.cs diff --git a/src/votive/WixNonMemberDesignPropertyDescriptor.cs b/src/votive.shared/WixNonMemberDesignPropertyDescriptor.cs similarity index 100% rename from src/votive/WixNonMemberDesignPropertyDescriptor.cs rename to src/votive.shared/WixNonMemberDesignPropertyDescriptor.cs diff --git a/src/votive/WixOutputType.cs b/src/votive.shared/WixOutputType.cs similarity index 100% rename from src/votive/WixOutputType.cs rename to src/votive.shared/WixOutputType.cs diff --git a/src/votive/WixPackage.cs b/src/votive.shared/WixPackage.cs similarity index 100% rename from src/votive/WixPackage.cs rename to src/votive.shared/WixPackage.cs diff --git a/src/votive/WixPackageSettings.cs b/src/votive.shared/WixPackageSettings.cs similarity index 100% rename from src/votive/WixPackageSettings.cs rename to src/votive.shared/WixPackageSettings.cs diff --git a/src/votive/WixProjectConfig.cs b/src/votive.shared/WixProjectConfig.cs similarity index 98% rename from src/votive/WixProjectConfig.cs rename to src/votive.shared/WixProjectConfig.cs index b3ac8e9..2bc7c0c 100644 --- a/src/votive/WixProjectConfig.cs +++ b/src/votive.shared/WixProjectConfig.cs @@ -11,7 +11,6 @@ namespace WixToolset.VisualStudioExtension using System.IO; using System.Runtime.InteropServices; using System.Text; - using Microsoft.Build.BuildEngine; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Package; using Microsoft.VisualStudio.Package.Automation; diff --git a/src/votive/WixProjectFactory.cs b/src/votive.shared/WixProjectFactory.cs similarity index 96% rename from src/votive/WixProjectFactory.cs rename to src/votive.shared/WixProjectFactory.cs index d431cb4..53e1c52 100644 --- a/src/votive/WixProjectFactory.cs +++ b/src/votive.shared/WixProjectFactory.cs @@ -59,7 +59,7 @@ public WixProjectFactory(WixPackage package) [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "5#", Justification = "Suppressing to avoid conflict with style cop.")] [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "6#", Justification = "Suppressing to avoid conflict with style cop.")] [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", Scope = "member")] - public override int UpgradeProject(string fileName, uint upgradeFlag, string copyLocation, out string upgradedFullyQualifiedFileName, IVsUpgradeLogger logger, out int upgradeRequired, out Guid newProjectFactory) + public virtual int UpgradeProject(string fileName, uint upgradeFlag, string copyLocation, out string upgradedFullyQualifiedFileName, IVsUpgradeLogger logger, out int upgradeRequired, out Guid newProjectFactory) { uint ignore; string projectName = Path.GetFileNameWithoutExtension(fileName); @@ -188,7 +188,7 @@ public override int UpgradeProject(string fileName, uint upgradeFlag, string cop [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "2#", Justification = "Suppressing to avoid conflict with style cop.")] [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "3#", Justification = "Suppressing to avoid conflict with style cop.")] [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "4#", Justification = "Suppressing to avoid conflict with style cop.")] - public override int UpgradeProject_CheckOnly(string fileName, IVsUpgradeLogger logger, out int upgradeRequired, out Guid newProjectFactory, out uint upgradeProjectCapabilityFlags) + public virtual int UpgradeProject_CheckOnly(string fileName, IVsUpgradeLogger logger, out int upgradeRequired, out Guid newProjectFactory, out uint upgradeProjectCapabilityFlags) { upgradeRequired = 0; newProjectFactory = this.GetType().GUID; @@ -271,7 +271,7 @@ public override int UpgradeProject_CheckOnly(string fileName, IVsUpgradeLogger l [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "2#", Justification = "Suppressing to avoid conflict with style cop.")] [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "3#", Justification = "Suppressing to avoid conflict with style cop.")] [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "4#", Justification = "Suppressing to avoid conflict with style cop.")] - public override int GetSccInfo(string projectFileName, out string sccProjectName, out string sccAuxPath, out string sccLocalPath, out string sccProvider) + public virtual int GetSccInfo(string projectFileName, out string sccProjectName, out string sccAuxPath, out string sccLocalPath, out string sccProvider) { sccProjectName = String.Empty; sccAuxPath = String.Empty; diff --git a/src/votive/WixProjectFileConstants.cs b/src/votive.shared/WixProjectFileConstants.cs similarity index 100% rename from src/votive/WixProjectFileConstants.cs rename to src/votive.shared/WixProjectFileConstants.cs diff --git a/src/votive/WixProjectMembers.cs b/src/votive.shared/WixProjectMembers.cs similarity index 100% rename from src/votive/WixProjectMembers.cs rename to src/votive.shared/WixProjectMembers.cs diff --git a/src/votive/WixProjectNode.cs b/src/votive.shared/WixProjectNode.cs similarity index 100% rename from src/votive/WixProjectNode.cs rename to src/votive.shared/WixProjectNode.cs diff --git a/src/votive/WixProjectNodeProperties.cs b/src/votive.shared/WixProjectNodeProperties.cs similarity index 99% rename from src/votive/WixProjectNodeProperties.cs rename to src/votive.shared/WixProjectNodeProperties.cs index 7552997..782028c 100644 --- a/src/votive/WixProjectNodeProperties.cs +++ b/src/votive.shared/WixProjectNodeProperties.cs @@ -8,7 +8,6 @@ namespace WixToolset.VisualStudioExtension using System.IO; using System.Runtime.InteropServices; using System.Globalization; - using Microsoft.Build.BuildEngine; using Microsoft.VisualStudio.Package; using Utilities = Microsoft.VisualStudio.Package.Utilities; using VSConstants = Microsoft.VisualStudio.VSConstants; diff --git a/src/votive/WixProjectReferenceNode.cs b/src/votive.shared/WixProjectReferenceNode.cs similarity index 100% rename from src/votive/WixProjectReferenceNode.cs rename to src/votive.shared/WixProjectReferenceNode.cs diff --git a/src/votive/WixProjectReferenceNodeProperties.cs b/src/votive.shared/WixProjectReferenceNodeProperties.cs similarity index 100% rename from src/votive/WixProjectReferenceNodeProperties.cs rename to src/votive.shared/WixProjectReferenceNodeProperties.cs diff --git a/src/votive/WixReferenceContainerNode.cs b/src/votive.shared/WixReferenceContainerNode.cs similarity index 100% rename from src/votive/WixReferenceContainerNode.cs rename to src/votive.shared/WixReferenceContainerNode.cs diff --git a/src/votive/WixReferenceNode.cs b/src/votive.shared/WixReferenceNode.cs similarity index 100% rename from src/votive/WixReferenceNode.cs rename to src/votive.shared/WixReferenceNode.cs diff --git a/src/votive/WixReferenceNodeProperties.cs b/src/votive.shared/WixReferenceNodeProperties.cs similarity index 100% rename from src/votive/WixReferenceNodeProperties.cs rename to src/votive.shared/WixReferenceNodeProperties.cs diff --git a/src/votive/WixReferenceValidator.cs b/src/votive.shared/WixReferenceValidator.cs similarity index 100% rename from src/votive/WixReferenceValidator.cs rename to src/votive.shared/WixReferenceValidator.cs diff --git a/src/votive/WixStrings.Designer.cs b/src/votive.shared/WixStrings.Designer.cs similarity index 100% rename from src/votive/WixStrings.Designer.cs rename to src/votive.shared/WixStrings.Designer.cs diff --git a/src/votive/WixStrings.resx b/src/votive.shared/WixStrings.resx similarity index 100% rename from src/votive/WixStrings.resx rename to src/votive.shared/WixStrings.resx diff --git a/src/votive/WixVsConstants.cs b/src/votive.shared/WixVsConstants.cs similarity index 100% rename from src/votive/WixVsConstants.cs rename to src/votive.shared/WixVsConstants.cs diff --git a/src/votive/WixWarningLevel.cs b/src/votive.shared/WixWarningLevel.cs similarity index 100% rename from src/votive/WixWarningLevel.cs rename to src/votive.shared/WixWarningLevel.cs diff --git a/src/votive.shared/votive.shared.projitems b/src/votive.shared/votive.shared.projitems new file mode 100644 index 0000000..ca5a820 --- /dev/null +++ b/src/votive.shared/votive.shared.projitems @@ -0,0 +1,351 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 72a14880-ec19-43b4-a4f0-dc9ddae2c763 + + + WixToolset.VisualStudioExtension + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + DontShowAgainDialog.cs + + + Form + + + FileOverwriteDialog.cs + + + + + DontShowAgainDialog.cs + Designer + + + FileOverwriteDialog.cs + Designer + + + Microsoft.VisualStudio.Package.Project.resources + Designer + + + Resources.imagelis.bmp + + + + + UserControl + true + + + FolderBrowserTextBox.cs + + + UserControl + + + WixBuildEventEditor.cs + + + Component + + + UserControl + + + WixFoldersSelector.cs + + + Component + + + Component + + + UserControl + + + WixColorUserControl.cs + + + WixColorUserControl.cs + Designer + + + Form + + + WixBuildEventEditorForm.cs + + + + UserControl + + + WixBuildEventsPropertyPagePanel.cs + + + + + UserControl + + + WixInstallerPropertyPagePanel.cs + + + + UserControl + + + WixBuildPropertyPagePanel.cs + + + + UserControl + + + WixPathsPropertyPagePanel.cs + + + + UserControl + + + WixPropertyPagePanel.cs + + + + UserControl + + + WixToolsSettingsPropertyPagePanel.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + ResXFileCodeGenerator + $(RootNamespace).WixStrings.resources + true + + + True + True + WixStrings.resx + + + + + FolderBrowserTextBox.cs + Designer + + + WixBuildEventEditor.cs + Designer + + + WixBuildEventEditorForm.cs + Designer + + + WixBuildEventsPropertyPagePanel.cs + Designer + + + WixBuildPropertyPagePanel.cs + Designer + + + Designer + WixFoldersSelector.cs + + + WixPropertyPagePanel.cs + Designer + + + Designer + WixBuildEventTextBox.cs + + + Designer + WixGroupBox.cs + + + Designer + WixGroupLabel.cs + + + WixInstallerPropertyPagePanel.cs + Designer + + + Designer + WixPathsPropertyPagePanel.cs + + + Designer + WixToolsSettingsPropertyPagePanel.cs + + + + + + + + + + + + \ No newline at end of file diff --git a/src/votive.shared/votive.shared.shproj b/src/votive.shared/votive.shared.shproj new file mode 100644 index 0000000..7d0c8f8 --- /dev/null +++ b/src/votive.shared/votive.shared.shproj @@ -0,0 +1,13 @@ + + + + 72a14880-ec19-43b4-a4f0-dc9ddae2c763 + 14.0 + + + + + + + + diff --git a/src/votive/packages.config b/src/votive/packages.config deleted file mode 100644 index 7c6dcb8..0000000 --- a/src/votive/packages.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/votive/votive.csproj b/src/votive/votive.csproj index de4528d..6862de9 100644 --- a/src/votive/votive.csproj +++ b/src/votive/votive.csproj @@ -1,6 +1,5 @@  - {24A98296-9D58-42C1-95C0-CC36736409E2} {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -8,7 +7,6 @@ WixToolset.VisualStudioExtension votive true - true true false @@ -17,511 +15,23 @@ false true WiX + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - DontShowAgainDialog.cs - - - Form - - - FileOverwriteDialog.cs - - - - - DontShowAgainDialog.cs - Designer - - - FileOverwriteDialog.cs - Designer - - - Microsoft.VisualStudio.Package.Project.resources - Designer - - - Resources.imagelis.bmp - - - - - - UserControl - true - - - FolderBrowserTextBox.cs - - - UserControl - - - WixBuildEventEditor.cs - - - Component - - - UserControl - - - WixFoldersSelector.cs - - - Component - - - Component - - - UserControl - - - WixColorUserControl.cs - - - WixColorUserControl.cs - Designer - - - Form - - - WixBuildEventEditorForm.cs - - - - UserControl - - - WixBuildEventsPropertyPagePanel.cs - - - - - UserControl - - - WixInstallerPropertyPagePanel.cs - - - - UserControl - - - WixBuildPropertyPagePanel.cs - - - - UserControl - - - WixPathsPropertyPagePanel.cs - - - - UserControl - - - WixPropertyPagePanel.cs - - - - UserControl - - - WixToolsSettingsPropertyPagePanel.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - ResXFileCodeGenerator - $(RootNamespace).WixStrings.resources - true - - - True - True - WixStrings.resx - - - - - - FolderBrowserTextBox.cs - Designer - - - WixBuildEventEditor.cs - Designer - - - WixBuildEventEditorForm.cs - Designer - - - WixBuildEventsPropertyPagePanel.cs - Designer - - - WixBuildPropertyPagePanel.cs - Designer - - - Designer - WixFoldersSelector.cs - - - WixPropertyPagePanel.cs - Designer - - - Designer - WixBuildEventTextBox.cs - - - Designer - WixGroupBox.cs - - - Designer - WixGroupLabel.cs - - - WixInstallerPropertyPagePanel.cs - Designer - - - Designer - WixPathsPropertyPagePanel.cs - - - Designer - WixToolsSettingsPropertyPagePanel.cs - - - - - - - - - - - - - - - - False - ..\..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll - True - - - False - ..\..\packages\VSSDK.DTE.10.10.0.4\lib\net20\envdte100.dll - True - - - False - ..\..\packages\VSSDK.DTE.8.8.0.4\lib\net20\envdte80.dll - True - - - False - ..\..\packages\VSSDK.DTE.9.9.0.4\lib\net20\envdte90.dll - True - - - False - ..\..\packages\VSSDK.DTE.9.9.0.4\lib\net20\envdte90a.dll - True - - - ..\..\packages\VSSDK.CoreUtility.10.0.4\lib\net40\Microsoft.VisualStudio.CoreUtility.dll - True - False - - - False - ..\..\packages\VSSDK.Designer.7.0.4\lib\net20\Microsoft.VisualStudio.Designer.Interfaces.dll - True - - - ..\..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll - True - False - - - ..\..\packages\VSSDK.Shell.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.10.0.dll - True - False - - - ..\..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - False - - - ..\..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll - True - False - - - False - ..\..\packages\VSSDK.Shell.Interop.10.10.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - ..\..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - False - - - ..\..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - False - - - ..\..\packages\VSSDK.Text.10.0.4\lib\net40\Microsoft.VisualStudio.Text.Data.dll - True - False - - - ..\..\packages\VSSDK.Text.10.0.4\lib\net40\Microsoft.VisualStudio.Text.Logic.dll - True - False - - - ..\..\packages\VSSDK.Text.10.0.4\lib\net40\Microsoft.VisualStudio.Text.UI.dll - True - False - - - ..\..\packages\VSSDK.Text.10.0.4\lib\net40\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - False - - - ..\..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll - True - False - - - False - ..\..\packages\VSSDK.TextManager.Interop.10.10.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.10.0.dll - True - - - ..\..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - False - - - ..\..\packages\VSSDK.TextManager.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.9.0.dll - True - False - - - False - ..\..\packages\VSSDK.VSHelp.7.0.4\lib\net20\Microsoft.VisualStudio.VSHelp.dll - True - - - False - ..\..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll - True - - - False - ..\..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj.dll - True - - - False - ..\..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj2.dll - True - - - False - ..\..\packages\VSSDK.VSLangProj.8.8.0.4\lib\net20\VSLangProj80.dll - True - - True - - True - True @@ -530,7 +40,6 @@ - false @@ -546,23 +55,47 @@ --> - - + + + 15.0.26201 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 2.2.33 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 7.0.4 + + + 10.0.4 + + + 10.0.4 + + + 10.0.4 + + + 10.0.4 + + + 10.0.4 + + + 7.0.4 + + + 8.0.4 + + + - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/tools/WixBuild.props b/tools/WixBuild.props index 9152708..a2a570c 100644 --- a/tools/WixBuild.props +++ b/tools/WixBuild.props @@ -35,7 +35,7 @@ Debug - Release + release Release @@ -98,8 +98,8 @@ - $(WIX_OBJROOT)$(WixFlavor)\$(NormalizedPlatform)\ - $(BaseIntermediateOutputPath)$(MSBuildProjectName)\ + $(WIX_OBJROOT)common\$(MSBuildProjectName)\ + $(WIX_OBJROOT)$(WixFlavor)\$(NormalizedPlatform)\$(MSBuildProjectName)\