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/libs/dutil/Directory.Build.props | 26 ----- src/libs/dutil/Directory.Build.targets | 73 ------------- src/libs/dutil/Directory.csproj.props | 13 --- src/libs/dutil/Directory.vcxproj.props | 115 --------------------- src/libs/dutil/NativeMultiTargeting.Build.props | 10 -- src/libs/dutil/WixToolset.DUtil/dutil.nuspec | 29 +++--- src/libs/dutil/WixToolset.DUtil/dutil.vcxproj | 7 +- src/libs/dutil/WixToolset.DUtil/packages.config | 7 -- src/libs/dutil/appveyor.cmd | 24 ----- src/libs/dutil/appveyor.yml | 44 -------- src/libs/dutil/dutil.sln | 4 +- src/libs/dutil/nuget.config | 8 -- .../dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj | 31 ++---- src/libs/dutil/test/DUtilUnitTest/packages.config | 13 --- 14 files changed, 27 insertions(+), 377 deletions(-) delete mode 100644 src/libs/dutil/Directory.Build.props delete mode 100644 src/libs/dutil/Directory.Build.targets delete mode 100644 src/libs/dutil/Directory.csproj.props delete mode 100644 src/libs/dutil/Directory.vcxproj.props delete mode 100644 src/libs/dutil/NativeMultiTargeting.Build.props delete mode 100644 src/libs/dutil/WixToolset.DUtil/packages.config delete mode 100644 src/libs/dutil/appveyor.cmd delete mode 100644 src/libs/dutil/appveyor.yml delete mode 100644 src/libs/dutil/nuget.config delete mode 100644 src/libs/dutil/test/DUtilUnitTest/packages.config (limited to 'src/libs/dutil') diff --git a/src/libs/dutil/Directory.Build.props b/src/libs/dutil/Directory.Build.props deleted file mode 100644 index fb34d54e..00000000 --- a/src/libs/dutil/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - Debug - false - - $(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/libs/dutil/Directory.Build.targets b/src/libs/dutil/Directory.Build.targets deleted file mode 100644 index 44701fb6..00000000 --- a/src/libs/dutil/Directory.Build.targets +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - $(BaseOutputPath)obj\.tools - $(SigningToolFolder)\SignClient.exe - $(SigningToolFolder)\empty-filelist.txt - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - - $(PrivateRepositoryUrl.Replace('.git','')) - - $(MSBuildProjectName).nuspec - $(MSBuildProjectDirectory) - $(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)" - $(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl) - true - snupkg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libs/dutil/Directory.csproj.props b/src/libs/dutil/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/libs/dutil/Directory.csproj.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/libs/dutil/Directory.vcxproj.props b/src/libs/dutil/Directory.vcxproj.props deleted file mode 100644 index 9ea7071b..00000000 --- a/src/libs/dutil/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/libs/dutil/NativeMultiTargeting.Build.props b/src/libs/dutil/NativeMultiTargeting.Build.props deleted file mode 100644 index 1ff46559..00000000 --- a/src/libs/dutil/NativeMultiTargeting.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - $(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\ - $(OutputPath)$(PlatformToolset)\$(PlatformTarget)\ - - diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec index 3499a2d5..fef60013 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec +++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec @@ -1,27 +1,28 @@ - + $id$ $version$ + $title$ + $description$ $authors$ - $authors$ MS-RL - https://github.com/wixtoolset/dutil false - $description$ $copyright$ + $projectUrl$ + - - - - - - - - - - + + + + + + + + + + diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj index 4e341438..a02e638a 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj +++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj @@ -43,7 +43,7 @@ - + @@ -170,13 +170,12 @@ - - - + + diff --git a/src/libs/dutil/WixToolset.DUtil/packages.config b/src/libs/dutil/WixToolset.DUtil/packages.config deleted file mode 100644 index 5bbcd994..00000000 --- a/src/libs/dutil/WixToolset.DUtil/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/libs/dutil/appveyor.cmd b/src/libs/dutil/appveyor.cmd deleted file mode 100644 index 85476b8e..00000000 --- a/src/libs/dutil/appveyor.cmd +++ /dev/null @@ -1,24 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release -@if /i "%1"=="debug" set _C=Debug - -nuget restore || exit /b - -msbuild -t:Test -p:Configuration=%_C% src\test\DUtilUnitTest || exit /b - -msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b -msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b - -msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b -msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b -msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b - -msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b -msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b -msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b - -msbuild -p:Configuration=%_C% -t:PackNative src\dutil\dutil.vcxproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/libs/dutil/appveyor.yml b/src/libs/dutil/appveyor.yml deleted file mode 100644 index f602d07c..00000000 --- a/src/libs/dutil/appveyor.yml +++ /dev/null @@ -1,44 +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 - -test: off - -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\**\*.msi - name: msi - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/libs/dutil/dutil.sln b/src/libs/dutil/dutil.sln index 433f42a5..f6bfcc97 100644 --- a/src/libs/dutil/dutil.sln +++ b/src/libs/dutil/dutil.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30711.63 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "src\dutil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "WixToolset.DUtil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "src\test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/libs/dutil/nuget.config b/src/libs/dutil/nuget.config deleted file mode 100644 index d5ef8952..00000000 --- a/src/libs/dutil/nuget.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj index 18410e5d..cd8d16c4 100644 --- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj +++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj @@ -2,7 +2,8 @@ - + + Debug @@ -29,7 +30,7 @@ - ..\..\dutil\inc + ..\..\WixToolset.DUtil\inc rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib @@ -63,7 +64,6 @@ - @@ -72,28 +72,11 @@ - - - - ..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll - - - ..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll - - - - - + {1244E671-F108-4334-BA52-8A7517F26ECD} + - - - - 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/libs/dutil/test/DUtilUnitTest/packages.config b/src/libs/dutil/test/DUtilUnitTest/packages.config deleted file mode 100644 index a4fef2bf..00000000 --- a/src/libs/dutil/test/DUtilUnitTest/packages.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3-55-g6feb