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