From df016066100df955d5ff98811e113fb2b1bd4b8a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 26 Apr 2021 11:31:05 -0700 Subject: Implement integrated build process --- src/ext/Bal/Bal.wixext.sln | 32 +++--- src/ext/Bal/CSharp.Build.props | 13 --- src/ext/Bal/Cpp.Build.props | 94 ----------------- src/ext/Bal/Custom.Build.props | 11 -- src/ext/Bal/Directory.Build.props | 30 ++---- src/ext/Bal/Directory.Build.targets | 56 ---------- .../Bal/Samples/bafunctions/bafunctions.vcxproj | 23 ++--- src/ext/Bal/Samples/bafunctions/packages.config | 7 -- .../WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 5 - .../WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 18 ++-- src/ext/Bal/appveyor.cmd | 17 --- src/ext/Bal/appveyor.yml | 40 ------- src/ext/Bal/bal.cmd | 36 +++++++ src/ext/Bal/dnchost/dnchost.vcxproj | 57 +++++----- src/ext/Bal/dnchost/packages.config | 9 +- src/ext/Bal/mbahost/mbahost.vcxproj | 50 +++------ src/ext/Bal/mbahost/packages.config | 10 -- src/ext/Bal/nuget.config | 19 ---- .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 17 +-- .../test/WixToolsetTest.ManagedHost/TestEngine.cs | 2 +- .../WixToolsetTest.ManagedHost.csproj | 15 ++- src/ext/Bal/test/examples/Directory.Build.props | 2 +- src/ext/Bal/test/examples/Directory.Build.targets | 2 +- .../FrameworkDependentBundle.wxs | 1 - .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 5 +- .../Example.FullFramework2MBA.csproj | 9 +- .../Example.FullFramework4MBA.csproj | 7 +- .../FrameworkDependentBundle.wxs | 1 - .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 5 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 39 +++---- .../Bal/test/examples/TestEngine/packages.config | 7 -- .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 1 - .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 16 ++- src/ext/Bal/test/examples/examples.proj | 2 +- src/ext/Bal/wix.snk | Bin 596 -> 0 bytes src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj | 22 +--- src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec | 10 +- src/ext/Bal/wixlib/BalExtension_arm64.wxs | 2 +- src/ext/Bal/wixlib/BalExtension_platform.wxi | 14 --- src/ext/Bal/wixlib/BalExtension_x64.wxs | 1 + src/ext/Bal/wixlib/BalExtension_x86.wxs | 1 + src/ext/Bal/wixlib/Mbahost_platform.wxi | 19 ++++ src/ext/Bal/wixlib/bal.wixproj | 29 +++--- src/ext/Bal/wixstdba/packages.config | 10 -- src/ext/Bal/wixstdba/wixstdba.vcxproj | 39 ++----- src/ext/ComPlus/CSharp.Build.props | 11 -- src/ext/ComPlus/ComPlus.wixext.sln | 8 +- src/ext/ComPlus/Cpp.Build.props | 88 ---------------- src/ext/ComPlus/Directory.Build.props | 23 +---- src/ext/ComPlus/Directory.Build.targets | 51 --------- src/ext/ComPlus/Directory.csproj.props | 13 --- src/ext/ComPlus/Directory.csproj.targets | 26 ----- src/ext/ComPlus/Directory.vcxproj.props | 93 ----------------- src/ext/ComPlus/Wix.Build.props | 31 ------ src/ext/ComPlus/appveyor.cmd | 22 ---- src/ext/ComPlus/appveyor.yml | 42 -------- src/ext/ComPlus/ca/complusca.vcxproj | 10 +- src/ext/ComPlus/ca/packages.config | 5 - src/ext/ComPlus/complus.cmd | 22 ++++ src/ext/ComPlus/nuget.config | 17 --- .../WixToolsetTest.ComPlus.csproj | 16 +-- src/ext/ComPlus/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.ComPlus.wixext.csproj | 9 +- .../wixext/WixToolset.ComPlus.wixext.nuspec | 8 +- src/ext/ComPlus/wixlib/complus.wixproj | 5 +- src/ext/Dependency/Dependency.wixext.sln | 8 +- src/ext/Dependency/Directory.Build.props | 23 +---- src/ext/Dependency/Directory.Build.targets | 51 --------- src/ext/Dependency/Directory.csproj.props | 13 --- src/ext/Dependency/Directory.csproj.targets | 26 ----- src/ext/Dependency/Directory.vcxproj.props | 93 ----------------- src/ext/Dependency/appveyor.cmd | 19 ---- src/ext/Dependency/appveyor.yml | 42 -------- src/ext/Dependency/ca/dependencyca.vcxproj | 8 +- src/ext/Dependency/dependency.cmd | 24 +++++ src/ext/Dependency/nuget.config | 18 ---- .../WixToolsetTest.Dependency.csproj | 16 +-- src/ext/Dependency/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.Dependency.wixext.csproj | 9 +- .../wixext/WixToolset.Dependency.wixext.nuspec | 10 +- src/ext/Dependency/wixlib/dependency.wixproj | 5 +- src/ext/DifxApp/CSharp.Build.props | 11 -- src/ext/DifxApp/DifxApp.wixext.sln | 6 +- src/ext/DifxApp/Directory.Build.props | 25 +---- src/ext/DifxApp/Directory.Build.targets | 48 --------- src/ext/DifxApp/appveyor.cmd | 14 --- src/ext/DifxApp/appveyor.yml | 40 ------- src/ext/DifxApp/difxapp.cmd | 24 +++++ src/ext/DifxApp/nuget.config | 17 --- .../WixToolsetTest.DifxApp.csproj | 16 +-- src/ext/DifxApp/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.DifxApp.wixext.csproj | 6 +- src/ext/DifxApp/wixlib/difxapp.wixproj | 5 +- src/ext/DirectX/CSharp.Build.props | 11 -- src/ext/DirectX/Cpp.Build.props | 86 --------------- src/ext/DirectX/DirectX.wixext.sln | 8 +- src/ext/DirectX/Directory.Build.props | 25 +---- src/ext/DirectX/Directory.Build.targets | 48 --------- src/ext/DirectX/appveyor.cmd | 14 --- src/ext/DirectX/appveyor.yml | 40 ------- src/ext/DirectX/ca/directxca.vcxproj | 31 +++--- src/ext/DirectX/ca/packages.config | 2 +- src/ext/DirectX/directx.cmd | 24 +++++ src/ext/DirectX/nuget.config | 17 --- .../WixToolsetTest.DirectX.csproj | 16 +-- src/ext/DirectX/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.DirectX.wixext.csproj | 8 +- src/ext/DirectX/wixlib/directx.wixproj | 9 +- src/ext/Firewall/CSharp.Build.props | 11 -- src/ext/Firewall/Cpp.Build.props | 86 --------------- src/ext/Firewall/Directory.Build.props | 25 +---- src/ext/Firewall/Directory.Build.targets | 48 --------- src/ext/Firewall/Firewall.wixext.sln | 8 +- src/ext/Firewall/appveyor.cmd | 14 --- src/ext/Firewall/appveyor.yml | 40 ------- src/ext/Firewall/ca/fwca.vcxproj | 19 ++-- src/ext/Firewall/ca/packages.config | 5 - src/ext/Firewall/firewall.cmd | 24 +++++ src/ext/Firewall/nuget.config | 18 ---- .../WixToolsetTest.Firewall.csproj | 25 ++--- src/ext/Firewall/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.Firewall.wixext.csproj | 8 +- src/ext/Firewall/wixlib/firewall.wixproj | 10 +- src/ext/Http/CSharp.Build.props | 11 -- src/ext/Http/Cpp.Build.props | 86 --------------- src/ext/Http/Directory.Build.props | 25 +---- src/ext/Http/Directory.Build.targets | 48 --------- src/ext/Http/FindLocalWix.props | 8 -- src/ext/Http/Http.wixext.sln | 10 +- src/ext/Http/appveyor.cmd | 14 --- src/ext/Http/appveyor.yml | 40 ------- src/ext/Http/ca/httpca.vcxproj | 26 ++--- src/ext/Http/ca/packages.config | 5 - src/ext/Http/http.cmd | 24 +++++ src/ext/Http/nuget.config | 17 --- .../WixToolsetTest.Http/WixToolsetTest.Http.csproj | 16 +-- src/ext/Http/wix.snk | Bin 596 -> 0 bytes src/ext/Http/wixext/WixToolset.Http.wixext.csproj | 8 +- src/ext/Http/wixlib/http.wixproj | 13 +-- src/ext/Iis/CSharp.Build.props | 11 -- src/ext/Iis/Cpp.Build.props | 86 --------------- src/ext/Iis/Directory.Build.props | 29 ------ src/ext/Iis/Directory.Build.targets | 48 --------- src/ext/Iis/Iis.wixext.sln | 8 +- src/ext/Iis/appveyor.cmd | 14 --- src/ext/Iis/appveyor.yml | 40 ------- src/ext/Iis/ca/iisca.vcxproj | 34 +++--- src/ext/Iis/ca/packages.config | 5 - src/ext/Iis/ca/precomp.h | 2 - src/ext/Iis/ca/scacert.cpp | 6 +- src/ext/Iis/iis.cmd | 24 +++++ src/ext/Iis/nuget.config | 17 --- .../WixToolsetTest.Iis/WixToolsetTest.Iis.csproj | 16 +-- src/ext/Iis/wix.snk | Bin 596 -> 0 bytes src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj | 8 +- src/ext/Iis/wixlib/iis.wixproj | 10 +- src/ext/Msmq/CSharp.Build.props | 11 -- src/ext/Msmq/Cpp.Build.props | 86 --------------- src/ext/Msmq/Directory.Build.props | 29 ------ src/ext/Msmq/Directory.Build.targets | 48 --------- src/ext/Msmq/Msmq.wixext.sln | 8 +- src/ext/Msmq/appveyor.cmd | 14 --- src/ext/Msmq/appveyor.yml | 40 ------- src/ext/Msmq/ca/msmqca.vcxproj | 18 ++-- src/ext/Msmq/ca/packages.config | 5 - src/ext/Msmq/msmq.cmd | 24 +++++ src/ext/Msmq/nuget.config | 17 --- .../WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | 16 +-- src/ext/Msmq/wix.snk | Bin 596 -> 0 bytes src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj | 6 +- src/ext/Msmq/wixlib/msmq.wixproj | 7 +- src/ext/NetFx/Directory.Build.props | 23 +---- src/ext/NetFx/Directory.Build.targets | 51 --------- src/ext/NetFx/Directory.csproj.props | 13 --- src/ext/NetFx/Directory.csproj.targets | 26 ----- src/ext/NetFx/Directory.vcxproj.props | 115 --------------------- src/ext/NetFx/NetFx.wixext.sln | 8 +- src/ext/NetFx/appveyor.cmd | 19 ---- src/ext/NetFx/appveyor.yml | 42 -------- src/ext/NetFx/ca/netfxca.vcxproj | 8 +- src/ext/NetFx/netfx.cmd | 24 +++++ src/ext/NetFx/nuget.config | 19 ---- .../WixToolsetTest.Netfx.csproj | 18 ++-- src/ext/NetFx/wix.snk | Bin 596 -> 0 bytes .../NetFx/wixext/WixToolset.Netfx.wixext.csproj | 9 +- .../NetFx/wixext/WixToolset.Netfx.wixext.nuspec | 10 +- src/ext/NetFx/wixlib/netfx.wixproj | 9 +- src/ext/PowerShell/CSharp.Build.props | 11 -- src/ext/PowerShell/Directory.Build.props | 25 +---- src/ext/PowerShell/Directory.Build.targets | 48 --------- src/ext/PowerShell/FindLocalWix.props | 8 -- src/ext/PowerShell/PowerShell.wixext.sln | 6 +- src/ext/PowerShell/appveyor.cmd | 13 --- src/ext/PowerShell/appveyor.yml | 40 ------- src/ext/PowerShell/nuget.config | 14 --- src/ext/PowerShell/ps.cmd | 24 +++++ .../WixToolsetTest.Powershell.csproj | 21 ++-- src/ext/PowerShell/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.PowerShell.wixext.csproj | 6 +- src/ext/PowerShell/wixlib/powershell.wixproj | 3 +- src/ext/Sql/Directory.Build.props | 23 +---- src/ext/Sql/Directory.Build.targets | 51 --------- src/ext/Sql/Directory.csproj.props | 13 --- src/ext/Sql/Directory.csproj.targets | 26 ----- src/ext/Sql/Directory.vcxproj.props | 111 -------------------- src/ext/Sql/Sql.wixext.sln | 8 +- src/ext/Sql/appveyor.cmd | 19 ---- src/ext/Sql/appveyor.yml | 40 ------- src/ext/Sql/ca/precomp.h | 2 - src/ext/Sql/ca/sqlca.vcxproj | 8 +- src/ext/Sql/nuget.config | 17 --- src/ext/Sql/sql.cmd | 24 +++++ .../WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | 16 +-- src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj | 7 +- src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec | 10 +- src/ext/Sql/wixlib/sql.wixproj | 3 +- src/ext/UI/Directory.Build.props | 23 +---- src/ext/UI/Directory.Build.targets | 51 --------- src/ext/UI/Directory.csproj.props | 13 --- src/ext/UI/Directory.csproj.targets | 26 ----- src/ext/UI/Directory.vcxproj.props | 111 -------------------- src/ext/UI/UI.wixext.sln | 8 +- src/ext/UI/appveyor.cmd | 14 --- src/ext/UI/appveyor.yml | 40 ------- src/ext/UI/ca/uica.vcxproj | 8 +- src/ext/UI/nuget.config | 17 --- .../WixToolsetTest.UI/WixToolsetTest.UI.csproj | 23 ++--- src/ext/UI/ui.cmd | 25 +++++ src/ext/UI/wix.snk | Bin 596 -> 0 bytes src/ext/UI/wixext/WixToolset.UI.wixext.csproj | 12 +-- src/ext/UI/wixext/WixToolset.UI.wixext.nuspec | 6 +- src/ext/UI/wixlib/ui.wixproj | 3 +- src/ext/Util/Directory.Build.props | 23 +---- src/ext/Util/Directory.Build.targets | 51 --------- src/ext/Util/Directory.csproj.props | 13 --- src/ext/Util/Directory.csproj.targets | 26 ----- src/ext/Util/Directory.vcxproj.props | 97 ----------------- src/ext/Util/Util.wixext.sln | 10 +- src/ext/Util/Util.wixext.v3.ncrunchsolution | 6 -- src/ext/Util/appveyor.cmd | 19 ---- src/ext/Util/appveyor.yml | 40 ------- src/ext/Util/be/precomp.h | 2 +- src/ext/Util/be/utilbe.vcxproj | 13 +-- src/ext/Util/ca/precomp.h | 2 +- src/ext/Util/ca/utilca.vcxproj | 8 +- src/ext/Util/nuget.config | 18 ---- .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 16 +-- src/ext/Util/util.cmd | 24 +++++ src/ext/Util/wix.snk | Bin 596 -> 0 bytes src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 9 +- src/ext/Util/wixext/WixToolset.Util.wixext.nuspec | 10 +- src/ext/Util/wixlib/util.wixproj | 4 +- src/ext/VisualStudio/CSharp.Build.props | 11 -- src/ext/VisualStudio/Cpp.Build.props | 86 --------------- src/ext/VisualStudio/Directory.Build.props | 23 +---- src/ext/VisualStudio/Directory.Build.targets | 51 --------- src/ext/VisualStudio/Directory.csproj.props | 13 --- src/ext/VisualStudio/Directory.csproj.targets | 26 ----- src/ext/VisualStudio/Directory.vcxproj.props | 111 -------------------- src/ext/VisualStudio/VisualStudio.wixext.sln | 8 +- src/ext/VisualStudio/appveyor.cmd | 19 ---- src/ext/VisualStudio/appveyor.yml | 42 -------- src/ext/VisualStudio/ca/precomp.h | 1 - src/ext/VisualStudio/ca/vsca.vcxproj | 10 +- src/ext/VisualStudio/nuget.config | 17 --- .../WixToolsetTest.VisualStudio.csproj | 16 +-- src/ext/VisualStudio/vs.cmd | 24 +++++ src/ext/VisualStudio/wix.snk | Bin 596 -> 0 bytes .../wixext/WixToolset.VisualStudio.wixext.csproj | 7 +- .../wixext/WixToolset.VisualStudio.wixext.nuspec | 6 +- .../wixlib/HTML_Help_Registration__RTL_X86.wxs | 4 +- src/ext/VisualStudio/wixlib/vs.wixproj | 4 +- src/ext/ext.cmd | 62 +++++++++++ src/ext/global.json | 8 -- 274 files changed, 1002 insertions(+), 4909 deletions(-) delete mode 100644 src/ext/Bal/CSharp.Build.props delete mode 100644 src/ext/Bal/Cpp.Build.props delete mode 100644 src/ext/Bal/Custom.Build.props delete mode 100644 src/ext/Bal/Directory.Build.targets delete mode 100644 src/ext/Bal/Samples/bafunctions/packages.config delete mode 100644 src/ext/Bal/appveyor.cmd delete mode 100644 src/ext/Bal/appveyor.yml create mode 100644 src/ext/Bal/bal.cmd delete mode 100644 src/ext/Bal/mbahost/packages.config delete mode 100644 src/ext/Bal/nuget.config delete mode 100644 src/ext/Bal/test/examples/TestEngine/packages.config delete mode 100644 src/ext/Bal/wix.snk create mode 100644 src/ext/Bal/wixlib/Mbahost_platform.wxi delete mode 100644 src/ext/Bal/wixstdba/packages.config delete mode 100644 src/ext/ComPlus/CSharp.Build.props delete mode 100644 src/ext/ComPlus/Cpp.Build.props delete mode 100644 src/ext/ComPlus/Directory.Build.targets delete mode 100644 src/ext/ComPlus/Directory.csproj.props delete mode 100644 src/ext/ComPlus/Directory.csproj.targets delete mode 100644 src/ext/ComPlus/Directory.vcxproj.props delete mode 100644 src/ext/ComPlus/Wix.Build.props delete mode 100644 src/ext/ComPlus/appveyor.cmd delete mode 100644 src/ext/ComPlus/appveyor.yml delete mode 100644 src/ext/ComPlus/ca/packages.config create mode 100644 src/ext/ComPlus/complus.cmd delete mode 100644 src/ext/ComPlus/nuget.config delete mode 100644 src/ext/ComPlus/wix.snk delete mode 100644 src/ext/Dependency/Directory.Build.targets delete mode 100644 src/ext/Dependency/Directory.csproj.props delete mode 100644 src/ext/Dependency/Directory.csproj.targets delete mode 100644 src/ext/Dependency/Directory.vcxproj.props delete mode 100644 src/ext/Dependency/appveyor.cmd delete mode 100644 src/ext/Dependency/appveyor.yml create mode 100644 src/ext/Dependency/dependency.cmd delete mode 100644 src/ext/Dependency/nuget.config delete mode 100644 src/ext/Dependency/wix.snk delete mode 100644 src/ext/DifxApp/CSharp.Build.props delete mode 100644 src/ext/DifxApp/Directory.Build.targets delete mode 100644 src/ext/DifxApp/appveyor.cmd delete mode 100644 src/ext/DifxApp/appveyor.yml create mode 100644 src/ext/DifxApp/difxapp.cmd delete mode 100644 src/ext/DifxApp/nuget.config delete mode 100644 src/ext/DifxApp/wix.snk delete mode 100644 src/ext/DirectX/CSharp.Build.props delete mode 100644 src/ext/DirectX/Cpp.Build.props delete mode 100644 src/ext/DirectX/Directory.Build.targets delete mode 100644 src/ext/DirectX/appveyor.cmd delete mode 100644 src/ext/DirectX/appveyor.yml create mode 100644 src/ext/DirectX/directx.cmd delete mode 100644 src/ext/DirectX/nuget.config delete mode 100644 src/ext/DirectX/wix.snk delete mode 100644 src/ext/Firewall/CSharp.Build.props delete mode 100644 src/ext/Firewall/Cpp.Build.props delete mode 100644 src/ext/Firewall/Directory.Build.targets delete mode 100644 src/ext/Firewall/appveyor.cmd delete mode 100644 src/ext/Firewall/appveyor.yml delete mode 100644 src/ext/Firewall/ca/packages.config create mode 100644 src/ext/Firewall/firewall.cmd delete mode 100644 src/ext/Firewall/nuget.config delete mode 100644 src/ext/Firewall/wix.snk delete mode 100644 src/ext/Http/CSharp.Build.props delete mode 100644 src/ext/Http/Cpp.Build.props delete mode 100644 src/ext/Http/Directory.Build.targets delete mode 100644 src/ext/Http/FindLocalWix.props delete mode 100644 src/ext/Http/appveyor.cmd delete mode 100644 src/ext/Http/appveyor.yml delete mode 100644 src/ext/Http/ca/packages.config create mode 100644 src/ext/Http/http.cmd delete mode 100644 src/ext/Http/nuget.config delete mode 100644 src/ext/Http/wix.snk delete mode 100644 src/ext/Iis/CSharp.Build.props delete mode 100644 src/ext/Iis/Cpp.Build.props delete mode 100644 src/ext/Iis/Directory.Build.props delete mode 100644 src/ext/Iis/Directory.Build.targets delete mode 100644 src/ext/Iis/appveyor.cmd delete mode 100644 src/ext/Iis/appveyor.yml delete mode 100644 src/ext/Iis/ca/packages.config create mode 100644 src/ext/Iis/iis.cmd delete mode 100644 src/ext/Iis/nuget.config delete mode 100644 src/ext/Iis/wix.snk delete mode 100644 src/ext/Msmq/CSharp.Build.props delete mode 100644 src/ext/Msmq/Cpp.Build.props delete mode 100644 src/ext/Msmq/Directory.Build.props delete mode 100644 src/ext/Msmq/Directory.Build.targets delete mode 100644 src/ext/Msmq/appveyor.cmd delete mode 100644 src/ext/Msmq/appveyor.yml delete mode 100644 src/ext/Msmq/ca/packages.config create mode 100644 src/ext/Msmq/msmq.cmd delete mode 100644 src/ext/Msmq/nuget.config delete mode 100644 src/ext/Msmq/wix.snk delete mode 100644 src/ext/NetFx/Directory.Build.targets delete mode 100644 src/ext/NetFx/Directory.csproj.props delete mode 100644 src/ext/NetFx/Directory.csproj.targets delete mode 100644 src/ext/NetFx/Directory.vcxproj.props delete mode 100644 src/ext/NetFx/appveyor.cmd delete mode 100644 src/ext/NetFx/appveyor.yml create mode 100644 src/ext/NetFx/netfx.cmd delete mode 100644 src/ext/NetFx/nuget.config delete mode 100644 src/ext/NetFx/wix.snk delete mode 100644 src/ext/PowerShell/CSharp.Build.props delete mode 100644 src/ext/PowerShell/Directory.Build.targets delete mode 100644 src/ext/PowerShell/FindLocalWix.props delete mode 100644 src/ext/PowerShell/appveyor.cmd delete mode 100644 src/ext/PowerShell/appveyor.yml delete mode 100644 src/ext/PowerShell/nuget.config create mode 100644 src/ext/PowerShell/ps.cmd delete mode 100644 src/ext/PowerShell/wix.snk delete mode 100644 src/ext/Sql/Directory.Build.targets delete mode 100644 src/ext/Sql/Directory.csproj.props delete mode 100644 src/ext/Sql/Directory.csproj.targets delete mode 100644 src/ext/Sql/Directory.vcxproj.props delete mode 100644 src/ext/Sql/appveyor.cmd delete mode 100644 src/ext/Sql/appveyor.yml delete mode 100644 src/ext/Sql/nuget.config create mode 100644 src/ext/Sql/sql.cmd delete mode 100644 src/ext/UI/Directory.Build.targets delete mode 100644 src/ext/UI/Directory.csproj.props delete mode 100644 src/ext/UI/Directory.csproj.targets delete mode 100644 src/ext/UI/Directory.vcxproj.props delete mode 100644 src/ext/UI/appveyor.cmd delete mode 100644 src/ext/UI/appveyor.yml delete mode 100644 src/ext/UI/nuget.config create mode 100644 src/ext/UI/ui.cmd delete mode 100644 src/ext/UI/wix.snk delete mode 100644 src/ext/Util/Directory.Build.targets delete mode 100644 src/ext/Util/Directory.csproj.props delete mode 100644 src/ext/Util/Directory.csproj.targets delete mode 100644 src/ext/Util/Directory.vcxproj.props delete mode 100644 src/ext/Util/Util.wixext.v3.ncrunchsolution delete mode 100644 src/ext/Util/appveyor.cmd delete mode 100644 src/ext/Util/appveyor.yml delete mode 100644 src/ext/Util/nuget.config create mode 100644 src/ext/Util/util.cmd delete mode 100644 src/ext/Util/wix.snk delete mode 100644 src/ext/VisualStudio/CSharp.Build.props delete mode 100644 src/ext/VisualStudio/Cpp.Build.props delete mode 100644 src/ext/VisualStudio/Directory.Build.targets delete mode 100644 src/ext/VisualStudio/Directory.csproj.props delete mode 100644 src/ext/VisualStudio/Directory.csproj.targets delete mode 100644 src/ext/VisualStudio/Directory.vcxproj.props delete mode 100644 src/ext/VisualStudio/appveyor.cmd delete mode 100644 src/ext/VisualStudio/appveyor.yml delete mode 100644 src/ext/VisualStudio/nuget.config create mode 100644 src/ext/VisualStudio/vs.cmd delete mode 100644 src/ext/VisualStudio/wix.snk create mode 100644 src/ext/ext.cmd delete mode 100644 src/ext/global.json (limited to 'src/ext') diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln index 0b4c5afa..ddf9ef88 100644 --- a/src/ext/Bal/Bal.wixext.sln +++ b/src/ext/Bal/Bal.wixext.sln @@ -5,37 +5,37 @@ VisualStudioVersion = 16.0.29503.13 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "src\test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "src\test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "src\dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "src\test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "src\test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Bal/CSharp.Build.props b/src/ext/Bal/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Bal/CSharp.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/Bal/Cpp.Build.props b/src/ext/Bal/Cpp.Build.props deleted file mode 100644 index e7bba117..00000000 --- a/src/ext/Bal/Cpp.Build.props +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Bal/Custom.Build.props b/src/ext/Bal/Custom.Build.props deleted file mode 100644 index 66e74d81..00000000 --- a/src/ext/Bal/Custom.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - $(OutputPath)examples\$(ProjectName)\ - - - $(OutDir)examples\$(ProjectName)\ - - diff --git a/src/ext/Bal/Directory.Build.props b/src/ext/Bal/Directory.Build.props index f83cc154..ee59ca34 100644 --- a/src/ext/Bal/Directory.Build.props +++ b/src/ext/Bal/Directory.Build.props @@ -1,29 +1,17 @@ - + - Debug - false - MSB3246 + Bal.wixext + - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ + - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + + $(OutputPath)examples\$(ProjectName)\ + + + $(OutDir)examples\$(ProjectName)\ - - - - - diff --git a/src/ext/Bal/Directory.Build.targets b/src/ext/Bal/Directory.Build.targets deleted file mode 100644 index cb988931..00000000 --- a/src/ext/Bal/Directory.Build.targets +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index 640c812d..6aac6943 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj @@ -1,11 +1,7 @@ - - - - - + Debug @@ -64,18 +60,13 @@ - + + + + + + - - - - 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}. - - - - - - diff --git a/src/ext/Bal/Samples/bafunctions/packages.config b/src/ext/Bal/Samples/bafunctions/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/ext/Bal/Samples/bafunctions/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index f347ca0b..a2f0d8ec 100644 --- a/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -36,9 +36,4 @@ - - - - - diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 3ee0ad1e..0bcd523c 100644 --- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -15,14 +15,15 @@ + - - - + + - + + False @@ -44,11 +45,4 @@ - - - - $(OutputPath) - Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl) - - - \ No newline at end of file + diff --git a/src/ext/Bal/appveyor.cmd b/src/ext/Bal/appveyor.cmd deleted file mode 100644 index f4e9c26e..00000000 --- a/src/ext/Bal/appveyor.cmd +++ /dev/null @@ -1,17 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release - -nuget restore || exit /b - -msbuild -p:Configuration=%_C% -Restore || exit /b -msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b - -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b -dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b - -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/Bal/appveyor.yml b/src/ext/Bal/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Bal/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd new file mode 100644 index 00000000..0bc55dfb --- /dev/null +++ b/src/ext/Bal/bal.cmd @@ -0,0 +1,36 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Building ext\Util %_C% using %_N% + +:: Restore +nuget restore dnchost\packages.config || exit /b +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -p:Configuration=%_C%;Platform=x86 dnchost\dnchost.vcxproj || exit /b +msbuild -p:Configuration=%_C%;Platform=x64 dnchost\dnchost.vcxproj || exit /b +msbuild -p:Configuration=%_C%;Platform=ARM64 dnchost\dnchost.vcxproj || exit /b + +msbuild -p:Configuration=%_C%;Platform=x86 mbahost\mbahost.vcxproj || exit /b +msbuild -p:Configuration=%_C%;Platform=x64 mbahost\mbahost.vcxproj || exit /b +msbuild -p:Configuration=%_C%;Platform=ARM64 mbahost\mbahost.vcxproj || exit /b + +msbuild -p:Configuration=%_C% || exit /b +msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Bal || exit /b +dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index bef3f77e..6bc89427 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj @@ -1,12 +1,6 @@ - - - - - - Debug @@ -33,6 +27,7 @@ x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} DynamicLibrary @@ -41,14 +36,18 @@ dnchost dnchost.def + + $(Platform) x86 - ..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\ + $(BaseOutputPath)obj;$(NetHostPath) shlwapi.lib;$(NetHostPath)libnethost.lib + @@ -56,26 +55,27 @@ Create + + - - - + - + + /LTCG %(AdditionalOptions) + {0D780900-C2FF-4FA2-8CB5-8A19768724C5} @@ -83,24 +83,15 @@ true + + + + + + + + + + - - - - - - - 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/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config index 6c369364..78fa970f 100644 --- a/src/ext/Bal/dnchost/packages.config +++ b/src/ext/Bal/dnchost/packages.config @@ -1,13 +1,6 @@ - + - - - - - - - \ No newline at end of file diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj index 6457b4e0..5edb2562 100644 --- a/src/ext/Bal/mbahost/mbahost.vcxproj +++ b/src/ext/Bal/mbahost/mbahost.vcxproj @@ -1,14 +1,7 @@ - - - - - - - - + Debug @@ -49,6 +42,7 @@ + $(BaseOutputPath)obj shlwapi.lib @@ -65,16 +59,6 @@ - - - - - - - $(BaseOutputPath)obj;%(AdditionalIncludeDirectories) - - - {f2ba1935-70fa-4156-b161-fd03850b4faa} @@ -83,24 +67,14 @@ + + + + + + + + + - - - - - - - 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/ext/Bal/mbahost/packages.config b/src/ext/Bal/mbahost/packages.config deleted file mode 100644 index 071284ac..00000000 --- a/src/ext/Bal/mbahost/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Bal/nuget.config b/src/ext/Bal/nuget.config deleted file mode 100644 index f3277bc4..00000000 --- a/src/ext/Bal/nuget.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index c9ab4219..f00a8eff 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -24,20 +25,12 @@ - - - - - + - - - - - - - + + + diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs index 44538227..9d7fc9db 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs @@ -10,7 +10,7 @@ namespace WixToolsetTest.ManagedHost public class TestEngine { - private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); + private static readonly string TestEngineFile = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe"); public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) { diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 38c8926c..16dbec94 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -4,22 +4,21 @@ netcoreapp3.1 + false + false - + - - - - + - - - + + + diff --git a/src/ext/Bal/test/examples/Directory.Build.props b/src/ext/Bal/test/examples/Directory.Build.props index 3d5870a5..52b931f6 100644 --- a/src/ext/Bal/test/examples/Directory.Build.props +++ b/src/ext/Bal/test/examples/Directory.Build.props @@ -1,6 +1,6 @@ - + diff --git a/src/ext/Bal/test/examples/Directory.Build.targets b/src/ext/Bal/test/examples/Directory.Build.targets index 6dcf402b..35946585 100644 --- a/src/ext/Bal/test/examples/Directory.Build.targets +++ b/src/ext/Bal/test/examples/Directory.Build.targets @@ -1,6 +1,6 @@ - + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index d146845c..d7b06f6a 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -3,7 +3,6 @@ - diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index cb66c138..8069df45 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -12,7 +12,6 @@ - - + - \ No newline at end of file + diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 21079ed1..7e0e4881 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,11 @@ - + - \ No newline at end of file + + + + + + diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index a05e7888..ae0d4cc8 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -9,11 +9,10 @@ - - + - + - \ No newline at end of file + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index d5b543e8..c569442a 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -3,7 +3,6 @@ - diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 9f3f02d9..aad56a3e 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -15,7 +15,6 @@ - - + - \ No newline at end of file + diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 99eb917e..39207d77 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,7 @@ - - - - + + Debug @@ -30,6 +28,7 @@ x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9} Application @@ -39,17 +38,10 @@ Unicode 10.0 + - - - - - - - - - + Create @@ -60,6 +52,7 @@ + @@ -67,17 +60,15 @@ + - + + + + + + + - - - 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/ext/Bal/test/examples/TestEngine/packages.config b/src/ext/Bal/test/examples/TestEngine/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/ext/Bal/test/examples/TestEngine/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index 68d742b0..aa2bdeb2 100644 --- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -3,7 +3,6 @@ - diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 296e5be9..3d63e7b9 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -8,9 +8,17 @@ true - - - + - \ No newline at end of file + + + + 42 + 42 + 42 + 42 + abc123def456 + + + diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj index 08cb7511..5722cfcb 100644 --- a/src/ext/Bal/test/examples/examples.proj +++ b/src/ext/Bal/test/examples/examples.proj @@ -46,5 +46,5 @@ - + \ No newline at end of file diff --git a/src/ext/Bal/wix.snk b/src/ext/Bal/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Bal/wix.snk and /dev/null differ diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj index 00451403..f74baa9a 100644 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj @@ -8,32 +8,20 @@ WiX Toolset Bal Extension WiX Toolset Bal Extension embedded - $(MSBuildThisFileName).nuspec true - Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) + - - - - - - + + - - + + - - - - $(OutputPath)..\ - $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) - - diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec index d9e704ae..c99c803f 100644 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec @@ -15,12 +15,12 @@ - + - + - - - + + + diff --git a/src/ext/Bal/wixlib/BalExtension_arm64.wxs b/src/ext/Bal/wixlib/BalExtension_arm64.wxs index 1b9e11d2..9a1ca60c 100644 --- a/src/ext/Bal/wixlib/BalExtension_arm64.wxs +++ b/src/ext/Bal/wixlib/BalExtension_arm64.wxs @@ -1,7 +1,7 @@  - + diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi index 33122fb2..6978ba99 100644 --- a/src/ext/Bal/wixlib/BalExtension_platform.wxi +++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi @@ -16,20 +16,6 @@ - - - - - - - - - - - - - - diff --git a/src/ext/Bal/wixlib/BalExtension_x64.wxs b/src/ext/Bal/wixlib/BalExtension_x64.wxs index 69a597ae..e5252718 100644 --- a/src/ext/Bal/wixlib/BalExtension_x64.wxs +++ b/src/ext/Bal/wixlib/BalExtension_x64.wxs @@ -4,4 +4,5 @@ + diff --git a/src/ext/Bal/wixlib/BalExtension_x86.wxs b/src/ext/Bal/wixlib/BalExtension_x86.wxs index 3cdd4015..1045160d 100644 --- a/src/ext/Bal/wixlib/BalExtension_x86.wxs +++ b/src/ext/Bal/wixlib/BalExtension_x86.wxs @@ -4,4 +4,5 @@ + diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi new file mode 100644 index 00000000..06d7f1fc --- /dev/null +++ b/src/ext/Bal/wixlib/Mbahost_platform.wxi @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index fdcc7475..147b1a74 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj @@ -1,10 +1,11 @@ - + Library true en-us + @@ -13,24 +14,28 @@ + - - - - - - - - - + + + + + + + + + + - + + + - \ No newline at end of file + diff --git a/src/ext/Bal/wixstdba/packages.config b/src/ext/Bal/wixstdba/packages.config deleted file mode 100644 index 071284ac..00000000 --- a/src/ext/Bal/wixstdba/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index 06b1c8d8..fba3e885 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj @@ -1,14 +1,7 @@ - - - - - - - - + Debug @@ -78,24 +71,14 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" + + + + + + + + + - - - - - - - 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/ext/ComPlus/CSharp.Build.props b/src/ext/ComPlus/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/ComPlus/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/ComPlus/ComPlus.wixext.sln b/src/ext/ComPlus/ComPlus.wixext.sln index 9fab25f2..06302fa2 100644 --- a/src/ext/ComPlus/ComPlus.wixext.sln +++ b/src/ext/ComPlus/ComPlus.wixext.sln @@ -3,16 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "src\ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "complus", "src\wixlib\complus.wixproj", "{E191E61E-E098-4F71-888F-51A79F952022}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "complus", "wixlib\complus.wixproj", "{E191E61E-E098-4F71-888F-51A79F952022}" ProjectSection(ProjectDependencies) = postProject {BDEF51ED-E242-4FA2-801A-01B127DF851A} = {BDEF51ED-E242-4FA2-801A-01B127DF851A} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.ComPlus.wixext", "src\wixext\WixToolset.ComPlus.wixext.csproj", "{1497B777-330B-4CFE-927A-22850CD24D64}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.ComPlus.wixext", "wixext\WixToolset.ComPlus.wixext.csproj", "{1497B777-330B-4CFE-927A-22850CD24D64}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ComPlus", "src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj", "{2FC5F039-EACF-428B-BA87-8CDE1D25E121}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ComPlus", "test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj", "{2FC5F039-EACF-428B-BA87-8CDE1D25E121}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/ComPlus/Cpp.Build.props b/src/ext/ComPlus/Cpp.Build.props deleted file mode 100644 index 9551e76f..00000000 --- a/src/ext/ComPlus/Cpp.Build.props +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - Win32 - x86 - $(Platform) - $(BaseIntermediateOutputPath)$(Configuration)\$(NormalizedPlatform)\ - $(OutputPath)$(NormalizedPlatform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/ComPlus/Directory.Build.props b/src/ext/ComPlus/Directory.Build.props index b3c6287c..9ce65568 100644 --- a/src/ext/ComPlus/Directory.Build.props +++ b/src/ext/ComPlus/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + ComPlus.wixext - - + diff --git a/src/ext/ComPlus/Directory.Build.targets b/src/ext/ComPlus/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/ComPlus/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/ComPlus/Directory.csproj.props b/src/ext/ComPlus/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/ComPlus/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/ComPlus/Directory.csproj.targets b/src/ext/ComPlus/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/ComPlus/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/ComPlus/Directory.vcxproj.props b/src/ext/ComPlus/Directory.vcxproj.props deleted file mode 100644 index 664bc1d8..00000000 --- a/src/ext/ComPlus/Directory.vcxproj.props +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/ComPlus/Wix.Build.props b/src/ext/ComPlus/Wix.Build.props deleted file mode 100644 index a81c9615..00000000 --- a/src/ext/ComPlus/Wix.Build.props +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - $(DefineConstants);CompanyName=$(Company) - $(OutputPath)x86\ - $(OutputPath)x64\ - $(OutputPath)ARM\ - $(OutputPath)ARM64\ - $(OutputPath)Win32\ - - - - - x86 - - - x64 - - - arm - - - arm64 - - - win32 - - - diff --git a/src/ext/ComPlus/appveyor.cmd b/src/ext/ComPlus/appveyor.cmd deleted file mode 100644 index 17900d31..00000000 --- a/src/ext/ComPlus/appveyor.cmd +++ /dev/null @@ -1,22 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -::msbuild -p:Configuration=%_C% -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b -::msbuild -p:Configuration=%_C% -p:Platform=x64 src\ca\complusca.vcxproj || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.ComPlus || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/ComPlus/appveyor.yml b/src/ext/ComPlus/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/ComPlus/appveyor.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget -- path: build\Release\**\*.snupkg - name: snupkg - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index 3a7f6e64..5a8b23cd 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj @@ -85,11 +85,11 @@ - - - - + + + + - \ No newline at end of file + diff --git a/src/ext/ComPlus/ca/packages.config b/src/ext/ComPlus/ca/packages.config deleted file mode 100644 index e3dc0e43..00000000 --- a/src/ext/ComPlus/ca/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ext/ComPlus/complus.cmd b/src/ext/ComPlus/complus.cmd new file mode 100644 index 00000000..bea27765 --- /dev/null +++ b/src/ext/ComPlus/complus.cmd @@ -0,0 +1,22 @@ +@setlocal +@pushd %~dp0 +@set _C=Release +@if /i "%1"=="debug" set _C=Debug + +:: Restore +msbuild -p:Configuration=%_C% -t:Restore || exit /b + +:: Build +::msbuild -p:Configuration=%_C% -p:Platform=Win32 ca\complusca.vcxproj || exit /b +::msbuild -p:Configuration=%_C% -p:Platform=x64 ca\complusca.vcxproj || exit /b + +msbuild -p:Configuration=%_C% test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b + +:: Pack +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.ComPlus.wixext.csproj || exit /b + +@popd +@endlocal \ No newline at end of file diff --git a/src/ext/ComPlus/nuget.config b/src/ext/ComPlus/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/ComPlus/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj index e4a529cb..b4f241c8 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -20,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/ComPlus/wix.snk b/src/ext/ComPlus/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/ComPlus/wix.snk and /dev/null differ diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj index 11271ad3..806977b2 100644 --- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj +++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj @@ -21,12 +21,7 @@ - - - - - - - + + diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec index 3197250b..20712f58 100644 --- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec +++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec @@ -14,11 +14,11 @@ - + - + - - + + diff --git a/src/ext/ComPlus/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj index ef792a13..f0eaebee 100644 --- a/src/ext/ComPlus/wixlib/complus.wixproj +++ b/src/ext/ComPlus/wixlib/complus.wixproj @@ -2,7 +2,6 @@ - Library true @@ -20,7 +19,7 @@ - + + - diff --git a/src/ext/Dependency/Dependency.wixext.sln b/src/ext/Dependency/Dependency.wixext.sln index e771ddf6..7179d48b 100644 --- a/src/ext/Dependency/Dependency.wixext.sln +++ b/src/ext/Dependency/Dependency.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dependencyca", "src\ca\dependencyca.vcxproj", "{B86AF46C-0F90-49CC-923F-A800B088D015}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dependencyca", "ca\dependencyca.vcxproj", "{B86AF46C-0F90-49CC-923F-A800B088D015}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "dependency", "src\wixlib\dependency.wixproj", "{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "dependency", "wixlib\dependency.wixproj", "{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dependency.wixext", "src\wixext\WixToolset.Dependency.wixext.csproj", "{A0B6D3F1-AE5E-423B-BA92-60C9926CA498}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dependency.wixext", "wixext\WixToolset.Dependency.wixext.csproj", "{A0B6D3F1-AE5E-423B-BA92-60C9926CA498}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Dependency", "src\test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj", "{E2AB6AA2-359D-4305-92B0-D90C8F87AF9B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Dependency", "test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj", "{E2AB6AA2-359D-4305-92B0-D90C8F87AF9B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Dependency/Directory.Build.props b/src/ext/Dependency/Directory.Build.props index b3c6287c..88115b61 100644 --- a/src/ext/Dependency/Directory.Build.props +++ b/src/ext/Dependency/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + Dependency.wixext - - + diff --git a/src/ext/Dependency/Directory.Build.targets b/src/ext/Dependency/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/Dependency/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/Dependency/Directory.csproj.props b/src/ext/Dependency/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Dependency/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/Dependency/Directory.csproj.targets b/src/ext/Dependency/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/Dependency/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/Dependency/Directory.vcxproj.props b/src/ext/Dependency/Directory.vcxproj.props deleted file mode 100644 index 664bc1d8..00000000 --- a/src/ext/Dependency/Directory.vcxproj.props +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Dependency/appveyor.cmd b/src/ext/Dependency/appveyor.cmd deleted file mode 100644 index 3450d535..00000000 --- a/src/ext/Dependency/appveyor.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Dependency || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Dependency.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/Dependency/appveyor.yml b/src/ext/Dependency/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/Dependency/appveyor.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget -- path: build\Release\**\*.snupkg - name: snupkg - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj index 2a0760d6..9e31994b 100644 --- a/src/ext/Dependency/ca/dependencyca.vcxproj +++ b/src/ext/Dependency/ca/dependencyca.vcxproj @@ -63,10 +63,10 @@ - - - - + + + + diff --git a/src/ext/Dependency/dependency.cmd b/src/ext/Dependency/dependency.cmd new file mode 100644 index 00000000..74e72798 --- /dev/null +++ b/src/ext/Dependency/dependency.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Dependency.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Dependency.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Dependency/nuget.config b/src/ext/Dependency/nuget.config deleted file mode 100644 index 10ef488d..00000000 --- a/src/ext/Dependency/nuget.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj index 0b80dc83..2e52a062 100644 --- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj +++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj @@ -6,6 +6,7 @@ netcoreapp3.1 embedded false + false @@ -21,19 +22,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Dependency/wix.snk b/src/ext/Dependency/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Dependency/wix.snk and /dev/null differ diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj index b2663231..58375065 100644 --- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj +++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj @@ -21,12 +21,7 @@ - - - - - - - + + diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec +++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec @@ -14,12 +14,12 @@ - + - + - - - + + + diff --git a/src/ext/Dependency/wixlib/dependency.wixproj b/src/ext/Dependency/wixlib/dependency.wixproj index 76e3ecd3..cd30f666 100644 --- a/src/ext/Dependency/wixlib/dependency.wixproj +++ b/src/ext/Dependency/wixlib/dependency.wixproj @@ -2,7 +2,6 @@ - Library true @@ -24,7 +23,7 @@ - + + - diff --git a/src/ext/DifxApp/CSharp.Build.props b/src/ext/DifxApp/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/DifxApp/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/DifxApp/DifxApp.wixext.sln b/src/ext/DifxApp/DifxApp.wixext.sln index 2b891405..d212c773 100644 --- a/src/ext/DifxApp/DifxApp.wixext.sln +++ b/src/ext/DifxApp/DifxApp.wixext.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "difxapp", "src\wixlib\difxapp.wixproj", "{5066EB93-D8F7-4FAE-B687-024D7A81BD95}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "difxapp", "wixlib\difxapp.wixproj", "{5066EB93-D8F7-4FAE-B687-024D7A81BD95}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DifxApp.wixext", "src\wixext\WixToolset.DifxApp.wixext.csproj", "{2256EFD7-E678-4485-818D-986D590068BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DifxApp.wixext", "wixext\WixToolset.DifxApp.wixext.csproj", "{2256EFD7-E678-4485-818D-986D590068BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DifxApp", "src\test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj", "{883D7BA3-1ADC-47AC-95B0-221BB0B7788D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DifxApp", "test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj", "{883D7BA3-1ADC-47AC-95B0-221BB0B7788D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/DifxApp/Directory.Build.props b/src/ext/DifxApp/Directory.Build.props index f83cc154..4697cf0c 100644 --- a/src/ext/DifxApp/Directory.Build.props +++ b/src/ext/DifxApp/Directory.Build.props @@ -1,29 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + DifxApp.wixext - - - - + diff --git a/src/ext/DifxApp/Directory.Build.targets b/src/ext/DifxApp/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/DifxApp/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/DifxApp/appveyor.cmd b/src/ext/DifxApp/appveyor.cmd deleted file mode 100644 index ec37397e..00000000 --- a/src/ext/DifxApp/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.DifxApp || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.DifxApp.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/DifxApp/appveyor.yml b/src/ext/DifxApp/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/DifxApp/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/DifxApp/difxapp.cmd b/src/ext/DifxApp/difxapp.cmd new file mode 100644 index 00000000..754ec455 --- /dev/null +++ b/src/ext/DifxApp/difxapp.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Dependency.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DifxApp.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/DifxApp/nuget.config b/src/ext/DifxApp/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/DifxApp/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj index e205d24a..8428a280 100644 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj +++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -23,19 +24,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/DifxApp/wix.snk b/src/ext/DifxApp/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/DifxApp/wix.snk and /dev/null differ diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj index 50d3debf..4000d4b3 100644 --- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj +++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj @@ -10,19 +10,17 @@ true build + - - - - + diff --git a/src/ext/DifxApp/wixlib/difxapp.wixproj b/src/ext/DifxApp/wixlib/difxapp.wixproj index 2ae9a097..71e88ffc 100644 --- a/src/ext/DifxApp/wixlib/difxapp.wixproj +++ b/src/ext/DifxApp/wixlib/difxapp.wixproj @@ -1,6 +1,5 @@ - Library true @@ -8,7 +7,7 @@ - + + - diff --git a/src/ext/DirectX/CSharp.Build.props b/src/ext/DirectX/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/DirectX/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/DirectX/Cpp.Build.props b/src/ext/DirectX/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/DirectX/Cpp.Build.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/DirectX/DirectX.wixext.sln b/src/ext/DirectX/DirectX.wixext.sln index 2ec5721f..6315616a 100644 --- a/src/ext/DirectX/DirectX.wixext.sln +++ b/src/ext/DirectX/DirectX.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "src\ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "src\wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "src\wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "src\test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/DirectX/Directory.Build.props b/src/ext/DirectX/Directory.Build.props index f83cc154..7820eb98 100644 --- a/src/ext/DirectX/Directory.Build.props +++ b/src/ext/DirectX/Directory.Build.props @@ -1,29 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + DirectX.wixext - - - - + diff --git a/src/ext/DirectX/Directory.Build.targets b/src/ext/DirectX/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/DirectX/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/DirectX/appveyor.cmd b/src/ext/DirectX/appveyor.cmd deleted file mode 100644 index 3a7e2d72..00000000 --- a/src/ext/DirectX/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.DirectX || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.DirectX.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/DirectX/appveyor.yml b/src/ext/DirectX/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/DirectX/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index e772009a..85ce0828 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj @@ -1,9 +1,7 @@ + - - - Debug @@ -30,7 +28,7 @@ ARM64 - + {76542B28-0FFD-47D3-AD6A-D0F20FA875AC} DynamicLibrary @@ -40,14 +38,14 @@ directx.def WiX Toolset DirectX CustomAction - + - + d3d9.lib;msi.lib - + @@ -57,14 +55,13 @@ - + + + + + + + + - - - - 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/ext/DirectX/ca/packages.config b/src/ext/DirectX/ca/packages.config index e3dc0e43..6e8da8cb 100644 --- a/src/ext/DirectX/ca/packages.config +++ b/src/ext/DirectX/ca/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/ext/DirectX/directx.cmd b/src/ext/DirectX/directx.cmd new file mode 100644 index 00000000..1e1baba8 --- /dev/null +++ b/src/ext/DirectX/directx.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo DirectX.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.DirectX || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DirectX.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/DirectX/nuget.config b/src/ext/DirectX/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/DirectX/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index 1722a613..59d58089 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -23,19 +24,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/DirectX/wix.snk b/src/ext/DirectX/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/DirectX/wix.snk and /dev/null differ diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj index a848ff9a..4a5a398e 100644 --- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj +++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj @@ -17,15 +17,11 @@ - - + + - - - - diff --git a/src/ext/DirectX/wixlib/directx.wixproj b/src/ext/DirectX/wixlib/directx.wixproj index bdad24a4..a7281dd0 100644 --- a/src/ext/DirectX/wixlib/directx.wixproj +++ b/src/ext/DirectX/wixlib/directx.wixproj @@ -4,10 +4,13 @@ Library true + - + + - + + - \ No newline at end of file + diff --git a/src/ext/Firewall/CSharp.Build.props b/src/ext/Firewall/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Firewall/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/Firewall/Cpp.Build.props b/src/ext/Firewall/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Firewall/Cpp.Build.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Firewall/Directory.Build.props b/src/ext/Firewall/Directory.Build.props index f83cc154..a2d81c40 100644 --- a/src/ext/Firewall/Directory.Build.props +++ b/src/ext/Firewall/Directory.Build.props @@ -1,29 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + Firewall.wixext - - - - + diff --git a/src/ext/Firewall/Directory.Build.targets b/src/ext/Firewall/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Firewall/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/Firewall/Firewall.wixext.sln b/src/ext/Firewall/Firewall.wixext.sln index 59209c88..02bb8c0f 100644 --- a/src/ext/Firewall/Firewall.wixext.sln +++ b/src/ext/Firewall/Firewall.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2003 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwca", "src\ca\fwca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwca", "ca\fwca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "firewall", "src\wixlib\firewall.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "firewall", "wixlib\firewall.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Firewall.wixext", "src\wixext\WixToolset.Firewall.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Firewall.wixext", "wixext\WixToolset.Firewall.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Firewall", "src\test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Firewall", "test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Firewall/appveyor.cmd b/src/ext/Firewall/appveyor.cmd deleted file mode 100644 index 79c24cc1..00000000 --- a/src/ext/Firewall/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.Firewall || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Firewall.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/Firewall/appveyor.yml b/src/ext/Firewall/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Firewall/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 5e9a1db6..38497d97 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj @@ -2,9 +2,6 @@ - - - Debug @@ -66,16 +63,14 @@ - - + + + + + + - - - 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}. - - - - + diff --git a/src/ext/Firewall/ca/packages.config b/src/ext/Firewall/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Firewall/ca/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ext/Firewall/firewall.cmd b/src/ext/Firewall/firewall.cmd new file mode 100644 index 00000000..a735aa23 --- /dev/null +++ b/src/ext/Firewall/firewall.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Firewall.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Firewall.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Firewall/nuget.config b/src/ext/Firewall/nuget.config deleted file mode 100644 index aaf36562..00000000 --- a/src/ext/Firewall/nuget.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj index d04368c1..c291c7f9 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -12,14 +13,7 @@ - - - - - - - - + @@ -27,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Firewall/wix.snk b/src/ext/Firewall/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Firewall/wix.snk and /dev/null differ diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj index 6704dad2..43164950 100644 --- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj +++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj @@ -17,15 +17,11 @@ - - + + - - - - diff --git a/src/ext/Firewall/wixlib/firewall.wixproj b/src/ext/Firewall/wixlib/firewall.wixproj index 242fa56e..2230ee0d 100644 --- a/src/ext/Firewall/wixlib/firewall.wixproj +++ b/src/ext/Firewall/wixlib/firewall.wixproj @@ -14,13 +14,13 @@ - - - + + + - + + - diff --git a/src/ext/Http/CSharp.Build.props b/src/ext/Http/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Http/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/Http/Cpp.Build.props b/src/ext/Http/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Http/Cpp.Build.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Http/Directory.Build.props b/src/ext/Http/Directory.Build.props index f83cc154..f2a12aa3 100644 --- a/src/ext/Http/Directory.Build.props +++ b/src/ext/Http/Directory.Build.props @@ -1,29 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + Http.wixext - - - - + diff --git a/src/ext/Http/Directory.Build.targets b/src/ext/Http/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Http/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/Http/FindLocalWix.props b/src/ext/Http/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/ext/Http/FindLocalWix.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets - - diff --git a/src/ext/Http/Http.wixext.sln b/src/ext/Http/Http.wixext.sln index fe5c52e9..08e9a833 100644 --- a/src/ext/Http/Http.wixext.sln +++ b/src/ext/Http/Http.wixext.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpca", "src\ca\httpca.vcxproj", "{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpca", "ca\httpca.vcxproj", "{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "http", "src\wixlib\http.wixproj", "{055C1517-4CED-4199-BCDE-A383E5C4EF78}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "http", "wixlib\http.wixproj", "{055C1517-4CED-4199-BCDE-A383E5C4EF78}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Http.wixext", "src\wixext\WixToolset.Http.wixext.csproj", "{AAFC3C7F-D818-4B1D-AF3F-A331EA917F3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Http.wixext", "wixext\WixToolset.Http.wixext.csproj", "{AAFC3C7F-D818-4B1D-AF3F-A331EA917F3F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Http", "src\test\WixToolsetTest.Http\WixToolsetTest.Http.csproj", "{6379EBAA-B5FE-4468-89A3-EF0B5D30B87E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Http", "test\WixToolsetTest.Http\WixToolsetTest.Http.csproj", "{6379EBAA-B5FE-4468-89A3-EF0B5D30B87E}" EndProject -Global +Global` GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 diff --git a/src/ext/Http/appveyor.cmd b/src/ext/Http/appveyor.cmd deleted file mode 100644 index 16a34ff9..00000000 --- a/src/ext/Http/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.Http || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Http.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/Http/appveyor.yml b/src/ext/Http/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Http/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj index fde00ff4..3a17b3b0 100644 --- a/src/ext/Http/ca/httpca.vcxproj +++ b/src/ext/Http/ca/httpca.vcxproj @@ -1,9 +1,7 @@ - - - + Debug @@ -54,19 +52,23 @@ + + + - + + + - + + + + + + - - - 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}. - - - - + diff --git a/src/ext/Http/ca/packages.config b/src/ext/Http/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Http/ca/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ext/Http/http.cmd b/src/ext/Http/http.cmd new file mode 100644 index 00000000..e1994af3 --- /dev/null +++ b/src/ext/Http/http.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Http.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Http.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Http/nuget.config b/src/ext/Http/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Http/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj index 7e60e426..55a6b654 100644 --- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj +++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -20,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Http/wix.snk b/src/ext/Http/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Http/wix.snk and /dev/null differ diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj index 089a51d0..cfa874a0 100644 --- a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj +++ b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj @@ -17,15 +17,11 @@ - - + + - - - - diff --git a/src/ext/Http/wixlib/http.wixproj b/src/ext/Http/wixlib/http.wixproj index 999b7334..651a32ef 100644 --- a/src/ext/Http/wixlib/http.wixproj +++ b/src/ext/Http/wixlib/http.wixproj @@ -13,12 +13,13 @@ - - - + + + - + - + + - \ No newline at end of file + diff --git a/src/ext/Iis/CSharp.Build.props b/src/ext/Iis/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Iis/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/Iis/Cpp.Build.props b/src/ext/Iis/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Iis/Cpp.Build.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Iis/Directory.Build.props b/src/ext/Iis/Directory.Build.props deleted file mode 100644 index f83cc154..00000000 --- a/src/ext/Iis/Directory.Build.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset - - - - - - - diff --git a/src/ext/Iis/Directory.Build.targets b/src/ext/Iis/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Iis/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/Iis/Iis.wixext.sln b/src/ext/Iis/Iis.wixext.sln index 85323fde..d1ab149e 100644 --- a/src/ext/Iis/Iis.wixext.sln +++ b/src/ext/Iis/Iis.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "src\ca\iisca.vcxproj", "{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "ca\iisca.vcxproj", "{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "iis", "src\wixlib\iis.wixproj", "{92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "iis", "wixlib\iis.wixproj", "{92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Iis.wixext", "src\wixext\WixToolset.Iis.wixext.csproj", "{612029FB-B5D4-4D7E-B794-A0E202BFE493}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Iis.wixext", "wixext\WixToolset.Iis.wixext.csproj", "{612029FB-B5D4-4D7E-B794-A0E202BFE493}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Iis", "src\test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj", "{E62712D7-31A1-49E4-B1F4-0084FAD14193}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Iis", "test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj", "{E62712D7-31A1-49E4-B1F4-0084FAD14193}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Iis/appveyor.cmd b/src/ext/Iis/appveyor.cmd deleted file mode 100644 index af993a8f..00000000 --- a/src/ext/Iis/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.Iis || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Iis.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/Iis/appveyor.yml b/src/ext/Iis/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Iis/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj index eb1174be..d99ef4ab 100644 --- a/src/ext/Iis/ca/iisca.vcxproj +++ b/src/ext/Iis/ca/iisca.vcxproj @@ -1,7 +1,7 @@ - + @@ -40,14 +40,14 @@ iisca.def WiX Toolset Iis CustomAction - + - + crypt32.lib;msi.lib;Ws2_32.lib - + Create @@ -91,6 +91,9 @@ + + + @@ -131,17 +134,18 @@ - + + + - + + + + + + + + - - - - 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/ext/Iis/ca/packages.config b/src/ext/Iis/ca/packages.config deleted file mode 100644 index e3dc0e43..00000000 --- a/src/ext/Iis/ca/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ext/Iis/ca/precomp.h b/src/ext/Iis/ca/precomp.h index 85ee0890..106ab884 100644 --- a/src/ext/Iis/ca/precomp.h +++ b/src/ext/Iis/ca/precomp.h @@ -17,8 +17,6 @@ #include #include // IIS 7 config -#define MAXUINT USHRT_MAX - #include "wcautil.h" #include "wcawow64.h" #include "wcawrapquery.h" diff --git a/src/ext/Iis/ca/scacert.cpp b/src/ext/Iis/ca/scacert.cpp index 5eae905a..0bb87f9f 100644 --- a/src/ext/Iis/ca/scacert.cpp +++ b/src/ext/Iis/ca/scacert.cpp @@ -552,8 +552,12 @@ static HRESULT ReadCertificateFile( // If we have a PFX blob, get the first certificate out of the PFX and use that instead of the PFX. if (dwContentType & CERT_QUERY_CONTENT_PFX) { - hr = FileRead(&pbData, &cbData, wzPath); + SIZE_T size = 0; + + hr = FileRead(&pbData, &size, wzPath); ExitOnFailure(hr, "Failed to read PFX file: %ls", wzPath); + + cbData = (DWORD)size; } else { diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd new file mode 100644 index 00000000..02f9f393 --- /dev/null +++ b/src/ext/Iis/iis.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Iis.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Iis.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Iis/nuget.config b/src/ext/Iis/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Iis/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj index 49ed89bc..dc895894 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj +++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -23,19 +24,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Iis/wix.snk b/src/ext/Iis/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Iis/wix.snk and /dev/null differ diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj index 81d41e77..a8b94783 100644 --- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj +++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj @@ -17,15 +17,11 @@ - - + + - - - - diff --git a/src/ext/Iis/wixlib/iis.wixproj b/src/ext/Iis/wixlib/iis.wixproj index 89f9608f..6ac4aea1 100644 --- a/src/ext/Iis/wixlib/iis.wixproj +++ b/src/ext/Iis/wixlib/iis.wixproj @@ -14,13 +14,13 @@ - - - + + + - + + - diff --git a/src/ext/Msmq/CSharp.Build.props b/src/ext/Msmq/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Msmq/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/Msmq/Cpp.Build.props b/src/ext/Msmq/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Msmq/Cpp.Build.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Msmq/Directory.Build.props b/src/ext/Msmq/Directory.Build.props deleted file mode 100644 index f83cc154..00000000 --- a/src/ext/Msmq/Directory.Build.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset - - - - - - - diff --git a/src/ext/Msmq/Directory.Build.targets b/src/ext/Msmq/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Msmq/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/Msmq/Msmq.wixext.sln b/src/ext/Msmq/Msmq.wixext.sln index e3ebed6d..d6728547 100644 --- a/src/ext/Msmq/Msmq.wixext.sln +++ b/src/ext/Msmq/Msmq.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28010.2016 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msmqca", "src\ca\msmqca.vcxproj", "{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msmqca", "ca\msmqca.vcxproj", "{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "msmq", "src\wixlib\msmq.wixproj", "{42493058-5FC8-4F85-9884-FF3190E084B6}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "msmq", "wixlib\msmq.wixproj", "{42493058-5FC8-4F85-9884-FF3190E084B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Msmq.wixext", "src\wixext\WixToolset.Msmq.wixext.csproj", "{B990D81B-9F60-4EEE-B31D-B5D1EAA799EE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Msmq.wixext", "wixext\WixToolset.Msmq.wixext.csproj", "{B990D81B-9F60-4EEE-B31D-B5D1EAA799EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Msmq", "src\test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj", "{B63DA068-338F-473B-9097-FC4E64830A2A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Msmq", "test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj", "{B63DA068-338F-473B-9097-FC4E64830A2A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Msmq/appveyor.cmd b/src/ext/Msmq/appveyor.cmd deleted file mode 100644 index f493b577..00000000 --- a/src/ext/Msmq/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.Msmq || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Msmq.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/Msmq/appveyor.yml b/src/ext/Msmq/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Msmq/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj index c4cb3323..473624b4 100644 --- a/src/ext/Msmq/ca/msmqca.vcxproj +++ b/src/ext/Msmq/ca/msmqca.vcxproj @@ -2,7 +2,7 @@ - + @@ -55,17 +55,15 @@ - - + + + + + + - - - 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}. - - - - + diff --git a/src/ext/Msmq/ca/packages.config b/src/ext/Msmq/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Msmq/ca/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ext/Msmq/msmq.cmd b/src/ext/Msmq/msmq.cmd new file mode 100644 index 00000000..1a60dad3 --- /dev/null +++ b/src/ext/Msmq/msmq.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Msmq.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Msmq || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Msmq.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Msmq/nuget.config b/src/ext/Msmq/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Msmq/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index 7f74e043..726186b6 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -23,19 +24,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Msmq/wix.snk b/src/ext/Msmq/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Msmq/wix.snk and /dev/null differ diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj index 4bd6a3f5..7467aaf2 100644 --- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj +++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj @@ -17,14 +17,10 @@ - + - - - - diff --git a/src/ext/Msmq/wixlib/msmq.wixproj b/src/ext/Msmq/wixlib/msmq.wixproj index ccccbf49..15111cb5 100644 --- a/src/ext/Msmq/wixlib/msmq.wixproj +++ b/src/ext/Msmq/wixlib/msmq.wixproj @@ -1,6 +1,5 @@ - Library true @@ -8,11 +7,11 @@ - + - + + - diff --git a/src/ext/NetFx/Directory.Build.props b/src/ext/NetFx/Directory.Build.props index b3c6287c..754111fd 100644 --- a/src/ext/NetFx/Directory.Build.props +++ b/src/ext/NetFx/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + NetFx.wixext - - + diff --git a/src/ext/NetFx/Directory.Build.targets b/src/ext/NetFx/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/NetFx/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/NetFx/Directory.csproj.props b/src/ext/NetFx/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/NetFx/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/NetFx/Directory.csproj.targets b/src/ext/NetFx/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/NetFx/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/NetFx/Directory.vcxproj.props b/src/ext/NetFx/Directory.vcxproj.props deleted file mode 100644 index 47c2c143..00000000 --- a/src/ext/NetFx/Directory.vcxproj.props +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - - MultiThreadedDebugDll - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - - diff --git a/src/ext/NetFx/NetFx.wixext.sln b/src/ext/NetFx/NetFx.wixext.sln index e830aeea..8316ac91 100644 --- a/src/ext/NetFx/NetFx.wixext.sln +++ b/src/ext/NetFx/NetFx.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "src\ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "src\wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "src\wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/NetFx/appveyor.cmd b/src/ext/NetFx/appveyor.cmd deleted file mode 100644 index d7e705f0..00000000 --- a/src/ext/NetFx/appveyor.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Netfx || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Netfx.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/NetFx/appveyor.yml b/src/ext/NetFx/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/NetFx/appveyor.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget -- path: build\Release\**\*.snupkg - name: snupkg - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index 5e25b683..34332180 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.vcxproj @@ -63,10 +63,10 @@ - - - - + + + + diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd new file mode 100644 index 00000000..d5e0989b --- /dev/null +++ b/src/ext/NetFx/netfx.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Building ext\NetFx %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/NetFx/nuget.config b/src/ext/NetFx/nuget.config deleted file mode 100644 index 7f258709..00000000 --- a/src/ext/NetFx/nuget.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index 1c41d176..24f807eb 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -6,6 +6,7 @@ netcoreapp3.1 embedded false + false @@ -17,21 +18,14 @@ - - - - - + + - - - - - - - + + + diff --git a/src/ext/NetFx/wix.snk b/src/ext/NetFx/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/NetFx/wix.snk and /dev/null differ diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj index 7c1d55c1..0e89f172 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj @@ -20,12 +20,7 @@ - - - - - - - + + diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec @@ -14,12 +14,12 @@ - + - + - - - + + + diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index 937ed0d4..ad7d028c 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj @@ -2,7 +2,6 @@ - Library true @@ -21,12 +20,12 @@ - - + + - + + - diff --git a/src/ext/PowerShell/CSharp.Build.props b/src/ext/PowerShell/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/PowerShell/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/PowerShell/Directory.Build.props b/src/ext/PowerShell/Directory.Build.props index f83cc154..af932016 100644 --- a/src/ext/PowerShell/Directory.Build.props +++ b/src/ext/PowerShell/Directory.Build.props @@ -1,29 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + PowerShell.wixext - - - - + diff --git a/src/ext/PowerShell/Directory.Build.targets b/src/ext/PowerShell/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/PowerShell/Directory.Build.targets +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - diff --git a/src/ext/PowerShell/FindLocalWix.props b/src/ext/PowerShell/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/ext/PowerShell/FindLocalWix.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets - - diff --git a/src/ext/PowerShell/PowerShell.wixext.sln b/src/ext/PowerShell/PowerShell.wixext.sln index a036d47e..e1e6a7d8 100644 --- a/src/ext/PowerShell/PowerShell.wixext.sln +++ b/src/ext/PowerShell/PowerShell.wixext.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "powershell", "src\wixlib\powershell.wixproj", "{9D4CCDFC-840C-4D4E-A9B0-3D6015480645}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "powershell", "wixlib\powershell.wixproj", "{9D4CCDFC-840C-4D4E-A9B0-3D6015480645}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.PowerShell.wixext", "src\wixext\WixToolset.PowerShell.wixext.csproj", "{6F1482DF-1598-4D88-BDAA-B9D0E0242139}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.PowerShell.wixext", "wixext\WixToolset.PowerShell.wixext.csproj", "{6F1482DF-1598-4D88-BDAA-B9D0E0242139}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.PowerShell", "src\test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj", "{BFD10109-F4F3-4530-BE3B-802342D411F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.PowerShell", "test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj", "{BFD10109-F4F3-4530-BE3B-802342D411F7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/PowerShell/appveyor.cmd b/src/ext/PowerShell/appveyor.cmd deleted file mode 100644 index 27d33a5d..00000000 --- a/src/ext/PowerShell/appveyor.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore - -msbuild -p:Configuration=Release -t:Restore - -msbuild -p:Configuration=Release src\test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.PowerShell.wixext.csproj - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/PowerShell/appveyor.yml b/src/ext/PowerShell/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/PowerShell/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/PowerShell/nuget.config b/src/ext/PowerShell/nuget.config deleted file mode 100644 index f4f0704e..00000000 --- a/src/ext/PowerShell/nuget.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd new file mode 100644 index 00000000..66eed1db --- /dev/null +++ b/src/ext/PowerShell/ps.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo PowerShell.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.PowerShell.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 69645fb7..4a33631a 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -12,10 +13,7 @@ - - - - + @@ -23,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/PowerShell/wix.snk b/src/ext/PowerShell/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/PowerShell/wix.snk and /dev/null differ diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj index a89a574c..4d5403d7 100644 --- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj +++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj @@ -17,14 +17,10 @@ - + - - - - diff --git a/src/ext/PowerShell/wixlib/powershell.wixproj b/src/ext/PowerShell/wixlib/powershell.wixproj index 6d6b413b..f35c819a 100644 --- a/src/ext/PowerShell/wixlib/powershell.wixproj +++ b/src/ext/PowerShell/wixlib/powershell.wixproj @@ -6,6 +6,7 @@ - + + diff --git a/src/ext/Sql/Directory.Build.props b/src/ext/Sql/Directory.Build.props index b3c6287c..5ef36871 100644 --- a/src/ext/Sql/Directory.Build.props +++ b/src/ext/Sql/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + Sql.wixext - - + diff --git a/src/ext/Sql/Directory.Build.targets b/src/ext/Sql/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/Sql/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/Sql/Directory.csproj.props b/src/ext/Sql/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Sql/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/Sql/Directory.csproj.targets b/src/ext/Sql/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/Sql/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/Sql/Directory.vcxproj.props b/src/ext/Sql/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/ext/Sql/Directory.vcxproj.props +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - - MultiThreadedDebugDll - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - - diff --git a/src/ext/Sql/Sql.wixext.sln b/src/ext/Sql/Sql.wixext.sln index cfa9ad4f..bb280d36 100644 --- a/src/ext/Sql/Sql.wixext.sln +++ b/src/ext/Sql/Sql.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlca", "src\ca\sqlca.vcxproj", "{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlca", "ca\sqlca.vcxproj", "{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "sql", "src\wixlib\sql.wixproj", "{9ACF1A20-D801-45CC-A463-F9D13E506AA3}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "sql", "wixlib\sql.wixproj", "{9ACF1A20-D801-45CC-A463-F9D13E506AA3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sql.wixext", "src\wixext\WixToolset.Sql.wixext.csproj", "{0E05519A-0045-4AEC-BD0C-D9205FF1468F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sql.wixext", "wixext\WixToolset.Sql.wixext.csproj", "{0E05519A-0045-4AEC-BD0C-D9205FF1468F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sql", "src\test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj", "{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sql", "test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj", "{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Sql/appveyor.cmd b/src/ext/Sql/appveyor.cmd deleted file mode 100644 index f21449d2..00000000 --- a/src/ext/Sql/appveyor.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Sql || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Sql.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/Sql/appveyor.yml b/src/ext/Sql/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Sql/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Sql/ca/precomp.h b/src/ext/Sql/ca/precomp.h index 266d543c..e92abdc5 100644 --- a/src/ext/Sql/ca/precomp.h +++ b/src/ext/Sql/ca/precomp.h @@ -11,8 +11,6 @@ #include -#define MAXUINT USHRT_MAX - #include "wcautil.h" #include "fileutil.h" #include "memutil.h" diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index 18becc5f..01eae1fb 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.vcxproj @@ -73,10 +73,10 @@ - - - - + + + + diff --git a/src/ext/Sql/nuget.config b/src/ext/Sql/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Sql/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Sql/sql.cmd b/src/ext/Sql/sql.cmd new file mode 100644 index 00000000..0e66816d --- /dev/null +++ b/src/ext/Sql/sql.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Sql.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Sql.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index bbf3041d..6044a81d 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj +++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -20,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj index 5a1ebeb0..15cc2820 100644 --- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj +++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj @@ -20,11 +20,6 @@ - - - - - - + diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec +++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec @@ -14,12 +14,12 @@ - + - + - - - + + + diff --git a/src/ext/Sql/wixlib/sql.wixproj b/src/ext/Sql/wixlib/sql.wixproj index ac994e6b..8d92f5ad 100644 --- a/src/ext/Sql/wixlib/sql.wixproj +++ b/src/ext/Sql/wixlib/sql.wixproj @@ -19,6 +19,7 @@ - + + diff --git a/src/ext/UI/Directory.Build.props b/src/ext/UI/Directory.Build.props index b3c6287c..ee3d2302 100644 --- a/src/ext/UI/Directory.Build.props +++ b/src/ext/UI/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + UI.wixext - - + diff --git a/src/ext/UI/Directory.Build.targets b/src/ext/UI/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/UI/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/UI/Directory.csproj.props b/src/ext/UI/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/UI/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/UI/Directory.csproj.targets b/src/ext/UI/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/UI/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/UI/Directory.vcxproj.props b/src/ext/UI/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/ext/UI/Directory.vcxproj.props +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - - MultiThreadedDebugDll - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - - diff --git a/src/ext/UI/UI.wixext.sln b/src/ext/UI/UI.wixext.sln index bab6232e..c71826dc 100644 --- a/src/ext/UI/UI.wixext.sln +++ b/src/ext/UI/UI.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30320.27 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "src\ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ui", "src\wixlib\ui.wixproj", "{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ui", "wixlib\ui.wixproj", "{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.UI.wixext", "src\wixext\WixToolset.UI.wixext.csproj", "{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.UI.wixext", "wixext\WixToolset.UI.wixext.csproj", "{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.UI", "src\test\WixToolsetTest.UI\WixToolsetTest.UI.csproj", "{A37CC793-F659-4C77-A01C-D183023B6880}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.UI", "test\WixToolsetTest.UI\WixToolsetTest.UI.csproj", "{A37CC793-F659-4C77-A01C-D183023B6880}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/UI/appveyor.cmd b/src/ext/UI/appveyor.cmd deleted file mode 100644 index 2c727278..00000000 --- a/src/ext/UI/appveyor.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -msbuild -p:Configuration=Release -t:Restore || exit /b - -msbuild -p:Configuration=Release src\test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b -dotnet test -c Release --no-build src\test\WixToolsetTest.UI || exit /b - -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.UI.wixext.csproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/ext/UI/appveyor.yml b/src/ext/UI/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/UI/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj index 5ded1266..1b145192 100644 --- a/src/ext/UI/ca/uica.vcxproj +++ b/src/ext/UI/ca/uica.vcxproj @@ -48,10 +48,10 @@ - - - - + + + + diff --git a/src/ext/UI/nuget.config b/src/ext/UI/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/UI/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj index a61676dd..61407107 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj +++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -12,12 +13,7 @@ - - - - - - + @@ -25,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd new file mode 100644 index 00000000..1b5a3a6c --- /dev/null +++ b/src/ext/UI/ui.cmd @@ -0,0 +1,25 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Building ext\UI %_C% + +:: Restore +@REM nuget restore || exit /b +msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/UI/wix.snk b/src/ext/UI/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/UI/wix.snk and /dev/null differ diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj index 67c949b2..043cb259 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj @@ -15,16 +15,12 @@ - - - - - - + + - - + + diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec index 51c9708e..504d4458 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec @@ -14,10 +14,10 @@ - + - + - + diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj index e9529283..2b335f01 100644 --- a/src/ext/UI/wixlib/ui.wixproj +++ b/src/ext/UI/wixlib/ui.wixproj @@ -31,6 +31,7 @@ - + + diff --git a/src/ext/Util/Directory.Build.props b/src/ext/Util/Directory.Build.props index b3c6287c..9c9383c6 100644 --- a/src/ext/Util/Directory.Build.props +++ b/src/ext/Util/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + Util.wixext - - + diff --git a/src/ext/Util/Directory.Build.targets b/src/ext/Util/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/Util/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/Util/Directory.csproj.props b/src/ext/Util/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Util/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/Util/Directory.csproj.targets b/src/ext/Util/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/Util/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/Util/Directory.vcxproj.props b/src/ext/Util/Directory.vcxproj.props deleted file mode 100644 index 11778f41..00000000 --- a/src/ext/Util/Directory.vcxproj.props +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln index 050fd8b3..259a8164 100644 --- a/src/ext/Util/Util.wixext.sln +++ b/src/ext/Util/Util.wixext.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "src\wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/Util/Util.wixext.v3.ncrunchsolution b/src/ext/Util/Util.wixext.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/ext/Util/Util.wixext.v3.ncrunchsolution +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/src/ext/Util/appveyor.cmd b/src/ext/Util/appveyor.cmd deleted file mode 100644 index 8322ffae..00000000 --- a/src/ext/Util/appveyor.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/Util/appveyor.yml b/src/ext/Util/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Util/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h index 76d24c7b..bb36b3f3 100644 --- a/src/ext/Util/be/precomp.h +++ b/src/ext/Util/be/precomp.h @@ -15,7 +15,7 @@ #include -#define MAXUINT USHRT_MAX +// #define MAXUINT USHRT_MAX #include #include diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index 683b376a..5e5a44d3 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj @@ -1,7 +1,7 @@ - + Debug @@ -69,11 +69,12 @@ - - - - - + + + + + + diff --git a/src/ext/Util/ca/precomp.h b/src/ext/Util/ca/precomp.h index c5d6afe5..98e61e1a 100644 --- a/src/ext/Util/ca/precomp.h +++ b/src/ext/Util/ca/precomp.h @@ -22,7 +22,7 @@ #include #include -#define MAXUINT USHRT_MAX +// #define MAXUINT USHRT_MAX #include "wcautil.h" #include "wcawow64.h" diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj index 7b64db95..f090181b 100644 --- a/src/ext/Util/ca/utilca.vcxproj +++ b/src/ext/Util/ca/utilca.vcxproj @@ -96,10 +96,10 @@ - - - - + + + + diff --git a/src/ext/Util/nuget.config b/src/ext/Util/nuget.config deleted file mode 100644 index 8d711148..00000000 --- a/src/ext/Util/nuget.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index e77ecbed..bb1fc1f7 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -20,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd new file mode 100644 index 00000000..1b189086 --- /dev/null +++ b/src/ext/Util/util.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Building ext\Util %_C% using %_N% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b + +:: Pack +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Util/wix.snk b/src/ext/Util/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/Util/wix.snk and /dev/null differ diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj index 10fc569e..434accf3 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj @@ -20,12 +20,7 @@ - - - - - - - + + diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec @@ -14,12 +14,12 @@ - + - + - - - + + + diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj index 99dede7d..56a16ff4 100644 --- a/src/ext/Util/wixlib/util.wixproj +++ b/src/ext/Util/wixlib/util.wixproj @@ -1,6 +1,5 @@ - Library true @@ -22,6 +21,7 @@ - + + diff --git a/src/ext/VisualStudio/CSharp.Build.props b/src/ext/VisualStudio/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/VisualStudio/CSharp.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - - diff --git a/src/ext/VisualStudio/Cpp.Build.props b/src/ext/VisualStudio/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/VisualStudio/Cpp.Build.props +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/ext/VisualStudio/Directory.Build.props b/src/ext/VisualStudio/Directory.Build.props index b3c6287c..ed281d79 100644 --- a/src/ext/VisualStudio/Directory.Build.props +++ b/src/ext/VisualStudio/Directory.Build.props @@ -1,27 +1,10 @@ - + - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + VisualStudio.wixext - - + diff --git a/src/ext/VisualStudio/Directory.Build.targets b/src/ext/VisualStudio/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/VisualStudio/Directory.Build.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/ext/VisualStudio/Directory.csproj.props b/src/ext/VisualStudio/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/VisualStudio/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/ext/VisualStudio/Directory.csproj.targets b/src/ext/VisualStudio/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/VisualStudio/Directory.csproj.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(OutputPath)..\ - $(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - $(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - diff --git a/src/ext/VisualStudio/Directory.vcxproj.props b/src/ext/VisualStudio/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/ext/VisualStudio/Directory.vcxproj.props +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - win-x86;win-x64;win-arm64 - native,Version=v0.0 - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - - MultiThreadedDebugDll - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - - diff --git a/src/ext/VisualStudio/VisualStudio.wixext.sln b/src/ext/VisualStudio/VisualStudio.wixext.sln index 9d6a8356..5f30fbcf 100644 --- a/src/ext/VisualStudio/VisualStudio.wixext.sln +++ b/src/ext/VisualStudio/VisualStudio.wixext.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "src\ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "vs", "src\wixlib\vs.wixproj", "{14345C9D-8AF8-435A-BB1B-E067CE7EB321}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "vs", "wixlib\vs.wixproj", "{14345C9D-8AF8-435A-BB1B-E067CE7EB321}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.VisualStudio.wixext", "src\wixext\WixToolset.VisualStudio.wixext.csproj", "{61BFD377-9DE1-48B4-8687-560DF68D6F3B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.VisualStudio.wixext", "wixext\WixToolset.VisualStudio.wixext.csproj", "{61BFD377-9DE1-48B4-8687-560DF68D6F3B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.VisualStudio", "src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj", "{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.VisualStudio", "test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj", "{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ext/VisualStudio/appveyor.cmd b/src/ext/VisualStudio/appveyor.cmd deleted file mode 100644 index 847809c3..00000000 --- a/src/ext/VisualStudio/appveyor.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -:: Restore -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -:: Build -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b - -:: Test -dotnet test -c %_C% --no-build src\test\WixToolsetTest.VisualStudio || exit /b - -:: Pack -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.VisualStudio.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/VisualStudio/appveyor.yml b/src/ext/VisualStudio/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/VisualStudio/appveyor.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget -- path: build\Release\**\*.snupkg - name: snupkg - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/VisualStudio/ca/precomp.h b/src/ext/VisualStudio/ca/precomp.h index 3edad7ed..a08ca180 100644 --- a/src/ext/VisualStudio/ca/precomp.h +++ b/src/ext/VisualStudio/ca/precomp.h @@ -5,7 +5,6 @@ #include #include -#define MAXUINT USHRT_MAX #include #include "wcautil.h" diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index f4fbcc46..8d6a3500 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj @@ -47,11 +47,11 @@ - - - - - + + + + + diff --git a/src/ext/VisualStudio/nuget.config b/src/ext/VisualStudio/nuget.config deleted file mode 100644 index 6fb99260..00000000 --- a/src/ext/VisualStudio/nuget.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj index 9172569f..fcd78ef5 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj @@ -5,6 +5,7 @@ netcoreapp3.1 false + false @@ -20,19 +21,12 @@ - - - - + - - - - - - - + + + diff --git a/src/ext/VisualStudio/vs.cmd b/src/ext/VisualStudio/vs.cmd new file mode 100644 index 00000000..21a9768b --- /dev/null +++ b/src/ext/VisualStudio/vs.cmd @@ -0,0 +1,24 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo VisualStudio.wixext build %_C% + +:: Restore +msbuild -t:Restore -p:Configuration=%_C% || exit /b + +:: Build +msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b + +:: Test +dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b + +:: Pack +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.VisualStudio.wixext.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/VisualStudio/wix.snk b/src/ext/VisualStudio/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/ext/VisualStudio/wix.snk and /dev/null differ diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj index 20282720..8a3a8e6f 100644 --- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj +++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj @@ -20,11 +20,6 @@ - - - - - - + diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec index 51c9708e..504d4458 100644 --- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec +++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec @@ -14,10 +14,10 @@ - + - + - + diff --git a/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs b/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs index 2bdb810a..881da279 100644 --- a/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs +++ b/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs @@ -2,14 +2,14 @@ - + - + diff --git a/src/ext/VisualStudio/wixlib/vs.wixproj b/src/ext/VisualStudio/wixlib/vs.wixproj index db3e2cff..f2852683 100644 --- a/src/ext/VisualStudio/wixlib/vs.wixproj +++ b/src/ext/VisualStudio/wixlib/vs.wixproj @@ -2,7 +2,6 @@ - Library true @@ -14,6 +13,7 @@ - + + diff --git a/src/ext/ext.cmd b/src/ext/ext.cmd new file mode 100644 index 00000000..49120180 --- /dev/null +++ b/src/ext/ext.cmd @@ -0,0 +1,62 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo ext build %_C% + +:: These extensions must be built in this order. + +:: Util +call Util\util.cmd %_C% || exit /b + +:: Bal +call Bal\bal.cmd %_C% || exit /b + +:: NetFx +call NetFx\netfx.cmd %_C% || exit /b + + +:: The rest of the extensions are in alphabetical order. + +:: ComPlus +call ComPlus\complus.cmd %_C% || exit /b + +:: Dependency +call Dependency\dependency.cmd %_C% || exit /b + +:: DifxApp +call DifxApp\difxapp.cmd %_C% || exit /b + +:: DirectX +call DirectX\directx.cmd %_C% || exit /b + +:: Firewall +call Firewall\firewall.cmd %_C% || exit /b + +:: Http +call Http\http.cmd %_C% || exit /b + +:: Iis +call Iis\iis.cmd %_C% || exit /b + +:: Msmq +call Msmq\msmq.cmd %_C% || exit /b + +:: PowerShell +call PowerShell\ps.cmd %_C% || exit /b + +:: Sql +call Sql\sql.cmd %_C% || exit /b + +:: UI +call UI\ui.cmd %_C% || exit /b + +:: VisualStudio +call VisualStudio\vs.cmd %_C% || exit /b + +@popd +@endlocal diff --git a/src/ext/global.json b/src/ext/global.json deleted file mode 100644 index 697f5687..00000000 --- a/src/ext/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0213" - }, - "sdk": { - "allowPrerelease": false - } -} -- cgit v1.2.3-55-g6feb