diff options
author | Rob Mensching <rob@firegiant.com> | 2024-04-07 03:26:12 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-04-25 13:31:39 -0700 |
commit | 4983aeeb2da6e96bc8aad698752b3b962f58e585 (patch) | |
tree | 40a5eee15554c599086f12d0d426ba37060b050a /src/internal | |
parent | 973a1764223d7313beef03a66f6218905b07870b (diff) | |
download | wix-4983aeeb2da6e96bc8aad698752b3b962f58e585.tar.gz wix-4983aeeb2da6e96bc8aad698752b3b962f58e585.tar.bz2 wix-4983aeeb2da6e96bc8aad698752b3b962f58e585.zip |
Move to ReleaseFlow and SomeVer
Diffstat (limited to 'src/internal')
-rw-r--r-- | src/internal/SetBuildNumber/Directory.Packages.props.pp | 1 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SetBuildNumber.proj | 115 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SomeVerInfo.cs.pp | 29 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SomeVerInfo.props.pp | 25 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SomeVerInfo.rc.pp | 52 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SomeVerInfo.targets | 49 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SomeVerInit.props | 13 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SomeVerInit.verproj | 33 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/wixver.props.pp | 13 | ||||
-rw-r--r-- | src/internal/WixBuildFinalize/WixBuildFinalize.proj | 2 |
10 files changed, 202 insertions, 130 deletions
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) -> $(GlobalJsonPath)" /> | ||
57 | </Target> | ||
58 | |||
59 | |||
60 | <Target Name="SetDirectoryPackagesProps" | ||
61 | Inputs="Directory.Packages.props.pp" | ||
62 | Outputs="$(CentralPackageVersionsPath)"> | ||
63 | <PropertyGroup> | ||
64 | <CentralPackageVersionsTextHeader><!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\Directory.Packages.props.pp --></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) -> $(CentralPackageVersionsPath)" /> | ||
81 | </Target> | ||
82 | |||
83 | |||
84 | <Target Name="SetOverallWixVersions" | ||
85 | Inputs="wixver.props.pp" | ||
86 | Outputs="$(OverallWixVersionsPath)"> | ||
87 | <PropertyGroup> | ||
88 | <OverallWixVersionsTextHeader><!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\wixver.props.pp --></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) -> $(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> | ||
4 | partial 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 | |||
20 | VS_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 | ||
32 | BEGIN | ||
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 | ||
51 | END | ||
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" |