aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Directory.Build.props4
-rw-r--r--src/Directory.Build.targets73
-rw-r--r--src/Directory.csproj.targets8
-rw-r--r--src/Directory.vcxproj.targets40
-rw-r--r--src/Directory.wixproj.targets7
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec2
-rw-r--r--src/api/burn/bextutil/bextutil.nuspec2
-rw-r--r--src/build_init.cmd2
-rw-r--r--src/burn/engine/engine.vcxproj10
-rw-r--r--src/ext/Bal/wixstdfn/wixstdfn.nuspec4
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp1
-rw-r--r--src/internal/SetBuildNumber/SetBuildNumber.proj115
-rw-r--r--src/internal/SetBuildNumber/SomeVerInfo.cs.pp29
-rw-r--r--src/internal/SetBuildNumber/SomeVerInfo.props.pp25
-rw-r--r--src/internal/SetBuildNumber/SomeVerInfo.rc.pp52
-rw-r--r--src/internal/SetBuildNumber/SomeVerInfo.targets49
-rw-r--r--src/internal/SetBuildNumber/SomeVerInit.props13
-rw-r--r--src/internal/SetBuildNumber/SomeVerInit.verproj33
-rw-r--r--src/internal/SetBuildNumber/wixver.props.pp13
-rw-r--r--src/internal/WixBuildFinalize/WixBuildFinalize.proj2
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec2
-rw-r--r--src/version.txt1
-rw-r--r--src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs2
-rw-r--r--src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj2
-rw-r--r--src/wix/WixToolset.Core/CommandLine/VersionCommand.cs10
-rw-r--r--src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs6
-rw-r--r--src/wix/WixToolset.Core/WixToolset.Core.csproj2
-rw-r--r--src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj10
28 files changed, 243 insertions, 276 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index db9bf0b2..b27e35d7 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -32,11 +32,7 @@
32 <ProjectUrl>https://wixtoolset.org/</ProjectUrl> 32 <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
33 <PackageIcon>wix.png</PackageIcon> 33 <PackageIcon>wix.png</PackageIcon>
34 34
35 <GitThisAssembly>false</GitThisAssembly>
36 <GitVersionFile>version.txt</GitVersionFile> 35 <GitVersionFile>version.txt</GitVersionFile>
37 <GitIgnoreTagVersion>true</GitIgnoreTagVersion>
38 <GitInfoReportImportance>low</GitInfoReportImportance>
39 <GitBaseVersionRegex Condition="'$(GitBaseVersionRegex)' == ''">v?(?&lt;MAJOR&gt;\d+|{[\dA-za-z\-\.]+})\.(?&lt;MINOR&gt;(\d+|{[\dA-za-z\-\.]+}))(?:\-(?&lt;LABEL&gt;[\dA-Za-z\-\.{}]+))?$|^v?(?&lt;MAJOR&gt;\d+|{[\dA-za-z\-\.]+})\.(?&lt;MINOR&gt;(\d+|{[\dA-za-z\-\.]+}))\.(?&lt;PATCH&gt;\d+|{[\dA-za-z\-\.]+})(?:\-(?&lt;LABEL&gt;[\dA-Za-z\-\.{}]+))?$|^(?&lt;LABEL&gt;[\dA-Za-z\-\.{}]+)\-v?(?&lt;MAJOR&gt;\d+|{[\dA-za-z\-\.]+})\.(?&lt;MINOR&gt;\d+|{[\dA-za-z\-\.]+})\.(?&lt;PATCH&gt;\d+|{[\dA-za-z\-\.]+})$</GitBaseVersionRegex>
40 </PropertyGroup> 36 </PropertyGroup>
41 37
42 <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> 38 <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 0ce90600..4adf903c 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -16,93 +16,42 @@
16 <ProjectCapability Remove="TestContainer" /> 16 <ProjectCapability Remove="TestContainer" />
17 </ItemGroup> 17 </ItemGroup>
18 18
19 <!-- If the GitInfo package wasn't imported, use the calculated version properties. --> 19 <!-- If the git information wasn't imported yet, import the cached git information. -->
20 <Import Project="$(RootBuildFolder)wixver.props" Condition=" '$(GitInfoImported)'!='true' " /> 20 <Import Project="$(RootBuildFolder)SomeVerInfo.props" Condition=" '$(SomeVerInfoImported)'!='true' " />
21 21 <Import Project="internal/SetBuildNumber/SomeVerInfo.targets" />
22 <Target Name="__FixupGitBaseVersion" BeforeTargets="_GitPopulateVersionInfo">
23 <PropertyGroup>
24 <GitBaseVersion>$(GitBaseVersion.Replace('{apiversion}', '$(ApiVersion)'))</GitBaseVersion>
25 <GitBaseVersion>$(GitBaseVersion.Replace('{height}', '$(GitCommits)'))</GitBaseVersion>
26 <GitBaseVersion>$(GitBaseVersion.Replace('{commits}', '$(GitCommits)'))</GitBaseVersion>
27 </PropertyGroup>
28 </Target>
29 22
30 <PropertyGroup> 23 <PropertyGroup>
31 <GetPackageVersionDependsOn> 24 <RepositoryUrl Condition=" '$(RepositoryUrl)'=='' ">https://github.com/wixtoolset/wix</RepositoryUrl>
32 $(GetPackageVersionDependsOn); 25 <RepositoryType Condition=" '$(RepositoryType)'=='' ">git</RepositoryType>
33 __SetPropertiesFromGit; 26 <RepositoryCommit Condition=" '$(RepositoryCommit)'=='' ">$(SomeVerInfoSha)</RepositoryCommit>
34 </GetPackageVersionDependsOn> 27 <PublishRepositoryUrl>true</PublishRepositoryUrl>
35
36 <__SetPropertiesFromGitDependsOn Condition=" '$(GitInfoFromCache)'!='true' ">
37 GitVersion
38 </__SetPropertiesFromGitDependsOn>
39 </PropertyGroup>
40
41 <Target Name="__SetPropertiesFromGit" DependsOnTargets="$(__SetPropertiesFromGitDependsOn)">
42 <PropertyGroup>
43 <AssemblyVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</AssemblyVersion>
44 <FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</FileVersion>
45 <PackageVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)</PackageVersion>
46 <MajorMinorVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor)</MajorMinorVersion>
47 <Version>$(PackageVersion)</Version>
48 <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion>
49 <!-- We already included the $(GitSha) in the informational version so do not include it again. -->
50 <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
51
52 <RepositoryUrl Condition=" '$(RepositoryUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</RepositoryUrl>
53 <RepositoryType Condition=" '$(RepositoryType)'=='' ">git</RepositoryType>
54 <RepositoryCommit Condition=" '$(RepositoryCommit)'=='' ">$(GitSha)</RepositoryCommit>
55 <PublishRepositoryUrl>true</PublishRepositoryUrl>
56
57 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl>
58
59 <WixMajorVersion>$(GitBaseVersionMajor)</WixMajorVersion>
60 <WixMinorVersion>$(GitBaseVersionMinor)</WixMinorVersion>
61 <WixPatchVersion>$(GitBaseVersionPatch)</WixPatchVersion>
62 </PropertyGroup>
63 28
64 <Message Importance="$(GitInfoReportImportance)" Text="Properties from Git: 29 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl>
65 GitCommits: $(GitCommits) 30 </PropertyGroup>
66 AssemblyVersion: $(AssemblyVersion)
67 FileVersion: $(FileVersion)
68 InformationalVersion: $(InformationalVersion)
69 PackageVersion: $(PackageVersion)
70" />
71 </Target>
72 31
73 <PropertyGroup> 32 <PropertyGroup>
74 <GenerateNuspecDependsOn> 33 <GenerateNuspecDependsOn>
75 $(GenerateNuspecDependsOn); 34 $(GenerateNuspecDependsOn);
76 __SetPropertiesFromGit;
77 __SetNuspecProperties 35 __SetNuspecProperties
78 </GenerateNuspecDependsOn> 36 </GenerateNuspecDependsOn>
79 </PropertyGroup> 37 </PropertyGroup>
80 38
81 <Target Name="__SetNuspecProperties" DependsOnTargets="__SetPropertiesFromGit" 39 <Target Name="__SetNuspecProperties"
82 Condition=" Exists('$(MSBuildProjectName).nuspec') "> 40 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
83 <PropertyGroup> 41 <PropertyGroup>
84 <NuspecFile Condition=" '$(NuspecFile)'=='' ">$(MSBuildProjectName).nuspec</NuspecFile> 42 <NuspecFile Condition=" '$(NuspecFile)'=='' ">$(MSBuildProjectName).nuspec</NuspecFile>
85 <PackageId Condition=" '$(PackageId)'=='' ">$(MSBuildProjectName)</PackageId> 43 <PackageId Condition=" '$(PackageId)'=='' ">$(MSBuildProjectName)</PackageId>
86 <Title Condition=" '$(Title)'=='' ">$(Description)</Title> 44 <Title Condition=" '$(Title)'=='' ">$(Description)</Title>
87 <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)</NuspecBasePath> 45 <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)</NuspecBasePath>
88 <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties> 46 <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);MajorVersion=$(SomeVerInfoMajor);NextMajorVersion=$(SomeVerInfoNextMajor);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties>
89 <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> 47 <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
90 <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties> 48 <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
91 <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties> 49 <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties>
92 </PropertyGroup> 50 </PropertyGroup>
93
94 <Message Importance="$(GitInfoReportImportance)" Text="NuSpec info:
95 NuspecFile: $(NuspecFile)
96 NuspecBasePath: $(NuspecBasePath)
97 NuspecProperties: $(NuspecProperties)
98" />
99
100 </Target> 51 </Target>
101 52
102 <Target Name="PackNative" DependsOnTargets="__SetNuspecProperties" 53 <Target Name="PackNative" DependsOnTargets="__SetNuspecProperties"
103 Condition=" Exists('$(MSBuildProjectName).nuspec') "> 54 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
104 <Error Text="There must be package reference to 'GitInfo'. Ensure the project was restored as well."
105 Condition=" '$(GitInfoImported)'!='true' " />
106 55
107 <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(PackageOutputPath.Trim(&quot;\&quot;))" -BasePath $(NuspecBasePath) -Properties "$(NuspecProperties)"' 56 <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(PackageOutputPath.Trim(&quot;\&quot;))" -BasePath $(NuspecBasePath) -Properties "$(NuspecProperties)"'
108 WorkingDirectory="$(MSBuildProjectDirectory)" /> 57 WorkingDirectory="$(MSBuildProjectDirectory)" />
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
index ba7185e8..2c6abce3 100644
--- a/src/Directory.csproj.targets
+++ b/src/Directory.csproj.targets
@@ -5,16 +5,8 @@
5 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> 5 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
6 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> 6 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
7 <DefineConstants Condition=" '$(Configuration)'=='Debug' ">$(DefineConstants);DEBUG</DefineConstants> 7 <DefineConstants Condition=" '$(Configuration)'=='Debug' ">$(DefineConstants);DEBUG</DefineConstants>
8
9 <WixVersionThisAssemblyFile>$(RootBuildFolder)ThisAssembly.WixVer.cs</WixVersionThisAssemblyFile>
10 </PropertyGroup> 8 </PropertyGroup>
11 9
12 <ItemGroup Condition=" '$(IncludeThisAssembly)'=='true' ">
13 <Compile Include="$(WixVersionThisAssemblyFile)" />
14 </ItemGroup>
15
16 <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" />
17
18 <PropertyGroup Condition=" '$(IsWixTestProject)'=='true' "> 10 <PropertyGroup Condition=" '$(IsWixTestProject)'=='true' ">
19 <RollForward>Major</RollForward> 11 <RollForward>Major</RollForward>
20 <IsPackable>false</IsPackable> 12 <IsPackable>false</IsPackable>
diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets
index 16e9f80c..15ad909d 100644
--- a/src/Directory.vcxproj.targets
+++ b/src/Directory.vcxproj.targets
@@ -3,46 +3,6 @@
3 3
4<Project> 4<Project>
5 <PropertyGroup> 5 <PropertyGroup>
6 <PrepareForBuildDependsOn>
7 $(PrepareForBuildDependsOn);
8 __SetVersionResource
9 </PrepareForBuildDependsOn>
10 </PropertyGroup>
11
12 <Target Name="__SetVersionResource" DependsOnTargets="__SetPropertiesFromGit"
13 Condition=" '$(ConfigurationType)'=='Application' or '$(ConfigurationType)'=='DynamicLibrary' ">
14 <PropertyGroup>
15 <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP</_ResourceFileType>
16 <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL</_ResourceFileType>
17 <Description Condition=" '$(Description)'=='' ">$(TargetName)</Description>
18 <Title Condition=" '$(Title)'=='' ">$(Description)</Title>
19 </PropertyGroup>
20
21 <ItemGroup>
22 <ResourceCompile Include="$(MSBuildThisFileDirectory)ver.rc">
23 <PreprocessorDefinitions>
24 %(PreprocessorDefinitions);
25 GITVER_FILEVER=$(FileVersion.Replace('.', ','));
26 GITVER_PRODUCTVER=$(AssemblyVersion.Replace('.', ','));
27 GITVER_FILE_VERSION=$(FileVersion);
28 GITVER_PRODUCT_VERSION=$(AssemblyVersion);
29 GITVER_FILE_TYPE=$(_ResourceFileType);
30 GITVER_CODEPAGE=0;
31 GITVER_LCID=$([System.Convert]::ToInt32('%(Culture)', 16));
32 GITVER_VERSION_BLOCK=$([System.Convert]::ToString($([MSBuild]::Multiply($([System.Convert]::ToUint64('%(Culture)', 16)), 65536)), 16).PadLeft(8, '0'));
33 GITVER_COMPANY=$(Company);
34 GITVER_COPYRIGHT=$(Copyright);
35 GITVER_TITLE=$(Title);
36 GITVER_PRODUCT=$(Product);
37 GITVER_INFORMATIONAL_VERSION=$(InformationalVersion);
38 GITVER_INTERNAL_NAME=$(TargetName);
39 GITVER_FILE_NAME=$(TargetFileName);
40 </PreprocessorDefinitions>
41 </ResourceCompile>
42 </ItemGroup>
43 </Target>
44
45 <PropertyGroup>
46 <AfterLinkTargets> 6 <AfterLinkTargets>
47 $(AfterLinkTargets); 7 $(AfterLinkTargets);
48 PublicizeNativePdb; 8 PublicizeNativePdb;
diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets
index b509d0a7..4b95db87 100644
--- a/src/Directory.wixproj.targets
+++ b/src/Directory.wixproj.targets
@@ -3,16 +3,15 @@
3 3
4<Project> 4<Project>
5 <Target Name="_SetWixVersion" 5 <Target Name="_SetWixVersion"
6 DependsOnTargets="__SetPropertiesFromGit"
7 AfterTargets="_CreateProjectDefineConstants"> 6 AfterTargets="_CreateProjectDefineConstants">
8 <PropertyGroup> 7 <PropertyGroup>
9 <PrereleaseSuffix Condition=" '$(GitSemVerDashLabel)'!='' ">-prerelease</PrereleaseSuffix> 8 <PrereleaseSuffix Condition=" '$(SomeVerInfoDashLabel)'!='' ">-prerelease</PrereleaseSuffix>
10 9
11 <DefineConstants> 10 <DefineConstants>
12 $(DefineConstants); 11 $(DefineConstants);
13 SetupVersion=$(PackageVersion); 12 SetupVersion=$(PackageVersion);
14 SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor); 13 SetupMajorMinorVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor);
15 SetupDashedMajorMinorVersion=$(GitBaseVersionMajor)-$(GitBaseVersionMinor); 14 SetupDashedMajorMinorVersion=$(SomeVerInfoMajor)-$(SomeVerInfoMinor);
16 SetupDashedPrerelease=$(PrereleaseSuffix) 15 SetupDashedPrerelease=$(PrereleaseSuffix)
17 </DefineConstants> 16 </DefineConstants>
18 </PropertyGroup> 17 </PropertyGroup>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 3b42d53d..e59b4862 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -16,7 +16,7 @@
16 <group targetFramework=".NETFramework4.6.2" /> 16 <group targetFramework=".NETFramework4.6.2" />
17 <group targetFramework=".NETStandard2.0" /> 17 <group targetFramework=".NETStandard2.0" />
18 <group targetFramework="Native"> 18 <group targetFramework="Native">
19 <dependency id="WixToolset.DUtil" version="[$version$,6)" /> 19 <dependency id="WixToolset.DUtil" version="[$version$,$nextmajorversion$)" />
20 </group> 20 </group>
21 </dependencies> 21 </dependencies>
22 </metadata> 22 </metadata>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 8d03da2f..c6371f4f 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -13,7 +13,7 @@
13 <projectUrl>$projectUrl$</projectUrl> 13 <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 <dependencies> 15 <dependencies>
16 <dependency id="WixToolset.DUtil" version="[$version$,6)" /> 16 <dependency id="WixToolset.DUtil" version="[$version$,$nextmajorversion$)" />
17 </dependencies> 17 </dependencies>
18 </metadata> 18 </metadata>
19 19
diff --git a/src/build_init.cmd b/src/build_init.cmd
index c9c27c57..726d7b1c 100644
--- a/src/build_init.cmd
+++ b/src/build_init.cmd
@@ -5,7 +5,7 @@ md ..\build\artifacts
5md ..\build\logs\crashdumps 5md ..\build\logs\crashdumps
6md ..\build\logs\TestResults 6md ..\build\logs\TestResults
7 7
8msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo 8msbuild -Restore internal\SetBuildNumber\SomeVerInit.verproj -nologo
9 9
10@popd 10@popd
11@endlocal 11@endlocal
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index 7e2e80b6..249f8eef 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -158,12 +158,12 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
158 </CustomBuildStep> 158 </CustomBuildStep>
159 </ItemDefinitionGroup> 159 </ItemDefinitionGroup>
160 160
161 <Target Name="SetWixVersion" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="ClCompile"> 161 <Target Name="SetWixVersion" BeforeTargets="ClCompile">
162 <PropertyGroup> 162 <PropertyGroup>
163 <rmj>$(GitBaseVersionMajor)</rmj> 163 <rmj>$(SomeVerInfoMajor)</rmj>
164 <rmm>$(GitBaseVersionMinor)</rmm> 164 <rmm>$(SomeVerInfoMinor)</rmm>
165 <rup>$(GitBaseVersionPatch)</rup> 165 <rup>$(SomeVerInfoPatch)</rup>
166 <rpr>$(GitCommits)</rpr> 166 <rpr>$(SomeVerInfoHeight)</rpr>
167 <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild> 167 <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild>
168 <szInformationalVersion>$(InformationalVersion)</szInformationalVersion> 168 <szInformationalVersion>$(InformationalVersion)</szInformationalVersion>
169 </PropertyGroup> 169 </PropertyGroup>
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
index 1924431e..334a4101 100644
--- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -15,8 +15,8 @@
15 <readme>README.md</readme> 15 <readme>README.md</readme>
16 <dependencies> 16 <dependencies>
17 <group targetFramework="Native"> 17 <group targetFramework="Native">
18 <dependency id="WixToolset.BootstrapperApplicationApi" version="[$version$,6)" /> 18 <dependency id="WixToolset.BootstrapperApplicationApi" version="[$version$,$nextmajorversion$)" />
19 <dependency id="WixToolset.DUtil" version="[$version$,6)" /> 19 <dependency id="WixToolset.DUtil" version="[$version$,$nextmajorversion$)" />
20 </group> 20 </group>
21 </dependencies> 21 </dependencies>
22 </metadata> 22 </metadata>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 0c4b1dfb..7300664b 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -77,7 +77,6 @@
77 <!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config --> 77 <!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config -->
78 <ItemGroup> 78 <ItemGroup>
79 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" /> 79 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
80 <PackageVersion Include="GitInfo" Version="2.3.0" />
81 80
82 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" /> 81 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
83 <PackageVersion Include="xunit" Version="2.5.1" /> 82 <PackageVersion Include="xunit" Version="2.5.1" />
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
deleted file mode 100644
index 9ff4e7c3..00000000
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ /dev/null
@@ -1,115 +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 Sdk="Microsoft.Build.NoTargets/3.5.6">
5 <PropertyGroup>
6 <TargetFramework>net6.0</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
14 <Language>C#</Language>
15 <DefaultLanguageSourceExtension>.cs</DefaultLanguageSourceExtension>
16 <GitThisAssembly>true</GitThisAssembly>
17 </PropertyGroup>
18
19 <PropertyGroup>
20 <SetBuildNumbersDependsOn>
21 __SetPropertiesFromGit;
22 GitThisAssembly;
23 SetGlobalJson;
24 SetDirectoryPackagesProps;
25 SetOverallWixVersions
26 </SetBuildNumbersDependsOn>
27
28 <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath>
29 <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath>
30 <OverallWixVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\wixver.props))</OverallWixVersionsPath>
31 <GitInfoThisAssemblyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\ThisAssembly.WixVer.cs))</GitInfoThisAssemblyFile>
32 </PropertyGroup>
33
34 <Target Name="SetGlobalJson"
35 Inputs="global.json.pp"
36 Outputs="$(GlobalJsonPath)">
37 <PropertyGroup>
38 <!-- https://github.com/NuGet/Home/issues/11784
39 <GlobaJsonTextHeader>/* DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\global.json.pp */</GlobaJsonTextHeader>
40 -->
41 <GlobalJsonText>$([System.IO.File]::ReadAllText(global.json.pp))</GlobalJsonText>
42 <GlobalJsonText>$(GlobalJsonText.Replace('{apiversion}', $(ApiVersion)))</GlobalJsonText>
43 <GlobalJsonText>$(GlobalJsonText.Replace('{fileversion}', $(FileVersion)))</GlobalJsonText>
44 <GlobalJsonText>$(GlobalJsonText.Replace('{fullversion}', $(InformationalVersion)))</GlobalJsonText>
45 <GlobalJsonText>$(GlobalJsonText.Replace('{informationalversion}', $(InformationalVersion)))</GlobalJsonText>
46 <GlobalJsonText>$(GlobalJsonText.Replace('{height}', $(GitCommits)))</GlobalJsonText>
47 <GlobalJsonText>$(GlobalJsonText.Replace('{packageversion}', $(PackageVersion)))</GlobalJsonText>
48 <GlobalJsonText>$(GlobalJsonText.Replace('{version}', $(Version)))</GlobalJsonText>
49 </PropertyGroup>
50
51 <WriteLinesToFile File="$(GlobalJsonPath)"
52 Lines="$(GlobaJsonTextHeader);$(GlobalJsonText)"
53 Overwrite="true"
54 WriteOnlyWhenDifferent="true" />
55
56 <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(GlobalJsonPath)" />
57 </Target>
58
59
60 <Target Name="SetDirectoryPackagesProps"
61 Inputs="Directory.Packages.props.pp"
62 Outputs="$(CentralPackageVersionsPath)">
63 <PropertyGroup>
64 <CentralPackageVersionsTextHeader>&lt;!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\Directory.Packages.props.pp --&gt;</CentralPackageVersionsTextHeader>
65 <CentralPackageVersionsText>$([System.IO.File]::ReadAllText(Directory.Packages.props.pp))</CentralPackageVersionsText>
66 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{apiversion}', $(ApiVersion)))</CentralPackageVersionsText>
67 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{fileversion}', $(FileVersion)))</CentralPackageVersionsText>
68 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{fullversion}', $(InformationalVersion)))</CentralPackageVersionsText>
69 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{informationalversion}', $(InformationalVersion)))</CentralPackageVersionsText>
70 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{height}', $(GitCommits)))</CentralPackageVersionsText>
71 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{packageversion}', $(PackageVersion)))</CentralPackageVersionsText>
72 <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{version}', $(Version)))</CentralPackageVersionsText>
73 </PropertyGroup>
74
75 <WriteLinesToFile File="$(CentralPackageVersionsPath)"
76 Lines="$(CentralPackageVersionsTextHeader);$(CentralPackageVersionsText)"
77 Overwrite="true"
78 WriteOnlyWhenDifferent="true" />
79
80 <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(CentralPackageVersionsPath)" />
81 </Target>
82
83
84 <Target Name="SetOverallWixVersions"
85 Inputs="wixver.props.pp"
86 Outputs="$(OverallWixVersionsPath)">
87 <PropertyGroup>
88 <OverallWixVersionsTextHeader>&lt;!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\wixver.props.pp --&gt;</OverallWixVersionsTextHeader>
89 <OverallWixVersionsText>$([System.IO.File]::ReadAllText(wixver.props.pp))</OverallWixVersionsText>
90 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionMajor}', $(GitBaseVersionMajor)))</OverallWixVersionsText>
91 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionMinor}', $(GitBaseVersionMinor)))</OverallWixVersionsText>
92 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionPatch}', $(GitBaseVersionPatch)))</OverallWixVersionsText>
93 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitCommits}', $(GitCommits)))</OverallWixVersionsText>
94 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitSemVerDashLabel}', $(GitSemVerDashLabel)))</OverallWixVersionsText>
95 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitSha}', $(GitSha)))</OverallWixVersionsText>
96 <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitRepositoryUrl}', $(GitRepositoryUrl.Replace('.git',''))))</OverallWixVersionsText>
97 </PropertyGroup>
98
99 <WriteLinesToFile File="$(OverallWixVersionsPath)"
100 Lines="$(OverallWixVersionsTextHeader);$(OverallWixVersionsText)"
101 Overwrite="true"
102 WriteOnlyWhenDifferent="true" />
103
104 <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(OverallWixVersionsPath)" />
105 </Target>
106
107
108 <Target Name="SetBuildNumbers"
109 DependsOnTargets="$(SetBuildNumbersDependsOn)"
110 BeforeTargets="AfterBuild" />
111
112 <ItemGroup>
113 <PackageReference Include="GitInfo" Version="2.3.0" />
114 </ItemGroup>
115</Project>
diff --git a/src/internal/SetBuildNumber/SomeVerInfo.cs.pp b/src/internal/SetBuildNumber/SomeVerInfo.cs.pp
new file mode 100644
index 00000000..3a468ef0
--- /dev/null
+++ b/src/internal/SetBuildNumber/SomeVerInfo.cs.pp
@@ -0,0 +1,29 @@
1// DO NOT MODIFY! Auto-generated from SomeVerInfo.cs.pp
2
3/// <summary>Provides access to the current assembly information.</summary>
4partial class SomeVerInfo
5{
6 /// <summary>Full information version: {informationalversion}</summary>
7 public const string InformationalVersion = @"{informationalversion}";
8
9 /// <summary>File version: {fileversion}</summary>
10 public const string FileVersion = @"{fileversion}";
11
12 /// <summary>Commits on top of base version: 2</summary>
13 public const string Commits = @"{height}";
14
15 /// <summary>Major version: {major}</summary>
16 public const string Major = @"{major}";
17
18 /// <summary>Minor version: {minor}</summary>
19 public const string Minor = @"{minor}";
20
21 /// <summary>Patch version: {patch}</summary>
22 public const string Patch = @"{patch}";
23
24 /// <summary>Label: {dashlabel}</summary>
25 public const string Label = @"{dashlabel}";
26
27 /// <summary>ShortSha: {shortsha}</summary>
28 public const string ShortSha = @"{shortsha}";
29}
diff --git a/src/internal/SetBuildNumber/SomeVerInfo.props.pp b/src/internal/SetBuildNumber/SomeVerInfo.props.pp
new file mode 100644
index 00000000..28fcd3fd
--- /dev/null
+++ b/src/internal/SetBuildNumber/SomeVerInfo.props.pp
@@ -0,0 +1,25 @@
1<Project>
2 <PropertyGroup>
3 <SomeVerInfoImported>true</SomeVerInfoImported>
4 <SomeVerInfoFromCache>true</SomeVerInfoFromCache>
5 <SomeVerInfoNextMajor>{nextmajor}</SomeVerInfoNextMajor>
6 <SomeVerInfoNextMinor>{nextminor}</SomeVerInfoNextMinor>
7 <SomeVerInfoMajor>{major}</SomeVerInfoMajor>
8 <SomeVerInfoMinor>{minor}</SomeVerInfoMinor>
9 <SomeVerInfoPatch>{patch}</SomeVerInfoPatch>
10 <SomeVerInfoHeight>{height}</SomeVerInfoHeight>
11 <SomeVerInfoFullHeight>{fullheight}</SomeVerInfoFullHeight>
12 <SomeVerInfoLabel>{label}</SomeVerInfoLabel>
13 <SomeVerInfoDashLabel>{dashlabel}</SomeVerInfoDashLabel>
14 <SomeVerInfoSha>{sha}</SomeVerInfoSha>
15 <SomeVerInfoShortSha>{shortsha}</SomeVerInfoShortSha>
16 <SomeVerInfoVersion>{informationalversion}</SomeVerInfoVersion>
17 </PropertyGroup>
18
19 <PropertyGroup>
20 <AssemblyVersion>{major}.0.0.0</AssemblyVersion>
21 <FileVersion>{major}.{minor}.{patch}.{fullheight}</FileVersion>
22 <InformationalVersion>{informationalversion}</InformationalVersion>
23 <PackageVersion>{major}.{minor}.{patch}{dashlabel}</PackageVersion>
24 </PropertyGroup>
25</Project>
diff --git a/src/internal/SetBuildNumber/SomeVerInfo.rc.pp b/src/internal/SetBuildNumber/SomeVerInfo.rc.pp
new file mode 100644
index 00000000..6aad140d
--- /dev/null
+++ b/src/internal/SetBuildNumber/SomeVerInfo.rc.pp
@@ -0,0 +1,52 @@
1#pragma once
2// ------------------------------------------------------------------------------
3// <auto-generated>
4// This code was generated from SomeVerInfo.rc.
5// </auto-generated>
6// ------------------------------------------------------------------------------
7
8#if defined(_UNICODE)
9#define CREATE_VERSION_STRING(x) L ## #x
10#else
11#define CREATE_VERSION_STRING(x) #x
12#endif
13
14#define CVS(x) CREATE_VERSION_STRING(x)
15
16#ifdef RC_INVOKED
17
18#include <winres.h>
19
20VS_VERSION_INFO VERSIONINFO
21 FILEVERSION {major},{minor},{patch},{fullheight}
22 PRODUCTVERSION {major},{minor},0,0
23 FILEFLAGSMASK 0x3FL
24#ifdef _DEBUG
25 FILEFLAGS 0x1L
26#else
27 FILEFLAGS 0x0L
28#endif
29 FILEOS 0x4L
30 FILETYPE SOMEVER_FILE_TYPE
31 FILESUBTYPE 0x0L
32BEGIN
33 BLOCK "StringFileInfo"
34 BEGIN
35 BLOCK CVS(SOMEVER_VERSION_BLOCK)
36 BEGIN
37 VALUE "CompanyName", CVS(SOMEVER_COMPANY)
38 VALUE "FileDescription", CVS(SOMEVER_TITLE)
39 VALUE "FileVersion", CVS({fileversion})
40 VALUE "InternalName", CVS(SOMEVER_INTERNAL_NAME)
41 VALUE "OriginalFilename", CVS(SOMEVER_FILE_NAME)
42 VALUE "ProductName", CVS(SOMEVER_PRODUCT)
43 VALUE "ProductVersion", CVS({informationalversion})
44 VALUE "LegalCopyright", CVS(SOMEVER_COPYRIGHT)
45 END
46 END
47 BLOCK "VarFileInfo"
48 BEGIN
49 VALUE "Translation", SOMEVER_LCID, SOMEVER_CODEPAGE
50 END
51END
52#endif
diff --git a/src/internal/SetBuildNumber/SomeVerInfo.targets b/src/internal/SetBuildNumber/SomeVerInfo.targets
new file mode 100644
index 00000000..6ed1117a
--- /dev/null
+++ b/src/internal/SetBuildNumber/SomeVerInfo.targets
@@ -0,0 +1,49 @@
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 <Import Project="SomeVerInit.props" Condition=" '$(SomeVerInitImported)'!='true'" />
6
7 <ItemGroup Condition=" '$(IncludeSomeVerInfo)' == 'true' ">
8 <Compile Include="$(SomeVerInfoCsFile)" />
9 </ItemGroup>
10
11 <PropertyGroup Condition=" '$(Language)'=='C++' ">
12 <PrepareForBuildDependsOn>
13 $(PrepareForBuildDependsOn);
14 __SetVersionResource
15 </PrepareForBuildDependsOn>
16 </PropertyGroup>
17
18 <Target Name="__SetVersionResource"
19 Inputs="$(SomeVerInfoRcFile)"
20 Outputs="$(TargetPath)"
21 Condition=" '$(ConfigurationType)'=='Application' or '$(ConfigurationType)'=='DynamicLibrary' ">
22 <PropertyGroup>
23 <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP</_ResourceFileType>
24 <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL</_ResourceFileType>
25 <Lcid Condition=" '$(Lcid)'=='' ">0x0409</Lcid>
26 <Description Condition=" '$(Description)'=='' ">$(TargetName)</Description>
27 <Title Condition=" '$(Title)'=='' ">$(Description)</Title>
28 </PropertyGroup>
29
30 <ItemGroup>
31 <ResourceCompile Include="$(SomeVerInfoRcFile)">
32 <PreprocessorDefinitions>
33 %(PreprocessorDefinitions);
34 SOMEVER_FILE_TYPE=$(_ResourceFileType);
35 SOMEVER_CODEPAGE=0;
36 SOMEVER_LCID=$([System.Convert]::ToInt32('$(Lcid)', 16));
37 SOMEVER_VERSION_BLOCK=$([System.Convert]::ToString($([MSBuild]::Multiply($([System.Convert]::ToUint64('$(Lcid)', 16)), 65536)), 16).PadLeft(8, '0'));
38 SOMEVER_COMPANY=$(Company);
39 SOMEVER_COPYRIGHT=$(Copyright);
40 SOMEVER_TITLE=$(Title);
41 SOMEVER_PRODUCT=$(Product);
42 SOMEVER_INTERNAL_NAME=$(TargetName);
43 SOMEVER_FILE_NAME=$(TargetFileName);
44 </PreprocessorDefinitions>
45 </ResourceCompile>
46 </ItemGroup>
47 </Target>
48
49</Project>
diff --git a/src/internal/SetBuildNumber/SomeVerInit.props b/src/internal/SetBuildNumber/SomeVerInit.props
new file mode 100644
index 00000000..01970e31
--- /dev/null
+++ b/src/internal/SetBuildNumber/SomeVerInit.props
@@ -0,0 +1,13 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<Project>
4 <PropertyGroup>
5 <GlobalJsonFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonFile>
6 <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath>
7 <SomeVerInfoCsFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\SomeVerInfo.cs))</SomeVerInfoCsFile>
8 <SomeVerInfoRcFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\SomeVerInfo.rc))</SomeVerInfoRcFile>
9 <SomeVerInfoPropsFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\SomeVerInfo.props))</SomeVerInfoPropsFile>
10
11 <SomeVerInitImported>true</SomeVerInitImported>
12 </PropertyGroup>
13</Project>
diff --git a/src/internal/SetBuildNumber/SomeVerInit.verproj b/src/internal/SetBuildNumber/SomeVerInit.verproj
new file mode 100644
index 00000000..7d963267
--- /dev/null
+++ b/src/internal/SetBuildNumber/SomeVerInit.verproj
@@ -0,0 +1,33 @@
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="SomeVer/0.1.1">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7
8 <!-- Disable central package version management since this project will write the central package version management file -->
9 <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
10
11 <!-- Explicitly set the restore sources because this project may run before the build\artifacts folder has been created -->
12 <RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources>
13 <RestoreIgnoreFailedSources>true</RestoreIgnoreFailedSources>
14
15 <!-- SomeVer configuration -->
16 <SomeVerAutoIncrement>major</SomeVerAutoIncrement>
17 <SomeVerDefaultPreReleaseIdentifiers>build</SomeVerDefaultPreReleaseIdentifiers>
18 <SomeVerIncludeDefaultPreReleaseIdentifiersWithPrereleases>true</SomeVerIncludeDefaultPreReleaseIdentifiersWithPrereleases>
19 <SomeVerTagPrefix>v</SomeVerTagPrefix>
20
21 <!-- Pretend that the SomeVer information was imported because we'll actually be creating it here -->
22 <SomeVerInfoImported>true</SomeVerInfoImported>
23 </PropertyGroup>
24
25 <ItemGroup>
26 <VersionTemplate Include="global.json.pp" OutputPath="$(GlobalJsonFile)" />
27 <VersionTemplate Include="Directory.Packages.props.pp" OutputPath="$(CentralPackageVersionsPath)" />
28 <VersionTemplate Include="SomeVerInfo.cs.pp" OutputPath="$(SomeVerInfoCsFile)" />
29 <VersionTemplate Include="SomeVerInfo.rc.pp" OutputPath="$(SomeVerInfoRcFile)" />
30 <VersionTemplate Include="SomeVerInfo.props.pp" OutputPath="$(SomeVerInfoPropsFile)" />
31 </ItemGroup>
32
33</Project>
diff --git a/src/internal/SetBuildNumber/wixver.props.pp b/src/internal/SetBuildNumber/wixver.props.pp
deleted file mode 100644
index 3197181f..00000000
--- a/src/internal/SetBuildNumber/wixver.props.pp
+++ /dev/null
@@ -1,13 +0,0 @@
1<Project>
2 <PropertyGroup>
3 <GitInfoFromCache>true</GitInfoFromCache>
4 <GitInfoImported>true</GitInfoImported>
5 <GitBaseVersionMajor>{GitBaseVersionMajor}</GitBaseVersionMajor>
6 <GitBaseVersionMinor>{GitBaseVersionMinor}</GitBaseVersionMinor>
7 <GitBaseVersionPatch>{GitBaseVersionPatch}</GitBaseVersionPatch>
8 <GitCommits>{GitCommits}</GitCommits>
9 <GitSemVerDashLabel>{GitSemVerDashLabel}</GitSemVerDashLabel>
10 <GitSha>{GitSha}</GitSha>
11 <GitRepositoryUrl>{GitRepositoryUrl}</GitRepositoryUrl>
12 </PropertyGroup>
13</Project>
diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
index d161f2cf..bd68a471 100644
--- a/src/internal/WixBuildFinalize/WixBuildFinalize.proj
+++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
@@ -6,7 +6,7 @@
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <Target Name="ZipPdbs" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="AfterBuild"> 9 <Target Name="ZipPdbs" BeforeTargets="AfterBuild">
10 <ZipDirectory 10 <ZipDirectory
11 SourceDirectory="$(PdbsFolder)" 11 SourceDirectory="$(PdbsFolder)"
12 DestinationFile="$(ArtifactsFolder)\wix-pdbs.$(Version).zip" 12 DestinationFile="$(ArtifactsFolder)\wix-pdbs.$(Version).zip"
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index e1fbde48..5609e82f 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -13,7 +13,7 @@
13 <projectUrl>$projectUrl$</projectUrl> 13 <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 <dependencies> 15 <dependencies>
16 <dependency id="WixToolset.DUtil" version="[$version$,6)" /> 16 <dependency id="WixToolset.DUtil" version="[$version$,$nextmajorversion$)" />
17 </dependencies> 17 </dependencies>
18 </metadata> 18 </metadata>
19 19
diff --git a/src/version.txt b/src/version.txt
deleted file mode 100644
index 3a8c0822..00000000
--- a/src/version.txt
+++ /dev/null
@@ -1 +0,0 @@
16.0.0-dev.1
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 193bfcc8..c2e20d82 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -75,7 +75,7 @@ namespace WixToolset.Core.Burn.Bundles
75 writer.WriteStartElement("BurnManifest", BurnCommon.BurnNamespace); 75 writer.WriteStartElement("BurnManifest", BurnCommon.BurnNamespace);
76 76
77 // Write attributes to support harvesting bundles. 77 // Write attributes to support harvesting bundles.
78 writer.WriteAttributeString("EngineVersion", $"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}"); 78 writer.WriteAttributeString("EngineVersion", $"{SomeVerInfo.Major}.{SomeVerInfo.Minor}.{SomeVerInfo.Patch}.{SomeVerInfo.Commits}");
79 writer.WriteAttributeString("ProtocolVersion", BurnCommon.BURN_PROTOCOL_VERSION.ToString()); 79 writer.WriteAttributeString("ProtocolVersion", BurnCommon.BURN_PROTOCOL_VERSION.ToString());
80 writer.WriteAttributeString("Win64", this.BundleSymbol.Platform == Platform.X86 ? "no" : "yes"); 80 writer.WriteAttributeString("Win64", this.BundleSymbol.Platform == Platform.X86 ? "no" : "yes");
81 81
diff --git a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
index 42390b6d..3184cc1f 100644
--- a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+++ b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
@@ -9,7 +9,7 @@
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <CreateDocumentationFile>true</CreateDocumentationFile> 11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <IncludeThisAssembly>true</IncludeThisAssembly> 12 <IncludeSomeVerInfo>true</IncludeSomeVerInfo>
13 </PropertyGroup> 13 </PropertyGroup>
14 14
15 <ItemGroup> 15 <ItemGroup>
diff --git a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs
index 2fb13967..1831f067 100644
--- a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs
@@ -19,11 +19,11 @@ namespace WixToolset.Core.CommandLine
19 public override Task<int> ExecuteAsync(CancellationToken cancellationToken) 19 public override Task<int> ExecuteAsync(CancellationToken cancellationToken)
20 { 20 {
21 // $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(Commit) 21 // $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(Commit)
22 Console.WriteLine("{0}.{1}.{2}{3}+{4}", ThisAssembly.Git.BaseVersion.Major 22 Console.WriteLine("{0}.{1}.{2}{3}+{4}", SomeVerInfo.Major
23 , ThisAssembly.Git.BaseVersion.Minor 23 , SomeVerInfo.Minor
24 , ThisAssembly.Git.BaseVersion.Patch 24 , SomeVerInfo.Patch
25 , ThisAssembly.Git.SemVer.DashLabel 25 , SomeVerInfo.Label
26 , ThisAssembly.Git.Commit); 26 , SomeVerInfo.ShortSha);
27 return Task.FromResult(0); 27 return Task.FromResult(0);
28 } 28 }
29 29
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 1392a584..50160ebb 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -87,7 +87,7 @@ namespace WixToolset.Core.ExtensibilityServices
87 87
88 var result = this.EvaluateFunction(context, prefix, functionName, args); 88 var result = this.EvaluateFunction(context, prefix, functionName, args);
89 89
90 // If the function didn't evaluate, try to evaluate the original value as a variable to support 90 // If the function didn't evaluate, try to evaluate the original value as a variable to support
91 // the use of open and closed parens inside variable names. Example: $(env.ProgramFiles(x86)) should resolve. 91 // the use of open and closed parens inside variable names. Example: $(env.ProgramFiles(x86)) should resolve.
92 if (result == null) 92 if (result == null)
93 { 93 {
@@ -262,10 +262,10 @@ namespace WixToolset.Core.ExtensibilityServices
262 } 262 }
263 263
264 case "WIXMAJORVERSION": 264 case "WIXMAJORVERSION":
265 return ThisAssembly.Git.BaseVersion.Major; 265 return SomeVerInfo.Major;
266 266
267 case "WIXVERSION": 267 case "WIXVERSION":
268 return $"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}"; 268 return $"{SomeVerInfo.Major}.{SomeVerInfo.Minor}.{SomeVerInfo.Patch}.{SomeVerInfo.Commits}";
269 269
270 default: 270 default:
271 return null; 271 return null;
diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj
index 33e151bc..5445b6db 100644
--- a/src/wix/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj
@@ -9,7 +9,7 @@
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <CreateDocumentationFile>true</CreateDocumentationFile> 11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <IncludeThisAssembly>true</IncludeThisAssembly> 12 <IncludeSomeVerInfo>true</IncludeSomeVerInfo>
13 </PropertyGroup> 13 </PropertyGroup>
14 14
15 <ItemGroup> 15 <ItemGroup>
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index 2f9b33fd..a45d660e 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -37,30 +37,30 @@
37 XmlInputPath="$(PublishDir)tools\wix.props" 37 XmlInputPath="$(PublishDir)tools\wix.props"
38 Namespaces="$(Namespaces)" 38 Namespaces="$(Namespaces)"
39 Query="//msb:WixToolsetMajorVersion" 39 Query="//msb:WixToolsetMajorVersion"
40 Value="$(WixMajorVersion)" /> 40 Value="$(SomeVerInfoMajor)" />
41 41
42 <XmlPoke 42 <XmlPoke
43 XmlInputPath="$(PublishDir)tools\wix.props" 43 XmlInputPath="$(PublishDir)tools\wix.props"
44 Namespaces="$(Namespaces)" 44 Namespaces="$(Namespaces)"
45 Query="//msb:WixToolsetMinorVersion" 45 Query="//msb:WixToolsetMinorVersion"
46 Value="$(WixMinorVersion)" /> 46 Value="$(SomeVerInfoMinor)" />
47 47
48 <XmlPoke 48 <XmlPoke
49 XmlInputPath="$(PublishDir)tools\wix.props" 49 XmlInputPath="$(PublishDir)tools\wix.props"
50 Namespaces="$(Namespaces)" 50 Namespaces="$(Namespaces)"
51 Query="//msb:WixToolsetPatchVersion" 51 Query="//msb:WixToolsetPatchVersion"
52 Value="$(WixPatchVersion)" /> 52 Value="$(SomeVerInfoPatch)" />
53 53
54 <XmlPoke 54 <XmlPoke
55 XmlInputPath="$(PublishDir)tools\wix.props" 55 XmlInputPath="$(PublishDir)tools\wix.props"
56 Namespaces="$(Namespaces)" 56 Namespaces="$(Namespaces)"
57 Query="//msb:WixToolsetMajorMinorVersion" 57 Query="//msb:WixToolsetMajorMinorVersion"
58 Value="$(MajorMinorVersion)" /> 58 Value="$(SomeVerInfoMajor).$(SomeVerInfoMinor)" />
59 59
60 <XmlPoke 60 <XmlPoke
61 XmlInputPath="$(PublishDir)tools\wix.props" 61 XmlInputPath="$(PublishDir)tools\wix.props"
62 Namespaces="$(Namespaces)" 62 Namespaces="$(Namespaces)"
63 Query="//msb:WixToolsetVersion" 63 Query="//msb:WixToolsetVersion"
64 Value="$(Version)" /> 64 Value="$(SomeVerInfoMajor).$(SomeVerInfoMinor).$(SomeVerInfoPatch)" />
65 </Target> 65 </Target>
66</Project> 66</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 22:18:35 +0000