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/internal/CSharp.Build.props | 13 --- src/internal/Cpp.Build.props | 104 --------------------- src/internal/Directory.Build.props | 25 +---- src/internal/Directory.Build.targets | 56 ----------- .../MessagesToMessages/MessagesToMessages.csproj | 1 + src/internal/README.md | 5 +- .../SetBuildNumber/Directory.Packages.props.pp | 86 +++++++++++++++++ src/internal/SetBuildNumber/SetBuildNumber.proj | 96 +++++++++++++++++++ src/internal/SetBuildNumber/global.json.pp | 8 ++ .../TablesAndTuples/TablesAndTuples.csproj | 1 + .../WixBuildTools.MsgGen.csproj | 3 +- .../WixBuildTools.TestSupport.Native.nuspec | 16 ++-- .../WixBuildTools.TestSupport.Native.vcxproj | 47 +++------- .../build/WixBuildTools.TestSupport.Native.props | 19 +--- .../build/WixBuildTools.TestSupport.Native.targets | 44 +++++++-- .../packages.config | 11 +-- .../WixBuildTools.TestSupport.csproj | 17 ++-- .../WixBuildTools.XsdGen.csproj | 4 +- src/internal/WixBuildTools.sln | 81 ---------------- src/internal/WixBuildTools.v3.ncrunchsolution | 6 -- src/internal/appveyor.cmd | 13 --- src/internal/appveyor.yml | 42 --------- src/internal/internal.cmd | 23 +++++ src/internal/internal.sln | 55 +++++++++++ src/internal/nuget.config | 8 -- 25 files changed, 351 insertions(+), 433 deletions(-) delete mode 100644 src/internal/CSharp.Build.props delete mode 100644 src/internal/Cpp.Build.props delete mode 100644 src/internal/Directory.Build.targets create mode 100644 src/internal/SetBuildNumber/Directory.Packages.props.pp create mode 100644 src/internal/SetBuildNumber/SetBuildNumber.proj create mode 100644 src/internal/SetBuildNumber/global.json.pp delete mode 100644 src/internal/WixBuildTools.sln delete mode 100644 src/internal/WixBuildTools.v3.ncrunchsolution delete mode 100644 src/internal/appveyor.cmd delete mode 100644 src/internal/appveyor.yml create mode 100644 src/internal/internal.cmd create mode 100644 src/internal/internal.sln delete mode 100644 src/internal/nuget.config (limited to 'src/internal') diff --git a/src/internal/CSharp.Build.props b/src/internal/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/internal/CSharp.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/internal/Cpp.Build.props b/src/internal/Cpp.Build.props deleted file mode 100644 index 44a042c7..00000000 --- a/src/internal/Cpp.Build.props +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - - $([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 - - - - - - MultiThreadedDebugDll - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - - diff --git a/src/internal/Directory.Build.props b/src/internal/Directory.Build.props index f83cc154..70d374e0 100644 --- a/src/internal/Directory.Build.props +++ b/src/internal/Directory.Build.props @@ -1,29 +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 + internal - - - - + diff --git a/src/internal/Directory.Build.targets b/src/internal/Directory.Build.targets deleted file mode 100644 index cb988931..00000000 --- a/src/internal/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/internal/MessagesToMessages/MessagesToMessages.csproj b/src/internal/MessagesToMessages/MessagesToMessages.csproj index ce1697ae..98b874f6 100644 --- a/src/internal/MessagesToMessages/MessagesToMessages.csproj +++ b/src/internal/MessagesToMessages/MessagesToMessages.csproj @@ -3,6 +3,7 @@ Exe netcoreapp2.0 + false diff --git a/src/internal/README.md b/src/internal/README.md index da42c09e..e99dcc3b 100644 --- a/src/internal/README.md +++ b/src/internal/README.md @@ -1,2 +1,3 @@ -# WixBuildTools -Internal shared props/targets/tools used to build the WiX Toolset +# Internal + +Internal tooling used to build the WiX Toolset. diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp new file mode 100644 index 00000000..1117eab7 --- /dev/null +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -0,0 +1,86 @@ + + + -build.1 + -build.2 + -build.1 + -build.2 + -build.2 + -build.3 + -build.2 + -build.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj new file mode 100644 index 00000000..e0993cd3 --- /dev/null +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj @@ -0,0 +1,96 @@ + + + + + + netcoreapp3.1 + + false + + + https://api.nuget.org/v3/index.json + true + + + + + __SetPropertiesFromGit; + SetAppVeyorBuildNumber; + SetGlobalJson; + SetDirectoryPackagesProps; + + + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\global.json)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\Directory.Packages.props)) + + + + + $(InformationalVersion) + PR#$(APPVEYOR_PULL_REQUEST_NUMBER)-$(AppVeyorBuildNumber) + + + + + + + + + + + /* DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\global.json.pp */ + $([System.IO.File]::ReadAllText(global.json.pp)) + $(GlobalJsonText.Replace('{apiversion}', $(ApiVersion))) + $(GlobalJsonText.Replace('{fileversion}', $(FileVersion))) + $(GlobalJsonText.Replace('{fullversion}', $(InformationalVersion))) + $(GlobalJsonText.Replace('{informationalversion}', $(InformationalVersion))) + $(GlobalJsonText.Replace('{height}', $(GitCommits))) + $(GlobalJsonText.Replace('{packageversion}', $(PackageVersion))) + $(GlobalJsonText.Replace('{version}', $(Version))) + + + + + + + + + + + <!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\Directory.Packages.props.pp --> + $([System.IO.File]::ReadAllText(Directory.Packages.props.pp)) + $(CentralPackageVersionsText.Replace('{apiversion}', $(ApiVersion))) + $(CentralPackageVersionsText.Replace('{fileversion}', $(FileVersion))) + $(CentralPackageVersionsText.Replace('{fullversion}', $(InformationalVersion))) + $(CentralPackageVersionsText.Replace('{informationalversion}', $(InformationalVersion))) + $(CentralPackageVersionsText.Replace('{height}', $(GitCommits))) + $(CentralPackageVersionsText.Replace('{packageversion}', $(PackageVersion))) + $(CentralPackageVersionsText.Replace('{version}', $(Version))) + + + + + + + + + + + + + + + diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp new file mode 100644 index 00000000..a1d6244a --- /dev/null +++ b/src/internal/SetBuildNumber/global.json.pp @@ -0,0 +1,8 @@ +{ + "msbuild-sdks": { + "WixToolset.Sdk": "{packageversion}" + }, + "sdk": { + "allowPrerelease": false + } +} diff --git a/src/internal/TablesAndTuples/TablesAndTuples.csproj b/src/internal/TablesAndTuples/TablesAndTuples.csproj index ce1697ae..98b874f6 100644 --- a/src/internal/TablesAndTuples/TablesAndTuples.csproj +++ b/src/internal/TablesAndTuples/TablesAndTuples.csproj @@ -3,6 +3,7 @@ Exe netcoreapp2.0 + false diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj index 954ffa59..421f0713 100644 --- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj +++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj @@ -8,6 +8,7 @@ embedded true CS0618 + false @@ -21,7 +22,7 @@ - + diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec index 2852826b..1dcdb78c 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec +++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec @@ -3,13 +3,13 @@ $id$ $version$ + $title$ + $description$ $authors$ - $authors$ MS-RL - https://github.com/wixtoolset/WixBuildTools false - $description$ $copyright$ + $projectUrl$ @@ -17,10 +17,10 @@ - - - - - + + + + + diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj index aefdb4fb..d030f67b 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj +++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj @@ -1,12 +1,9 @@ - - - - + Debug @@ -17,6 +14,7 @@ Win32 + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} {95BABD97-FBDB-453A-AF8A-FA031A07B599} @@ -26,21 +24,17 @@ Unicode true WixBuildTools C++/CLI Test Support + false + - - - - - - + - - - - + + + @@ -49,37 +43,22 @@ 4564;4691 + + - - - - + {6C57EF2C-979A-4106-A9E5-FE342810619A} + - - - - - - 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/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props index 4a7a0035..e6b5997f 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props @@ -1,10 +1,9 @@ - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), version.json)) + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore)) @@ -12,18 +11,4 @@ v142 v4.7.2 - - - $(RepoRootDir)\packages\xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll - - - $(RepoRootDir)\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - $(RepoRootDir)\packages\xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll - - - $(RepoRootDir)\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - \ No newline at end of file + diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets index 77e72e95..cd710cca 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets @@ -1,19 +1,49 @@ + + + + + - - + + + + $(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.dll + + + $(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.Native.dll + + + + + + $(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll + + + $(RootPackagesFolder)xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll + + + $(RootPackagesFolder)xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll + + + $(RootPackagesFolder)xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll + + + + 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/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config index 917d7a63..2423502c 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/packages.config +++ b/src/internal/WixBuildTools.TestSupport.Native/packages.config @@ -1,12 +1,11 @@  - - - - - + @@ -14,4 +13,4 @@ - \ No newline at end of file + diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj index f59e5eca..01166782 100644 --- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj +++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj @@ -10,22 +10,17 @@ true true CS1591 + false - - - - + + + + - - + - - - - - diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj index 2e3a0382..65a65bd0 100644 --- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj +++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj @@ -10,6 +10,7 @@ embedded true CS0618 + false @@ -22,7 +23,6 @@ - + - diff --git a/src/internal/WixBuildTools.sln b/src/internal/WixBuildTools.sln deleted file mode 100644 index 689832fb..00000000 --- a/src/internal/WixBuildTools.sln +++ /dev/null @@ -1,81 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2003 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.XsdGen", "src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj", "{E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.MsgGen", "src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj", "{DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{6C57EF2C-979A-4106-A9E5-FE342810619A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6660B22-092F-4BC5-A303-E6F696C31E1B}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.ActiveCfg = Debug|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.Build.0 = Debug|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.ActiveCfg = Debug|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.Build.0 = Debug|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.Build.0 = Release|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.ActiveCfg = Release|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.Build.0 = Release|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.ActiveCfg = Release|Any CPU - {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.Build.0 = Release|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.ActiveCfg = Debug|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.Build.0 = Debug|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.Build.0 = Debug|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.Build.0 = Release|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.ActiveCfg = Release|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.Build.0 = Release|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.ActiveCfg = Release|Any CPU - {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.Build.0 = Release|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.ActiveCfg = Debug|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.Build.0 = Debug|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.ActiveCfg = Debug|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.Build.0 = Debug|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.Build.0 = Release|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.ActiveCfg = Release|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.Build.0 = Release|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.ActiveCfg = Release|Any CPU - {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.Build.0 = Release|Any CPU - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.Build.0 = Debug|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.Build.0 = Release|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32 - {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {83E9E075-B440-471A-9C37-9D84BA0AE3E0} - EndGlobalSection -EndGlobal diff --git a/src/internal/WixBuildTools.v3.ncrunchsolution b/src/internal/WixBuildTools.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/internal/WixBuildTools.v3.ncrunchsolution +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/src/internal/appveyor.cmd b/src/internal/appveyor.cmd deleted file mode 100644 index 9fa5e330..00000000 --- a/src/internal/appveyor.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@setlocal -@pushd %~dp0 - -nuget restore || exit /b - -dotnet pack -c Release src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b -dotnet pack -c Release src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b -dotnet pack -c Release src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b - -msbuild -p:Configuration=Release -t:PackNativeNuget src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b - -@popd -@endlocal \ No newline at end of file diff --git a/src/internal/appveyor.yml b/src/internal/appveyor.yml deleted file mode 100644 index 522e5af3..00000000 --- a/src/internal/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\**\*.msi - name: msi - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd new file mode 100644 index 00000000..bd0e4738 --- /dev/null +++ b/src/internal/internal.cmd @@ -0,0 +1,23 @@ +@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 internal %_C% + +:: internal + +nuget restore || exit /b + +:: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b +:: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b + +msbuild -t:Pack -p:Configuration=%_C% WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b + +msbuild -t:Build -p:Configuration=%_C% WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b + +@popd +@endlocal diff --git a/src/internal/internal.sln b/src/internal/internal.sln new file mode 100644 index 00000000..ae53cc53 --- /dev/null +++ b/src/internal/internal.sln @@ -0,0 +1,55 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.6.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|ARM64.Build.0 = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x64.Build.0 = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x86.Build.0 = Debug|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|Any CPU.Build.0 = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|ARM64.ActiveCfg = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|ARM64.Build.0 = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x64.ActiveCfg = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x64.Build.0 = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.ActiveCfg = Release|Any CPU + {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.Build.0 = Release|Any CPU + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CCBE86BA-6E38-4A97-8AAD-AA2972350544} + EndGlobalSection +EndGlobal diff --git a/src/internal/nuget.config b/src/internal/nuget.config deleted file mode 100644 index fcbac27a..00000000 --- a/src/internal/nuget.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file -- cgit v1.2.3-55-g6feb