Skip to content

Commit a9bd18f

Browse files
niemyjskiejsmith
authored andcommitted
Fixed bugs with assembly file version resolving.
1 parent b797fc1 commit a9bd18f

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET Core
1414
uses: actions/setup-dotnet@v1
1515
with:
16-
dotnet-version: 3.1.100
16+
dotnet-version: 3.1.101
1717
- name: Build Reason
1818
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
1919
- name: Build Version

Exceptionless.Net.sln

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@ VisualStudioVersion = 16.0.29209.152
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{728C18BC-4085-4492-B0B2-8211CA209A50}"
77
ProjectSection(SolutionItems) = preProject
8-
appveyor.yml = appveyor.yml
9-
build\Build.ps1 = build\Build.ps1
8+
.github\workflows\build.yml = .github\workflows\build.yml
109
build\common.props = build\common.props
1110
CONTRIBUTING.md = CONTRIBUTING.md
1211
LICENSE.txt = LICENSE.txt
13-
build\Package.ps1 = build\Package.ps1
1412
README.md = README.md
15-
build\Settings.ps1 = build\Settings.ps1
16-
build\sourcelink.props = build\sourcelink.props
17-
build\version.props = build\version.props
1813
EndProjectSection
1914
EndProject
2015
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{D363E15F-621D-40E4-8C96-DEE41A7070FF}"

build/common.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525

2626
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
2727
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
28-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
29-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
30-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
31-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
32-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
33-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
34-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
28+
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
29+
<GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>
30+
<GenerateAssemblyCopyrightAttribute>true</GenerateAssemblyCopyrightAttribute>
31+
<GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
32+
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
33+
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
34+
<GenerateAssemblyInformationalVersionAttribute>true</GenerateAssemblyInformationalVersionAttribute>
3535
</PropertyGroup>
3636

3737
<PropertyGroup Label="Signing">

src/Exceptionless/Configuration/ExceptionlessConfiguration.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ public class ExceptionlessConfiguration {
1919
private const string DEFAULT_CONFIG_SERVER_URL = "https://config.exceptionless.io";
2020
private const string DEFAULT_HEARTBEAT_SERVER_URL = "https://heartbeat.exceptionless.io";
2121
private const string DEFAULT_USER_AGENT = "exceptionless/";
22-
private static Lazy<string> _version = new Lazy<string>(() => {
22+
private static readonly Lazy<string> _version = new Lazy<string>(() => {
2323
#if !PORTABLE
24-
return Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
24+
var assembly = Assembly.GetExecutingAssembly();
25+
var attribute = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
26+
return attribute.Version;
2527
#else
26-
return "";
28+
// NOTE: This is hard coded for a single release. The next release will deprecate portable.
29+
return "4.4.0.0";
2730
#endif
2831
});
2932
private const int DEFAULT_SUBMISSION_BATCH_SIZE = 50;

0 commit comments

Comments
 (0)