Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 7706743

Browse files
committed
Remove dependency on versioning.targets
1 parent 37100d2 commit 7706743

File tree

10 files changed

+11
-141
lines changed

10 files changed

+11
-141
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace GitHub.Settings
2+
{
3+
public static class AssemblyVersionInformation
4+
{
5+
// HACK: For some reason ThisAssembly.AssemblyFileVersion can't be referenced
6+
// directly from inside GitHub.VisualStudio.
7+
public const string Version = ThisAssembly.AssemblyFileVersion;
8+
}
9+
}

src/GitHub.VisualStudio.Vsix/GitHub.VisualStudio.Vsix.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@
357357
<Import Project="packaging.targets" />
358358
<!-- For regenerating templates on build -->
359359
<Import Project="..\common\t4.targets" />
360-
<Import Project="versioning.targets" />
361360
<!--
362361
This is a workaround for allowing neutral CTO resource produced from *.vsct to go in the main assembly.
363362
We move the neutral *.cto file to be categorized as WithCulture=true,Culture=en to prevent the tools from falsely reporting:

src/GitHub.VisualStudio.Vsix/versioning.targets

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@
318318
<Import Project="packaging.targets" />
319319
<!-- For regenerating templates on build -->
320320
<Import Project="..\common\t4.targets" />
321-
<Import Project="versioning.targets" />
322321
<!--
323322
This is a workaround for allowing neutral CTO resource produced from *.vsct to go in the main assembly.
324323
We move the neutral *.cto file to be categorized as WithCulture=true,Culture=en to prevent the tools from falsely reporting:

src/GitHub.VisualStudio/GitHubPackage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
namespace GitHub.VisualStudio
3636
{
3737
[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
38-
[InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version)]
38+
[InstalledProductRegistration("#110", "#112", ExtensionInformation.Version)]
3939
[Guid(Guids.guidGitHubPkgString)]
4040
[ProvideMenuResource("Menus.ctmenu", 1)]
4141
[ProvideAutoLoad(Guids.GitContextPkgString, PackageAutoLoadFlags.BackgroundLoad)]

src/GitHub.VisualStudio/Services/UsageTracker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ async Task<UsageModel> GetCurrentReport(UsageData data)
171171
current.Dimensions.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
172172
current.Dimensions.CurrentLang = CultureInfo.CurrentCulture.IetfLanguageTag;
173173
current.Dimensions.CurrentUILang = CultureInfo.CurrentUICulture.IetfLanguageTag;
174-
current.Dimensions.AppVersion = AssemblyVersionInformation.Version;
174+
current.Dimensions.AppVersion = ExtensionInformation.Version;
175175
current.Dimensions.VSVersion = vsservices.VSVersion;
176176

177177
current.Dimensions.IsGitHubUser = IsGitHubUser;

src/GitHub.VisualStudio/versioning.targets

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/common/SolutionInfo.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
1-
using System;
21
using System.Reflection;
32
using System.Resources;
43
using System.Runtime.InteropServices;
54

65
[assembly: AssemblyProduct("GitHub Extension for Visual Studio")]
7-
[assembly: AssemblyVersion(AssemblyVersionInformation.Version)]
8-
[assembly: AssemblyFileVersion(AssemblyVersionInformation.Version)]
9-
[assembly: AssemblyInformationalVersion(AssemblyVersionInformation.Version)]
106
[assembly: ComVisible(false)]
117
[assembly: AssemblyCompany("GitHub, Inc.")]
128
[assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")]
139
[assembly: AssemblyConfiguration("")]
1410
[assembly: AssemblyTrademark("")]
1511
[assembly: AssemblyCulture("")]
1612
[assembly: NeutralResourcesLanguage("en-US")]
17-
18-
namespace System
19-
{
20-
internal static class AssemblyVersionInformation {
21-
internal const string Version = "2.10.8.0";
22-
}
23-
}

test/MetricsTests/MetricsServer/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,3 @@
1818
// to COM components. If you need to access a type in this assembly from
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
21-
22-
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("14fdee91-7301-4247-846c-049647bf8e99")]
24-
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("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

test/MetricsTests/MetricsTests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,3 @@
1818
// to COM components. If you need to access a type in this assembly from
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
21-
22-
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("09313e65-7adb-48c1-ad3a-572020c5bdcb")]
24-
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("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)