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/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 +- 20 files changed, 59 insertions(+), 332 deletions(-) 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 (limited to 'src/ext/Util') 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 @@ - + + -- cgit v1.2.3-55-g6feb