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 +++------ 45 files changed, 228 insertions(+), 577 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 (limited to 'src/ext/Bal') 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 + -- cgit v1.2.3-55-g6feb