diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-11-10 23:35:31 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-11-13 07:27:49 -0800 |
| commit | c8a832c931f6c34892e596a11c14e9181d5eee16 (patch) | |
| tree | f7038e49a221ec4e1ce7a5eb42002e90710b7f50 /src/internal/SetBuildNumber | |
| parent | fdf2b03587cddd74618f57c59f24a22819bd28ff (diff) | |
| download | wix-c8a832c931f6c34892e596a11c14e9181d5eee16.tar.gz wix-c8a832c931f6c34892e596a11c14e9181d5eee16.tar.bz2 wix-c8a832c931f6c34892e596a11c14e9181d5eee16.zip | |
Minimize calls into GitInfo by caching results during build_init
Diffstat (limited to 'src/internal/SetBuildNumber')
| -rw-r--r-- | src/internal/SetBuildNumber/SetBuildNumber.proj | 32 | ||||
| -rw-r--r-- | src/internal/SetBuildNumber/wixver.props.pp | 13 |
2 files changed, 45 insertions, 0 deletions
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj index 2ae49e19..23788d52 100644 --- a/src/internal/SetBuildNumber/SetBuildNumber.proj +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj | |||
| @@ -10,19 +10,27 @@ | |||
| 10 | <!-- Explicitly set the restore sources because this project may run before the build\artifacts folder has been created --> | 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> | 11 | <RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources> |
| 12 | <RestoreIgnoreFailedSources>true</RestoreIgnoreFailedSources> | 12 | <RestoreIgnoreFailedSources>true</RestoreIgnoreFailedSources> |
| 13 | |||
| 14 | <Language>C#</Language> | ||
| 15 | <DefaultLanguageSourceExtension>.cs</DefaultLanguageSourceExtension> | ||
| 16 | <GitThisAssembly>true</GitThisAssembly> | ||
| 13 | </PropertyGroup> | 17 | </PropertyGroup> |
| 14 | 18 | ||
| 15 | <PropertyGroup> | 19 | <PropertyGroup> |
| 16 | <SetBuildNumbersDependsOn> | 20 | <SetBuildNumbersDependsOn> |
| 17 | __SetPropertiesFromGit; | 21 | __SetPropertiesFromGit; |
| 22 | GitThisAssembly; | ||
| 18 | SetAppVeyorBuildNumber; | 23 | SetAppVeyorBuildNumber; |
| 19 | SetGlobalJson; | 24 | SetGlobalJson; |
| 20 | SetDirectoryPackagesProps; | 25 | SetDirectoryPackagesProps; |
| 26 | SetOverallWixVersions; | ||
| 21 | InstallSigningClient | 27 | InstallSigningClient |
| 22 | </SetBuildNumbersDependsOn> | 28 | </SetBuildNumbersDependsOn> |
| 23 | 29 | ||
| 24 | <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath> | 30 | <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath> |
| 25 | <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath> | 31 | <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath> |
| 32 | <OverallWixVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\wixver.props))</OverallWixVersionsPath> | ||
| 33 | <GitInfoThisAssemblyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\ThisAssembly.WixVer.cs))</GitInfoThisAssemblyFile> | ||
| 26 | </PropertyGroup> | 34 | </PropertyGroup> |
| 27 | 35 | ||
| 28 | <Target Name="SetAppVeyorBuildNumber" | 36 | <Target Name="SetAppVeyorBuildNumber" |
| @@ -89,6 +97,30 @@ | |||
| 89 | </Target> | 97 | </Target> |
| 90 | 98 | ||
| 91 | 99 | ||
| 100 | <Target Name="SetOverallWixVersions" | ||
| 101 | Inputs="wixver.props.pp" | ||
| 102 | Outputs="$(OverallWixVersionsPath)"> | ||
| 103 | <PropertyGroup> | ||
| 104 | <OverallWixVersionsTextHeader><!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\wixver.props.pp --></OverallWixVersionsTextHeader> | ||
| 105 | <OverallWixVersionsText>$([System.IO.File]::ReadAllText(wixver.props.pp))</OverallWixVersionsText> | ||
| 106 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionMajor}', $(GitBaseVersionMajor)))</OverallWixVersionsText> | ||
| 107 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionMinor}', $(GitBaseVersionMinor)))</OverallWixVersionsText> | ||
| 108 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitBaseVersionPatch}', $(GitBaseVersionPatch)))</OverallWixVersionsText> | ||
| 109 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitCommits}', $(GitCommits)))</OverallWixVersionsText> | ||
| 110 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitSemVerDashLabel}', $(GitSemVerDashLabel)))</OverallWixVersionsText> | ||
| 111 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitSha}', $(GitSha)))</OverallWixVersionsText> | ||
| 112 | <OverallWixVersionsText>$(OverallWixVersionsText.Replace('{GitRepositoryUrl}', $(GitRepositoryUrl.Replace('.git',''))))</OverallWixVersionsText> | ||
| 113 | </PropertyGroup> | ||
| 114 | |||
| 115 | <WriteLinesToFile File="$(OverallWixVersionsPath)" | ||
| 116 | Lines="$(OverallWixVersionsTextHeader);$(OverallWixVersionsText)" | ||
| 117 | Overwrite="true" | ||
| 118 | WriteOnlyWhenDifferent="true" /> | ||
| 119 | |||
| 120 | <Message Importance="high" Text="$(MSBuildProjectName) -> $(OverallWixVersionsPath)" /> | ||
| 121 | </Target> | ||
| 122 | |||
| 123 | |||
| 92 | <Target Name="InstallSigningClient" | 124 | <Target Name="InstallSigningClient" |
| 93 | DependsOnTargets="_GetSignClient" | 125 | DependsOnTargets="_GetSignClient" |
| 94 | Condition=" '$(SigningUser)'!='' "> | 126 | Condition=" '$(SigningUser)'!='' "> |
diff --git a/src/internal/SetBuildNumber/wixver.props.pp b/src/internal/SetBuildNumber/wixver.props.pp new file mode 100644 index 00000000..3197181f --- /dev/null +++ b/src/internal/SetBuildNumber/wixver.props.pp | |||
| @@ -0,0 +1,13 @@ | |||
| 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> | ||
