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/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 +- 16 files changed, 49 insertions(+), 316 deletions(-) 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 (limited to 'src/ext/Dependency') 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 @@ - + + - -- cgit v1.2.3-55-g6feb