aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-26 11:31:05 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 11:14:01 -0700
commitdf016066100df955d5ff98811e113fb2b1bd4b8a (patch)
treea27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/internal
parentdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff)
downloadwix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip
Implement integrated build process
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/CSharp.Build.props13
-rw-r--r--src/internal/Cpp.Build.props104
-rw-r--r--src/internal/Directory.Build.props25
-rw-r--r--src/internal/Directory.Build.targets56
-rw-r--r--src/internal/MessagesToMessages/MessagesToMessages.csproj1
-rw-r--r--src/internal/README.md5
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp86
-rw-r--r--src/internal/SetBuildNumber/SetBuildNumber.proj96
-rw-r--r--src/internal/SetBuildNumber/global.json.pp8
-rw-r--r--src/internal/TablesAndTuples/TablesAndTuples.csproj1
-rw-r--r--src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj3
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec16
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj47
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props19
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets44
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/packages.config11
-rw-r--r--src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj17
-rw-r--r--src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj4
-rw-r--r--src/internal/WixBuildTools.sln81
-rw-r--r--src/internal/WixBuildTools.v3.ncrunchsolution6
-rw-r--r--src/internal/appveyor.cmd13
-rw-r--r--src/internal/appveyor.yml42
-rw-r--r--src/internal/internal.cmd23
-rw-r--r--src/internal/internal.sln55
-rw-r--r--src/internal/nuget.config8
25 files changed, 351 insertions, 433 deletions
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 @@
1<!-- 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. -->
2<!--
3 Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
4 then update all of the repos.
5-->
6<Project>
7 <PropertyGroup>
8 <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9 <SignAssembly>true</SignAssembly>
10 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12 </PropertyGroup>
13</Project>
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. -->
3
4<Project>
5 <PropertyGroup>
6 <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8 <OutDir>$(OutputPath)$(Platform)\</OutDir>
9 </PropertyGroup>
10
11 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
12 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
13 </PropertyGroup>
14
15 <ItemDefinitionGroup>
16 <ClCompile>
17 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
18 <WarningLevel>Level4</WarningLevel>
19 <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
20 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
21 <PrecompiledHeader>Use</PrecompiledHeader>
22 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
23 <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
24 <TreatWarningAsError>true</TreatWarningAsError>
25 <ExceptionHandling>false</ExceptionHandling>
26 <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
27 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
28 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
29 </ClCompile>
30 <ResourceCompile>
31 <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
32 <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
33 </ResourceCompile>
34 <Lib>
35 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
36 </Lib>
37 <Link>
38 <SubSystem>$(ProjectSubSystem)</SubSystem>
39 <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
40 <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
41 <GenerateDebugInformation>true</GenerateDebugInformation>
42 <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
43 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
44 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
45 </Link>
46 </ItemDefinitionGroup>
47
48 <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
49 <ClCompile>
50 <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
51 </ClCompile>
52 </ItemDefinitionGroup>
53 <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
54 <ClCompile>
55 <CallingConvention>CDecl</CallingConvention>
56 </ClCompile>
57 </ItemDefinitionGroup>
58 <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
59 <ClCompile>
60 <DebugInformationFormat>OldStyle</DebugInformationFormat>
61 <OmitDefaultLibName>true</OmitDefaultLibName>
62 <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
63 </ClCompile>
64 </ItemDefinitionGroup>
65 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
66 <ClCompile>
67 <Optimization>Disabled</Optimization>
68 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
69 <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
71 </ClCompile>
72 </ItemDefinitionGroup>
73 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
74 <ClCompile>
75 <BasicRuntimeChecks></BasicRuntimeChecks>
76 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
77 </ClCompile>
78 </ItemDefinitionGroup>
79 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
80 <ClCompile>
81 <Optimization>MinSpace</Optimization>
82 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83 <FunctionLevelLinking>true</FunctionLevelLinking>
84 <IntrinsicFunctions>true</IntrinsicFunctions>
85 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
86 </ClCompile>
87 <Link>
88 <EnableCOMDATFolding>true</EnableCOMDATFolding>
89 <OptimizeReferences>true</OptimizeReferences>
90 </Link>
91 </ItemDefinitionGroup>
92 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
93 <ClCompile>
94 <BasicRuntimeChecks></BasicRuntimeChecks>
95 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
96 </ClCompile>
97 </ItemDefinitionGroup>
98 <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
99 <Link>
100 <KeyFile>$(LinkKeyFile)</KeyFile>
101 <DelaySign>$(LinkDelaySign)</DelaySign>
102 </Link>
103 </ItemDefinitionGroup>
104</Project>
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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3<!-- 3
4 Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props
5 then update all of the repos.
6-->
7<Project> 4<Project>
8 <PropertyGroup> 5 <PropertyGroup>
9 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <SegmentName>internal</SegmentName>
10 <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11 <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>
12
13 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
14 <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
15 <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
16 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
17
18 <Authors>WiX Toolset Team</Authors>
19 <Company>WiX Toolset</Company>
20 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
21 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
22 <Product>WiX Toolset</Product>
23 </PropertyGroup> 7 </PropertyGroup>
24 8
25 <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> 9 <Import Project="..\Directory.Build.props" />
26 <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
27 <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
28 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
29</Project> 10</Project>
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. -->
3<!--
4 Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets
5 then update all of the repos.
6-->
7<!--
8 Replace PackageReferences with ProjectReferences when the projects can be found in .sln.
9 See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10-->
11<Project>
12 <PropertyGroup>
13 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15 </PropertyGroup>
16
17 <PropertyGroup>
18 <ReplacePackageReferences>true</ReplacePackageReferences>
19 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
20 <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
21 </PropertyGroup>
22
23 <Choose>
24 <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')">
25
26 <PropertyGroup>
27 <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent>
28 <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir>
29 <RegexPattern>(?&lt;="[PackageName]", ")(.*)(?=", ")</RegexPattern>
30 </PropertyGroup>
31
32 <ItemGroup>
33 <!-- Keep the identity of the PackageReference -->
34 <SmartPackageReference Include="@(PackageReference)">
35 <PackageName>%(Identity)</PackageName>
36 <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution>
37 </SmartPackageReference>
38
39 <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function -->
40 <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))">
41 <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern>
42 <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath>
43 </PackageInSolution>
44
45 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
46
47 <!-- Remove the package references that are now referenced as projects -->
48 <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
49 </ItemGroup>
50
51 </When>
52 </Choose>
53
54 <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
55 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
56</Project>
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 @@
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Exe</OutputType> 4 <OutputType>Exe</OutputType>
5 <TargetFramework>netcoreapp2.0</TargetFramework> 5 <TargetFramework>netcoreapp2.0</TargetFramework>
6 <SignOutput>false</SignOutput>
6 </PropertyGroup> 7 </PropertyGroup>
7 8
8</Project> 9</Project>
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 @@
1# WixBuildTools 1# Internal
2Internal shared props/targets/tools used to build the WiX Toolset 2
3Internal 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 @@
1<Project>
2 <PropertyGroup>
3 <DtfBuildSuffix>-build.1</DtfBuildSuffix>
4 <InternalBuildSuffix>-build.2</InternalBuildSuffix>
5 <LibsBuildSuffix>-build.1</LibsBuildSuffix>
6 <ApiBuildSuffix>-build.2</ApiBuildSuffix>
7 <BurnBuildSuffix>-build.2</BurnBuildSuffix>
8 <WixBuildSuffix>-build.3</WixBuildSuffix>
9 <BalBuildSuffix>-build.2</BalBuildSuffix>
10 <UtilBuildSuffix>-build.1</UtilBuildSuffix>
11 </PropertyGroup>
12
13 <ItemGroup>
14 <PackageVersion Include="WixToolset.Dtf.Compression" Version="{packageversion}" />
15 <PackageVersion Include="WixToolset.Dtf.Compression.Cab" Version="{packageversion}" />
16 <PackageVersion Include="WixToolset.Dtf.Resources" Version="{packageversion}" />
17 <PackageVersion Include="WixToolset.Dtf.WindowsInstaller" Version="{packageversion}" />
18
19 <PackageVersion Include="WixBuildTools.TestSupport" Version="{packageversion}" />
20 <PackageVersion Include="WixBuildTools.TestSupport.Native" Version="{packageversion}" />
21
22 <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" />
23 <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" />
24
25 <PackageVersion Include="WixToolset.BootstrapperCore.Native" Version="{packageversion}" />
26 <PackageVersion Include="WixToolset.BalUtil" Version="{packageversion}" />
27 <PackageVersion Include="WixToolset.BextUtil" Version="{packageversion}" />
28 <PackageVersion Include="WixToolset.Mba.Core" Version="{packageversion}" />
29
30 <PackageVersion Include="WixToolset.Data" Version="{packageversion}" />
31 <PackageVersion Include="WixToolset.Extensibility" Version="{packageversion}" />
32
33 <PackageVersion Include="WixToolset.Burn" Version="{packageversion}" />
34
35 <PackageVersion Include="WixToolset.Core" Version="{packageversion}" />
36 <PackageVersion Include="WixToolset.Core.Burn" Version="{packageversion}" />
37 <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" />
38 <PackageVersion Include="WixToolset.Core.TestPackage" Version="{packageversion}" />
39
40 <PackageVersion Include="WixToolset.Bal.wixext" Version="{packageversion}" />
41 <PackageVersion Include="WixToolset.Dependency.wixext" Version="{packageversion}" />
42 <PackageVersion Include="WixToolset.NetFx.wixext" Version="{packageversion}" />
43 <PackageVersion Include="WixToolset.Util.wixext" Version="{packageversion}" />
44 </ItemGroup>
45
46 <ItemGroup>
47 <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
48 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" />
49 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.6.0" />
50 <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
51 <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" />
52 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
53 <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" />
54
55 <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
56 <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
57 <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" />
58 <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
59
60 <PackageVersion Include="NuGet.Credentials" Version="5.6.0" />
61 <PackageVersion Include="NuGet.Protocol" Version="5.6.0" />
62 <PackageVersion Include="NuGet.Versioning" Version="5.6.0" />
63 </ItemGroup>
64
65
66
67 <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" >
68 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/>
69 </ItemGroup>
70
71 <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netcoreapp3.1'">
72 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
73 </ItemGroup>
74
75 <ItemGroup>
76 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
77 <PackageVersion Include="GitInfo" Version="2.1.2" />
78 </ItemGroup>
79
80 <ItemGroup>
81 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
82 <PackageVersion Include="xunit" Version="2.4.1" />
83 <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
84 <PackageVersion Include="xunit.assert" Version="2.4.1" />
85 </ItemGroup>
86</Project>
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. -->
3
4<Project Sdk="Microsoft.Build.NoTargets/3.0.4">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <!-- Disable central package version management since this project will write the central package version management file -->
8 <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
9
10 <!-- Explicitly set the restore sources because this project may run before the build\artifacts folder has been created -->
11 <RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources>
12 <RestoreIgnoreFailedSources>true</RestoreIgnoreFailedSources>
13 </PropertyGroup>
14
15 <PropertyGroup>
16 <SetBuildNumbersDependsOn>
17 __SetPropertiesFromGit;
18 SetAppVeyorBuildNumber;
19 SetGlobalJson;
20 SetDirectoryPackagesProps;
21 </SetBuildNumbersDependsOn>
22
23 <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\global.json))</GlobalJsonPath>
24 <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\Directory.Packages.props))</CentralPackageVersionsPath>
25 </PropertyGroup>
26
27 <Target Name="SetAppVeyorBuildNumber"
28 Condition=" '$(APPVEYOR)'=='True' ">
29 <PropertyGroup>
30 <AppVeyorBuildNumber>$(InformationalVersion)</AppVeyorBuildNumber>
31 <AppVeyorBuildNumber Condition=" 'APPVEYOR_PULL_REQUEST_NUMBER'!='' ">PR#$(APPVEYOR_PULL_REQUEST_NUMBER)-$(AppVeyorBuildNumber)</AppVeyorBuildNumber>
32 </PropertyGroup>
33
34 <Message Importance="high" Text=" $(AppVeyorBuildNumber)" />
35
36 <Exec Command='appveyor UpdateBuild -Version "$(AppVeyorBuildNumber)"' />
37 </Target>
38
39
40 <Target Name="SetGlobalJson"
41 Inputs="global.json.pp"
42 Outputs="$(GlobalJsonPath)">
43 <PropertyGroup>
44 <GlobaJsonTextHeader>/* DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\global.json.pp */</GlobaJsonTextHeader>
45 <GlobalJsonText>$([System.IO.File]::ReadAllText(global.json.pp))</GlobalJsonText>
46 <GlobalJsonText>$(GlobalJsonText.Replace('{apiversion}', $(ApiVersion)))</GlobalJsonText>
47 <GlobalJsonText>$(GlobalJsonText.Replace('{fileversion}', $(FileVersion)))</GlobalJsonText>
48 <GlobalJsonText>$(GlobalJsonText.Replace('{fullversion}', $(InformationalVersion)))</GlobalJsonText>
49 <GlobalJsonText>$(GlobalJsonText.Replace('{informationalversion}', $(InformationalVersion)))</GlobalJsonText>
50 <GlobalJsonText>$(GlobalJsonText.Replace('{height}', $(GitCommits)))</GlobalJsonText>
51 <GlobalJsonText>$(GlobalJsonText.Replace('{packageversion}', $(PackageVersion)))</GlobalJsonText>
52 <GlobalJsonText>$(GlobalJsonText.Replace('{version}', $(Version)))</GlobalJsonText>
53 </PropertyGroup>
54
55 <WriteLinesToFile File="$(GlobalJsonPath)"
56 Lines="$(GlobaJsonTextHeader);$(GlobalJsonText)"
57 Overwrite="true"
58 WriteOnlyWhenDifferent="true" />
59
60 <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(GlobalJsonPath)" />
61 </Target>
62
63
64 <Target Name="SetDirectoryPackagesProps"
65 Inputs="Directory.Packages.props.pp"
66 Outputs="$(CentralPackageVersionsPath)">
67 <PropertyGroup>
68 <CentralPackageVersionsTextHeader>&lt;!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\Directory.Packages.props.pp --&gt;</CentralPackageVersionsTextHeader>
69 <CentralPackageVersionsText>$([System.IO.File]::ReadAllText(Directory.Packages.props.pp))</CentralPackageVersionsText>
70 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{apiversion}', $(ApiVersion)))</CentralPackageVersionsText>
71 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{fileversion}', $(FileVersion)))</CentralPackageVersionsText>
72 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{fullversion}', $(InformationalVersion)))</CentralPackageVersionsText>
73 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{informationalversion}', $(InformationalVersion)))</CentralPackageVersionsText>
74 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{height}', $(GitCommits)))</CentralPackageVersionsText>
75 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{packageversion}', $(PackageVersion)))</CentralPackageVersionsText>
76 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{version}', $(Version)))</CentralPackageVersionsText>
77 </PropertyGroup>
78
79 <WriteLinesToFile File="$(CentralPackageVersionsPath)"
80 Lines="$(CentralPackageVersionsTextHeader);$(CentralPackageVersionsText)"
81 Overwrite="true"
82 WriteOnlyWhenDifferent="true" />
83
84 <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(CentralPackageVersionsPath)" />
85 </Target>
86
87
88 <Target Name="SetBuildNumbers"
89 DependsOnTargets="$(SetBuildNumbersDependsOn)"
90 BeforeTargets="AfterBuild" />
91
92
93 <ItemGroup>
94 <PackageReference Include="GitInfo" Version="2.1.2" />
95 </ItemGroup>
96</Project>
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 @@
1{
2 "msbuild-sdks": {
3 "WixToolset.Sdk": "{packageversion}"
4 },
5 "sdk": {
6 "allowPrerelease": false
7 }
8}
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 @@
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Exe</OutputType> 4 <OutputType>Exe</OutputType>
5 <TargetFramework>netcoreapp2.0</TargetFramework> 5 <TargetFramework>netcoreapp2.0</TargetFramework>
6 <SignOutput>false</SignOutput>
6 </PropertyGroup> 7 </PropertyGroup>
7 8
8</Project> 9</Project>
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 @@
8 <DebugType>embedded</DebugType> 8 <DebugType>embedded</DebugType>
9 <PublishRepositoryUrl>true</PublishRepositoryUrl> 9 <PublishRepositoryUrl>true</PublishRepositoryUrl>
10 <NoWarn>CS0618</NoWarn> 10 <NoWarn>CS0618</NoWarn>
11 <SignOutput>false</SignOutput>
11 </PropertyGroup> 12 </PropertyGroup>
12 13
13 <ItemGroup> 14 <ItemGroup>
@@ -21,7 +22,7 @@
21 22
22 <ItemGroup> 23 <ItemGroup>
23 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 24 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
24 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 25 <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" />
25 </ItemGroup> 26 </ItemGroup>
26 27
27</Project> 28</Project>
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 @@
3 <metadata minClientVersion="4.0"> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <title>$title$</title>
7 <description>$description$</description>
6 <authors>$authors$</authors> 8 <authors>$authors$</authors>
7 <owners>$authors$</owners>
8 <license type="expression">MS-RL</license> 9 <license type="expression">MS-RL</license>
9 <projectUrl>https://github.com/wixtoolset/WixBuildTools</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 10 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <description>$description$</description>
12 <copyright>$copyright$</copyright> 11 <copyright>$copyright$</copyright>
12 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies> 14 <dependencies>
15 <group targetFramework=".NETFramework4.7.2" /> 15 <group targetFramework=".NETFramework4.7.2" />
@@ -17,10 +17,10 @@
17 </metadata> 17 </metadata>
18 18
19 <files> 19 <files>
20 <file src="build\$id$.props" target="build" /> 20 <file src="$projectFolder$\build\$id$.props" target="build" />
21 <file src="build\$id$.targets" target="build" /> 21 <file src="$projectFolder$\build\$id$.targets" target="build" />
22 22
23 <file src="$outputpath$$id$.dll" target="lib\net472" /> 23 <file src="..\x86\$id$.dll" target="lib\net472" />
24 <file src="$outputpath$$id$.pdb" target="lib\net472" /> 24 <file src="..\x86\$id$.pdb" target="lib\net472" />
25 </files> 25 </files>
26</package> 26</package>
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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4
5<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <Import Project="build\WixBuildTools.TestSupport.Native.props" /> 5 <Import Project="build\WixBuildTools.TestSupport.Native.props" />
7 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> 6
8 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
9 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
10 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
11 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|Win32">
12 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
@@ -17,6 +14,7 @@
17 <Platform>Win32</Platform> 14 <Platform>Win32</Platform>
18 </ProjectConfiguration> 15 </ProjectConfiguration>
19 </ItemGroup> 16 </ItemGroup>
17
20 <PropertyGroup Label="Globals"> 18 <PropertyGroup Label="Globals">
21 <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> 19 <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
22 <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid> 20 <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid>
@@ -26,21 +24,17 @@
26 <CharacterSet>Unicode</CharacterSet> 24 <CharacterSet>Unicode</CharacterSet>
27 <CLRSupport>true</CLRSupport> 25 <CLRSupport>true</CLRSupport>
28 <Description>WixBuildTools C++/CLI Test Support</Description> 26 <Description>WixBuildTools C++/CLI Test Support</Description>
27 <SignOutput>false</SignOutput>
29 </PropertyGroup> 28 </PropertyGroup>
29
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
31 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 31 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32 <ImportGroup Label="Shared"> 32
33 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
34 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
35 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
36 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
37 </ImportGroup>
38 <PropertyGroup> 33 <PropertyGroup>
39 <ProjectAdditionalIncludeDirectories> 34 <ProjectAdditionalIncludeDirectories></ProjectAdditionalIncludeDirectories>
40 </ProjectAdditionalIncludeDirectories> 35 <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries>
41 <ProjectAdditionalLinkLibraries>
42 </ProjectAdditionalLinkLibraries>
43 </PropertyGroup> 36 </PropertyGroup>
37
44 <ItemGroup> 38 <ItemGroup>
45 <ClCompile Include="AssemblyInfo.cpp" /> 39 <ClCompile Include="AssemblyInfo.cpp" />
46 <ClCompile Include="precomp.cpp"> 40 <ClCompile Include="precomp.cpp">
@@ -49,37 +43,22 @@
49 <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings> 43 <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings>
50 </ClCompile> 44 </ClCompile>
51 </ItemGroup> 45 </ItemGroup>
46
52 <ItemGroup> 47 <ItemGroup>
53 <ClInclude Include="precomp.h" /> 48 <ClInclude Include="precomp.h" />
54 <ClInclude Include="NativeAssert.h" /> 49 <ClInclude Include="NativeAssert.h" />
55 </ItemGroup> 50 </ItemGroup>
51
56 <ItemGroup> 52 <ItemGroup>
57 <None Include="packages.config" /> 53 <None Include="packages.config" />
58 </ItemGroup> 54 </ItemGroup>
59 <ItemGroup> 55
60 <Reference Include="System" />
61 <Reference Include="System.Core" />
62 </ItemGroup>
63 <ItemGroup> 56 <ItemGroup>
64 <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj"> 57 <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj">
65 <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project> 58 <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>
66 </ProjectReference> 59 </ProjectReference>
67 </ItemGroup> 60 </ItemGroup>
61
68 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 62 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
69 <Import Project="build\WixBuildTools.TestSupport.Native.targets" /> 63 <Import Project="build\WixBuildTools.TestSupport.Native.targets" />
70 <Target Name="PackNativeNuget" DependsOnTargets="Build"> 64</Project>
71 <Exec Command='nuget pack $(MSBuildThisFileName).nuspec -OutputDirectory "$(OutputPath).." -Properties Id=$(MSBuildThisFileName);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);OutputPath=$(OutputPath)' />
72 </Target>
73 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
74 <PropertyGroup>
75 <ErrorText>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}.</ErrorText>
76 </PropertyGroup>
77 <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
78 <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
79 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
80 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
81 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
82 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
83 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
84 </Target>
85</Project> \ 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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4
5<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <PropertyGroup> 5 <PropertyGroup>
7 <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), version.json))</RepoRootDir> 6 <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir>
8 </PropertyGroup> 7 </PropertyGroup>
9 <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> 8 <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" />
10 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" /> 9 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
@@ -12,18 +11,4 @@
12 <PlatformToolset>v142</PlatformToolset> 11 <PlatformToolset>v142</PlatformToolset>
13 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> 12 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
14 </PropertyGroup> 13 </PropertyGroup>
15 <ItemGroup> 14</Project>
16 <Reference Include="xunit.abstractions">
17 <HintPath>$(RepoRootDir)\packages\xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
18 </Reference>
19 <Reference Include="xunit.assert">
20 <HintPath>$(RepoRootDir)\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
21 </Reference>
22 <Reference Include="xunit.core">
23 <HintPath>$(RepoRootDir)\packages\xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath>
24 </Reference>
25 <Reference Include="xunit.execution.desktop">
26 <HintPath>$(RepoRootDir)\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
27 </Reference>
28 </ItemGroup>
29</Project> \ 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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <ItemGroup>
6 <Reference Include="System" />
7 <Reference Include="System.Core" />
8 </ItemGroup>
4 9
5<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 10 <!-- Include these references only when not referenced by the WixBuildTools.TestSupport.Native.vcxproj -->
6 <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" /> 11 <ItemGroup Condition="'$(MSBuildProjectName)'!='$(MSBuildThisFileName)'">
12 <Reference Include="WixBuildTools.TestSupport">
13 <HintPath>$(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.dll</HintPath>
14 </Reference>
15 <Reference Include="WixBuildTools.TestSupport.Native">
16 <HintPath>$(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.Native.dll</HintPath>
17 </Reference>
18 </ItemGroup>
19
20 <ItemGroup>
21 <Reference Include="xunit.abstractions">
22 <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
23 </Reference>
24 <Reference Include="xunit.assert">
25 <HintPath>$(RootPackagesFolder)xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
26 </Reference>
27 <Reference Include="xunit.core">
28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath>
29 </Reference>
30 <Reference Include="xunit.execution.desktop">
31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
32 </Reference>
33 </ItemGroup>
34
35 <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" />
7 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 36 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8 <PropertyGroup> 37 <PropertyGroup>
9 <ErrorText>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}.</ErrorText> 38 <ErrorText>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}.</ErrorText>
10 </PropertyGroup> 39 </PropertyGroup>
11 <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props'))" /> 40 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props'))" />
12 <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets'))" /> 41 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets'))" />
13 <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" /> 42 <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
14 </Target> 43 </Target>
15 <UsingTask AssemblyFile="$(RepoRootDir)\packages\xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" /> 44
45 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
16 <Target Name="Test" DependsOnTargets="Build"> 46 <Target Name="Test" DependsOnTargets="Build">
17 <xunit Assemblies="$(TargetPath)" /> 47 <xunit Assemblies="$(TargetPath)" />
18 </Target> 48 </Target>
19</Project> \ No newline at end of file 49</Project>
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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4
5<packages> 4<packages>
6 <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> 5 <!--
7 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> 6 Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets
8 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> 7 when any of these versions are updated.
9 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> 8 -->
10 <package id="xunit.abstractions" version="2.0.3" /> 9 <package id="xunit.abstractions" version="2.0.3" />
11 <package id="xunit.assert" version="2.4.1" /> 10 <package id="xunit.assert" version="2.4.1" />
12 <package id="xunit.core" version="2.4.1" /> 11 <package id="xunit.core" version="2.4.1" />
@@ -14,4 +13,4 @@
14 <package id="xunit.extensibility.execution" version="2.4.1" /> 13 <package id="xunit.extensibility.execution" version="2.4.1" />
15 <package id="xunit.runner.msbuild" version="2.4.1" /> 14 <package id="xunit.runner.msbuild" version="2.4.1" />
16 <package id="xunit.runner.visualstudio" version="2.4.1" /> 15 <package id="xunit.runner.visualstudio" version="2.4.1" />
17</packages> \ No newline at end of file 16</packages>
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 @@
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <CreateDocumentationFile>true</CreateDocumentationFile> 11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <NoWarn>CS1591</NoWarn> 12 <NoWarn>CS1591</NoWarn>
13 <SignOutput>false</SignOutput>
13 </PropertyGroup> 14 </PropertyGroup>
14 15
15 <ItemGroup> 16 <ItemGroup>
16 <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> 17 <PackageReference Include="Microsoft.Build.Tasks.Core" />
17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" /> 18 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
18 <PackageReference Include="WixToolset.Dtf.Compression" Version="4.0.*" /> 19 <PackageReference Include="WixToolset.Dtf.Compression" />
19 <PackageReference Include="WixToolset.Dtf.Compression.Cab" Version="4.0.*" /> 20 <PackageReference Include="WixToolset.Dtf.Compression.Cab" />
20 </ItemGroup> 21 </ItemGroup>
21 22
22 <ItemGroup> 23 <ItemGroup>
23 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 24 <PackageReference Include="xunit.assert" />
24 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
25 </ItemGroup> 25 </ItemGroup>
26
27 <ItemGroup>
28 <PackageReference Include="xunit.assert" Version="2.4.1" />
29 </ItemGroup>
30
31</Project> 26</Project>
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 @@
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
11 <PublishRepositoryUrl>true</PublishRepositoryUrl> 11 <PublishRepositoryUrl>true</PublishRepositoryUrl>
12 <NoWarn>CS0618</NoWarn> 12 <NoWarn>CS0618</NoWarn>
13 <SignOutput>false</SignOutput>
13 </PropertyGroup> 14 </PropertyGroup>
14 15
15 <ItemGroup> 16 <ItemGroup>
@@ -22,7 +23,6 @@
22 23
23 <ItemGroup> 24 <ItemGroup>
24 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 25 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
25 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 26 <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" />
26 </ItemGroup> 27 </ItemGroup>
27
28</Project> 28</Project>
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 @@
1Microsoft Visual Studio Solution File, Format Version 12.00
2# Visual Studio 15
3VisualStudioVersion = 15.0.27130.2003
4MinimumVisualStudioVersion = 15.0.26124.0
5Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.XsdGen", "src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj", "{E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}"
6EndProject
7Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.MsgGen", "src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj", "{DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}"
8EndProject
9Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{6C57EF2C-979A-4106-A9E5-FE342810619A}"
10EndProject
11Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"
12EndProject
13Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6660B22-092F-4BC5-A303-E6F696C31E1B}"
14 ProjectSection(SolutionItems) = preProject
15 .editorconfig = .editorconfig
16 EndProjectSection
17EndProject
18Global
19 GlobalSection(SolutionConfigurationPlatforms) = preSolution
20 Debug|Any CPU = Debug|Any CPU
21 Debug|x64 = Debug|x64
22 Debug|x86 = Debug|x86
23 Release|Any CPU = Release|Any CPU
24 Release|x64 = Release|x64
25 Release|x86 = Release|x86
26 EndGlobalSection
27 GlobalSection(ProjectConfigurationPlatforms) = postSolution
28 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
30 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.ActiveCfg = Debug|Any CPU
31 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.Build.0 = Debug|Any CPU
32 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
33 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.Build.0 = Debug|Any CPU
34 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
35 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.Build.0 = Release|Any CPU
36 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.ActiveCfg = Release|Any CPU
37 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.Build.0 = Release|Any CPU
38 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.ActiveCfg = Release|Any CPU
39 {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.Build.0 = Release|Any CPU
40 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
42 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.ActiveCfg = Debug|Any CPU
43 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.Build.0 = Debug|Any CPU
44 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.ActiveCfg = Debug|Any CPU
45 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.Build.0 = Debug|Any CPU
46 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
47 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.Build.0 = Release|Any CPU
48 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.ActiveCfg = Release|Any CPU
49 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.Build.0 = Release|Any CPU
50 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.ActiveCfg = Release|Any CPU
51 {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.Build.0 = Release|Any CPU
52 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.Build.0 = Debug|Any CPU
54 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.ActiveCfg = Debug|Any CPU
55 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.Build.0 = Debug|Any CPU
56 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.ActiveCfg = Debug|Any CPU
57 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.Build.0 = Debug|Any CPU
58 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.ActiveCfg = Release|Any CPU
59 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.Build.0 = Release|Any CPU
60 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.ActiveCfg = Release|Any CPU
61 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.Build.0 = Release|Any CPU
62 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.ActiveCfg = Release|Any CPU
63 {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.Build.0 = Release|Any CPU
64 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32
65 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.Build.0 = Debug|Win32
66 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32
67 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32
68 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32
69 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32
70 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.Build.0 = Release|Win32
71 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32
72 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32
73 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32
74 EndGlobalSection
75 GlobalSection(SolutionProperties) = preSolution
76 HideSolutionNode = FALSE
77 EndGlobalSection
78 GlobalSection(ExtensibilityGlobals) = postSolution
79 SolutionGuid = {83E9E075-B440-471A-9C37-9D84BA0AE3E0}
80 EndGlobalSection
81EndGlobal
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 @@
1<SolutionConfiguration>
2 <Settings>
3 <AllowParallelTestExecution>True</AllowParallelTestExecution>
4 <SolutionConfigured>True</SolutionConfigured>
5 </Settings>
6</SolutionConfiguration> \ 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 @@
1@setlocal
2@pushd %~dp0
3
4nuget restore || exit /b
5
6dotnet pack -c Release src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
7dotnet pack -c Release src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b
8dotnet pack -c Release src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
9
10msbuild -p:Configuration=Release -t:PackNativeNuget src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b
11
12@popd
13@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 @@
1# 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.
2#
3# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
4# then update all of the repos.
5
6branches:
7 only:
8 - master
9 - develop
10
11image: Visual Studio 2019
12
13version: 0.0.0.{build}
14configuration: Release
15
16environment:
17 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
18 DOTNET_CLI_TELEMETRY_OPTOUT: 1
19 NUGET_XMLDOC_MODE: skip
20
21build_script:
22 - appveyor.cmd
23
24pull_requests:
25 do_not_increment_build_number: true
26
27nuget:
28 disable_publish_on_pr: true
29
30skip_branch_with_pr: true
31skip_tags: true
32
33artifacts:
34- path: build\Release\**\*.nupkg
35 name: nuget
36- path: build\Release\**\*.msi
37 name: msi
38
39notifications:
40- provider: Slack
41 incoming_webhook:
42 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 @@
1@setlocal
2@pushd %~dp0
3
4@set _C=Debug
5:parse_args
6@if /i "%1"=="release" set _C=Release& shift
7@if not "%1"=="" shift & goto parse_args
8
9@echo Building internal %_C%
10
11:: internal
12
13nuget restore || exit /b
14
15:: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
16:: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
17
18msbuild -t:Pack -p:Configuration=%_C% WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b
19
20msbuild -t:Build -p:Configuration=%_C% WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b
21
22@popd
23@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 @@
1
2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 16
4VisualStudioVersion = 16.6.30114.105
5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}"
7EndProject
8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"
9EndProject
10Global
11 GlobalSection(SolutionConfigurationPlatforms) = preSolution
12 Debug|Any CPU = Debug|Any CPU
13 Debug|ARM64 = Debug|ARM64
14 Debug|x64 = Debug|x64
15 Debug|x86 = Debug|x86
16 Release|Any CPU = Release|Any CPU
17 Release|ARM64 = Release|ARM64
18 Release|x64 = Release|x64
19 Release|x86 = Release|x86
20 EndGlobalSection
21 GlobalSection(ProjectConfigurationPlatforms) = postSolution
22 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
24 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
25 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|ARM64.Build.0 = Debug|Any CPU
26 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x64.ActiveCfg = Debug|Any CPU
27 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x64.Build.0 = Debug|Any CPU
28 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x86.ActiveCfg = Debug|Any CPU
29 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x86.Build.0 = Debug|Any CPU
30 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
31 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|Any CPU.Build.0 = Release|Any CPU
32 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|ARM64.ActiveCfg = Release|Any CPU
33 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|ARM64.Build.0 = Release|Any CPU
34 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x64.ActiveCfg = Release|Any CPU
35 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x64.Build.0 = Release|Any CPU
36 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.ActiveCfg = Release|Any CPU
37 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.Build.0 = Release|Any CPU
38 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32
39 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32
40 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32
41 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32
42 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32
43 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32
44 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32
45 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32
46 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32
47 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32
48 EndGlobalSection
49 GlobalSection(SolutionProperties) = preSolution
50 HideSolutionNode = FALSE
51 EndGlobalSection
52 GlobalSection(ExtensibilityGlobals) = postSolution
53 SolutionGuid = {CCBE86BA-6E38-4A97-8AAD-AA2972350544}
54 EndGlobalSection
55EndGlobal
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<configuration>
3 <packageSources>
4 <clear />
5 <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
6 <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
7 </packageSources>
8</configuration> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-30 15:22:40 +0000