Skip to content

Commit d509751

Browse files
committed
Switching build to update version info in VersionInfo.cs instead of AssemblyInfo.cs, hopefully this will reduce locking issues when building locally
1 parent 628f50f commit d509751

File tree

7 files changed

+48
-33
lines changed

7 files changed

+48
-33
lines changed

build/UmbracoFileSystemProviders.Azure.proj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@
100100

101101
<!-- UPDATE PROJECT ASSEMBLEY VERSION -->
102102
<Target Name="UpdateAssemblyInfo" DependsOnTargets="Clean">
103-
<FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
104-
<FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
105-
<FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
103+
<FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
104+
<FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
105+
<FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
106106

107-
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
108-
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
109-
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\AssemblyInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
107+
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
108+
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
109+
<FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
110110
</Target>
111111

112112
<!-- COMPILE -->

src/UmbracoFileSystemProviders.Azure.Installer/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,4 @@
2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("f67f3c8f-7b04-4d4f-a1fc-ad588e93afb4")]
2424

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.5.0.0")]
36-
[assembly: AssemblyFileVersion("0.5.0.0")]
37-
[assembly: AssemblyInformationalVersion("0.5.0-alpha")]
38-
3925
[assembly: InternalsVisibleTo("Our.Umbraco.FileSystemProviders.Azure.Tests")]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// <copyright file="VersionInfo.cs" company="James Jackson-South">
2+
// Copyright (c) James Jackson-South. All rights reserved.
3+
// Licensed under the Apache License, Version 2.0.
4+
// </copyright>
5+
6+
using System.Reflection;
7+
8+
// Version information for an assembly consists of the following four values:
9+
//
10+
// Major Version
11+
// Minor Version
12+
// Build Number
13+
// Revision
14+
//
15+
// You can specify all the values or you can default the Build and Revision Numbers
16+
// by using the '*' as shown below:
17+
// [assembly: AssemblyVersion("0.5.0.10")]
18+
[assembly: AssemblyVersion("0.5.0.0")]
19+
[assembly: AssemblyFileVersion("0.5.0.0")]
20+
[assembly: AssemblyInformationalVersion("0.5.0")]

src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
<Compile Include="Models\Parameter.cs" />
263263
<Compile Include="InstallerController.cs" />
264264
<Compile Include="PackageActions.cs" />
265+
<Compile Include="Properties\VersionInfo.cs" />
265266
</ItemGroup>
266267
<ItemGroup>
267268
<None Include="app.config" />

src/UmbracoFileSystemProviders.Azure/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,4 @@
2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("5c92a8bd-eaa4-4562-a7e2-213d47d92d73")]
2424

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("0.5.0.0")]
35-
[assembly: AssemblyFileVersion("0.5.0.0")]
36-
[assembly: AssemblyInformationalVersion("0.5.0-alpha")]
37-
3825
[assembly: InternalsVisibleTo("Our.Umbraco.FileSystemProviders.Azure.Tests")]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// <copyright file="VersionInfo.cs" company="James Jackson-South">
2+
// Copyright (c) James Jackson-South. All rights reserved.
3+
// Licensed under the Apache License, Version 2.0.
4+
// </copyright>
5+
6+
using System.Reflection;
7+
8+
// Version information for an assembly consists of the following four values:
9+
//
10+
// Major Version
11+
// Minor Version
12+
// Build Number
13+
// Revision
14+
//
15+
// You can specify all the values or you can default the Build and Revision Numbers
16+
// by using the '*' as shown below:
17+
// [assembly: AssemblyVersion("0.5.0.10")]
18+
[assembly: AssemblyVersion("0.5.0.0")]
19+
[assembly: AssemblyFileVersion("0.5.0.0")]
20+
[assembly: AssemblyInformationalVersion("0.5.0")]

src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@
256256
<Compile Include="Helpers\MimeTypeResolver.cs" />
257257
<Compile Include="Helpers\WrappedLogHelper.cs" />
258258
<Compile Include="Helpers\ILogHelper.cs" />
259+
<Compile Include="Properties\VersionInfo.cs" />
259260
<Compile Include="VirtualPathProviderController.cs" />
260261
<Compile Include="FileSystemVirtualPathProvider.cs" />
261262
<Compile Include="FileSystemVirtualFile.cs" />

0 commit comments

Comments
 (0)